From bcc1f33b35a1b41f099a12cc69d09928aa86e620 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Thu, 23 Jan 2003 11:11:36 +0000
Subject: [PATCH] More QT fixes.

* new/qt.jam:
    (add-properties): Really, using gcc-specific <linkflags> wasn't the
    best idea of mine. Use toolset independent flags now.

* new/borland.jam: Handle <find-static-lib> and <find-shared-lib>

* new/kylix.jam: Add link action and handle libraries.


[SVN r17003]
---
 new/borland.jam      | 6 ++++--
 new/kylix.jam        | 6 ++++++
 new/qt.jam           | 2 +-
 new/targets.jam      | 2 +-
 v2/borland.jam       | 6 ++++--
 v2/build/targets.jam | 2 +-
 v2/kylix.jam         | 6 ++++++
 v2/qt.jam            | 2 +-
 8 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/new/borland.jam b/new/borland.jam
index 41f36afd2..b6097b2c7 100644
--- a/new/borland.jam
+++ b/new/borland.jam
@@ -45,13 +45,15 @@ actions compile
 # Declare flags and action for linking
 toolset.flags borland.link OPTIONS <debug-symbols>on : -v ;
 toolset.flags borland.link LINKPATH <library-path> ;
-toolset.flags borland.link FINDLIBS <find-library> ;
+toolset.flags borland.link FINDLIBS-ST <find-static-library> ;
+toolset.flags borland.link FINDLIBS-SA <find-shared-library> ;
 toolset.flags borland.link LIBRARIES <library-file> ;
 toolset.flags borland.link LIBRARIES <library> ;
+toolset.flags gcc.link-dll LINKPATH <library-path> ;
 
 actions link bind LIBRARIES
 {
-    $(LINKER_NAME) $(OPTIONS) -q -L$(LINKPATH) -e$(<[1]) $(>) $(LIBRARIES) -l$(FINDLIBS)
+    $(LINKER_NAME) $(OPTIONS) -q -L$(LINKPATH) -e$(<[1]) $(>) $(LIBRARIES) $(FINDLIBS-ST).lib lib$(FINDLIBS-SA).dll
 }
 
 # Declare action for archives
diff --git a/new/kylix.jam b/new/kylix.jam
index fe108f941..2a4162593 100644
--- a/new/kylix.jam
+++ b/new/kylix.jam
@@ -14,3 +14,9 @@ toolset.inherit kylix : borland ;
 COMPILER_NAME = bc++ ;
 LINKER_NAME = bc++ ;
 
+actions link bind LIBRARIES
+{
+    $(LINKER_NAME) $(OPTIONS) -q -L$(LINKPATH) -e$(<[1]) $(>) $(LIBRARIES) lib$(FINDLIBS-ST).a lib$(FINDLIBS-SA).so
+}
+
+
diff --git a/new/qt.jam b/new/qt.jam
index ff5a37c18..fe4e1810f 100644
--- a/new/qt.jam
+++ b/new/qt.jam
@@ -69,7 +69,7 @@ rule init ( prefix ? )
 
 rule qt.add-properties ( property )
 {
-    return <include>$(.prefix)/include <linkflags>-Wl,-rpath,$(.prefix)/lib <linkflags>-L$(.prefix)/lib <linkflags>-lqt-mt ;
+    return <include>$(.prefix)/include <dll-path>$(.prefix)/lib <library-path>$(.prefix)/lib <find-shared-library>qt-mt ;
 }
 
 # -f forces moc to include the processed source file.
diff --git a/new/targets.jam b/new/targets.jam
index 004fa19e2..d0a8ebd06 100644
--- a/new/targets.jam
+++ b/new/targets.jam
@@ -445,7 +445,7 @@ rule generate-dependencies ( properties * : project : extra-properties * )
 # targets.
 rule basic-target ( name : project
                     : sources * : requirements * : default-build * : usage-requirements * )
-{
+{        
     import build-request ;
     import virtual-target ;
 
diff --git a/v2/borland.jam b/v2/borland.jam
index 41f36afd2..b6097b2c7 100644
--- a/v2/borland.jam
+++ b/v2/borland.jam
@@ -45,13 +45,15 @@ actions compile
 # Declare flags and action for linking
 toolset.flags borland.link OPTIONS <debug-symbols>on : -v ;
 toolset.flags borland.link LINKPATH <library-path> ;
-toolset.flags borland.link FINDLIBS <find-library> ;
+toolset.flags borland.link FINDLIBS-ST <find-static-library> ;
+toolset.flags borland.link FINDLIBS-SA <find-shared-library> ;
 toolset.flags borland.link LIBRARIES <library-file> ;
 toolset.flags borland.link LIBRARIES <library> ;
+toolset.flags gcc.link-dll LINKPATH <library-path> ;
 
 actions link bind LIBRARIES
 {
-    $(LINKER_NAME) $(OPTIONS) -q -L$(LINKPATH) -e$(<[1]) $(>) $(LIBRARIES) -l$(FINDLIBS)
+    $(LINKER_NAME) $(OPTIONS) -q -L$(LINKPATH) -e$(<[1]) $(>) $(LIBRARIES) $(FINDLIBS-ST).lib lib$(FINDLIBS-SA).dll
 }
 
 # Declare action for archives
diff --git a/v2/build/targets.jam b/v2/build/targets.jam
index 004fa19e2..d0a8ebd06 100644
--- a/v2/build/targets.jam
+++ b/v2/build/targets.jam
@@ -445,7 +445,7 @@ rule generate-dependencies ( properties * : project : extra-properties * )
 # targets.
 rule basic-target ( name : project
                     : sources * : requirements * : default-build * : usage-requirements * )
-{
+{        
     import build-request ;
     import virtual-target ;
 
diff --git a/v2/kylix.jam b/v2/kylix.jam
index fe108f941..2a4162593 100644
--- a/v2/kylix.jam
+++ b/v2/kylix.jam
@@ -14,3 +14,9 @@ toolset.inherit kylix : borland ;
 COMPILER_NAME = bc++ ;
 LINKER_NAME = bc++ ;
 
+actions link bind LIBRARIES
+{
+    $(LINKER_NAME) $(OPTIONS) -q -L$(LINKPATH) -e$(<[1]) $(>) $(LIBRARIES) lib$(FINDLIBS-ST).a lib$(FINDLIBS-SA).so
+}
+
+
diff --git a/v2/qt.jam b/v2/qt.jam
index ff5a37c18..fe4e1810f 100644
--- a/v2/qt.jam
+++ b/v2/qt.jam
@@ -69,7 +69,7 @@ rule init ( prefix ? )
 
 rule qt.add-properties ( property )
 {
-    return <include>$(.prefix)/include <linkflags>-Wl,-rpath,$(.prefix)/lib <linkflags>-L$(.prefix)/lib <linkflags>-lqt-mt ;
+    return <include>$(.prefix)/include <dll-path>$(.prefix)/lib <library-path>$(.prefix)/lib <find-shared-library>qt-mt ;
 }
 
 # -f forces moc to include the processed source file.