diff options
-rw-r--r-- | slicer/Jamfile.jam | 2 | ||||
-rw-r--r-- | slicer/db/Jamfile.jam | 7 | ||||
-rw-r--r-- | slicer/ice/Jamfile.jam | 3 | ||||
-rw-r--r-- | slicer/json/Jamfile.jam | 3 | ||||
-rw-r--r-- | slicer/slicer/Jamfile.jam | 3 | ||||
-rw-r--r-- | slicer/test/Jamfile.jam | 5 | ||||
-rw-r--r-- | slicer/tool/Jamfile.jam | 3 | ||||
-rw-r--r-- | slicer/xml/Jamfile.jam | 3 |
8 files changed, 12 insertions, 17 deletions
diff --git a/slicer/Jamfile.jam b/slicer/Jamfile.jam index 3108454..b8bbceb 100644 --- a/slicer/Jamfile.jam +++ b/slicer/Jamfile.jam @@ -8,6 +8,8 @@ build-project db ; build-project ice ; build-project test ; +lib adhocutil : : : : <include>/usr/include/adhocutil ; + explicit install ; explicit install-xml ; explicit install-json ; diff --git a/slicer/db/Jamfile.jam b/slicer/db/Jamfile.jam index 8d8b803..44a583e 100644 --- a/slicer/db/Jamfile.jam +++ b/slicer/db/Jamfile.jam @@ -4,7 +4,6 @@ import ../test/slicer.jam ; lib dbppcore : : : : <include>/usr/include/dbpp ; lib dbpp-postgresql : : : : <include>/usr/include/dbpp-postgresql ; -lib adhocutil : : : : <include>/usr/include/adhocutil ; lib boost_system ; lib boost_filesystem ; lib boost_utf : : <name>boost_unit_test_framework ; @@ -20,7 +19,7 @@ lib slicer-db : <library>Ice++11 <library>dbppcore <library>../..//glibmm - <library>adhocutil + <library>..//adhocutil <library>../slicer//slicer <implicit-dependency>../slicer//slicer : : @@ -40,9 +39,9 @@ lib testCommon : <library>../test//common <library>dbpp-postgresql <library>dbppcore - <library>adhocutil + <library>..//adhocutil : : - <library>adhocutil + <library>..//adhocutil ; run testSelect.cpp diff --git a/slicer/ice/Jamfile.jam b/slicer/ice/Jamfile.jam index d775a4a..9cf244a 100644 --- a/slicer/ice/Jamfile.jam +++ b/slicer/ice/Jamfile.jam @@ -6,7 +6,6 @@ lib Ice++11 ; lib boost_system ; lib boost_filesystem ; lib boost_utf : : <name>boost_unit_test_framework ; -lib adhocutil : : : : <include>/usr/include/adhocutil ; lib slicer-ice : [ glob *.cpp : test*.cpp ] @@ -16,7 +15,7 @@ lib slicer-ice : <library>boost_filesystem <library>pthread <library>Ice++11 - <library>adhocutil + <library>..//adhocutil <library>../slicer//slicer <implicit-dependency>../slicer//slicer : : diff --git a/slicer/json/Jamfile.jam b/slicer/json/Jamfile.jam index 07186c8..ae85792 100644 --- a/slicer/json/Jamfile.jam +++ b/slicer/json/Jamfile.jam @@ -8,7 +8,6 @@ lib jsonpp : : : : lib boost_system ; lib boost_filesystem ; lib boost_utf : : <name>boost_unit_test_framework ; -lib adhocutil : : : : <include>/usr/include/adhocutil ; lib slicer-json : [ glob *.cpp : test*.cpp ] @@ -18,7 +17,7 @@ lib slicer-json : <library>boost_filesystem <library>jsonpp <library>../..//glibmm - <library>adhocutil + <library>..//adhocutil <library>../slicer//slicer : : <library>jsonpp diff --git a/slicer/slicer/Jamfile.jam b/slicer/slicer/Jamfile.jam index e62a22a..60d28fb 100644 --- a/slicer/slicer/Jamfile.jam +++ b/slicer/slicer/Jamfile.jam @@ -4,7 +4,6 @@ lib pthread ; lib Ice++11 ; lib boost_system ; lib boost_filesystem ; -lib adhocutil : : : : <include>/usr/include/adhocutil ; lib slicer : [ glob *.cpp ] @@ -13,7 +12,7 @@ lib slicer : <library>pthread <library>Ice++11 <library>boost_system - <library>adhocutil + <library>..//adhocutil <include>.. : : <include>.. diff --git a/slicer/test/Jamfile.jam b/slicer/test/Jamfile.jam index edb1099..3acd814 100644 --- a/slicer/test/Jamfile.jam +++ b/slicer/test/Jamfile.jam @@ -7,7 +7,6 @@ lib boost_system ; lib boost_filesystem ; lib boost_date_time ; lib boost_utf : : <name>boost_unit_test_framework ; -lib adhocutil : : : : <include>/usr/include/adhocutil ; lib types : [ glob *.ice ] @@ -17,7 +16,7 @@ lib types : <slicer>yes <slicerbin>../tool//slicer <include>. - <library>adhocutil + <library>..//adhocutil <library>boost_date_time <library>included//included <library>../slicer//slicer @@ -43,7 +42,7 @@ alias common : : : : run preprocessor.cpp : : : <library>common - <library>adhocutil + <library>..//adhocutil <include>.. <library>../tool//slicer-compiler <dependency>types diff --git a/slicer/tool/Jamfile.jam b/slicer/tool/Jamfile.jam index 5f1586b..5d0671f 100644 --- a/slicer/tool/Jamfile.jam +++ b/slicer/tool/Jamfile.jam @@ -2,7 +2,6 @@ import package ; lib Ice++11 ; lib po : : <name>boost_program_options ; -lib adhocutil : : : : <include>/usr/include/adhocutil ; lib boost_system ; lib boost_filesystem ; lib mcpp ; @@ -15,7 +14,7 @@ lib slicer-compiler : <library>mcpp <library>boost_system <library>boost_filesystem - <library>adhocutil + <library>..//adhocutil <library>../slicer//slicer <implicit-dependency>../slicer//slicer <include>.. diff --git a/slicer/xml/Jamfile.jam b/slicer/xml/Jamfile.jam index b8a9e4c..e98edd6 100644 --- a/slicer/xml/Jamfile.jam +++ b/slicer/xml/Jamfile.jam @@ -6,7 +6,6 @@ lib Ice++11 ; lib boost_system ; lib boost_filesystem ; lib boost_utf : : <name>boost_unit_test_framework ; -lib adhocutil : : : : <include>/usr/include/adhocutil ; lib slicer-xml : [ glob *.cpp : test*.cpp ] @@ -18,7 +17,7 @@ lib slicer-xml : <library>pthread <library>Ice++11 <library>../..//libxmlpp - <library>adhocutil + <library>..//adhocutil <library>../slicer//slicer <implicit-dependency>../slicer//slicer : : |