diff options
| -rw-r--r-- | slicer/Jamfile.jam | 6 | ||||
| -rw-r--r-- | slicer/db/Jamfile.jam | 5 | ||||
| -rw-r--r-- | slicer/ice/Jamfile.jam | 5 | ||||
| -rw-r--r-- | slicer/slicer/Jamfile.jam | 5 | ||||
| -rw-r--r-- | slicer/test/Jamfile.jam | 1 | ||||
| -rw-r--r-- | slicer/test/included/Jamfile.jam | 8 | ||||
| -rw-r--r-- | slicer/tool/Jamfile.jam | 3 | ||||
| -rw-r--r-- | slicer/xml/Jamfile.jam | 5 | 
8 files changed, 13 insertions, 25 deletions
| diff --git a/slicer/Jamfile.jam b/slicer/Jamfile.jam index b8bbceb..e149853 100644 --- a/slicer/Jamfile.jam +++ b/slicer/Jamfile.jam @@ -9,6 +9,12 @@ build-project ice ;  build-project test ;  lib adhocutil : : : : <include>/usr/include/adhocutil ; +lib Ice++11 ; +lib pthread ; +alias Ice : : : : +	<library>Ice++11 +	<library>pthread +	;  explicit install ;  explicit install-xml ; diff --git a/slicer/db/Jamfile.jam b/slicer/db/Jamfile.jam index 44a583e..67226fb 100644 --- a/slicer/db/Jamfile.jam +++ b/slicer/db/Jamfile.jam @@ -7,16 +7,13 @@ lib dbpp-postgresql : : : : <include>/usr/include/dbpp-postgresql ;  lib boost_system ;  lib boost_filesystem ;  lib boost_utf : : <name>boost_unit_test_framework ; -lib pthread ; -lib Ice++11 ;  lib slicer-db :  	[ glob *.cpp : test*.cpp ]  	[ glob *.ice : test*.ice ]  	:  	<include>.. -	<library>pthread -	<library>Ice++11 +	<library>..//Ice  	<library>dbppcore  	<library>../..//glibmm  	<library>..//adhocutil diff --git a/slicer/ice/Jamfile.jam b/slicer/ice/Jamfile.jam index 9cf244a..82e7427 100644 --- a/slicer/ice/Jamfile.jam +++ b/slicer/ice/Jamfile.jam @@ -1,8 +1,6 @@  import testing ;  import package ; -lib pthread ; -lib Ice++11 ;  lib boost_system ;  lib boost_filesystem ;  lib boost_utf : : <name>boost_unit_test_framework ; @@ -13,8 +11,7 @@ lib slicer-ice :  	<include>..  	<library>boost_system  	<library>boost_filesystem -	<library>pthread -	<library>Ice++11 +	<library>..//Ice  	<library>..//adhocutil  	<library>../slicer//slicer  	<implicit-dependency>../slicer//slicer diff --git a/slicer/slicer/Jamfile.jam b/slicer/slicer/Jamfile.jam index 60d28fb..c513768 100644 --- a/slicer/slicer/Jamfile.jam +++ b/slicer/slicer/Jamfile.jam @@ -1,7 +1,5 @@  import package ; -lib pthread ; -lib Ice++11 ;  lib boost_system ;  lib boost_filesystem ; @@ -9,8 +7,7 @@ lib slicer :  	[ glob *.cpp ]  	[ glob *.ice ]  	: -	<library>pthread -	<library>Ice++11 +	<library>..//Ice  	<library>boost_system  	<library>..//adhocutil  	<include>.. diff --git a/slicer/test/Jamfile.jam b/slicer/test/Jamfile.jam index 3acd814..8984242 100644 --- a/slicer/test/Jamfile.jam +++ b/slicer/test/Jamfile.jam @@ -2,7 +2,6 @@ import testing ;  import ./slicer.jam ;  lib dl ; -lib pthread ;  lib boost_system ;  lib boost_filesystem ;  lib boost_date_time ; diff --git a/slicer/test/included/Jamfile.jam b/slicer/test/included/Jamfile.jam index a0fcac6..309b24b 100644 --- a/slicer/test/included/Jamfile.jam +++ b/slicer/test/included/Jamfile.jam @@ -1,15 +1,11 @@  lib dl ; -lib pthread ; -lib Ice++11 ;  lib included :  	included.ice  	: -	<library>pthread -	<library>Ice++11 +	<library>../..//Ice  	: : -	<library>pthread -	<library>Ice++11 +	<library>../..//Ice  	<include>.  	; diff --git a/slicer/tool/Jamfile.jam b/slicer/tool/Jamfile.jam index 5d0671f..2d22b55 100644 --- a/slicer/tool/Jamfile.jam +++ b/slicer/tool/Jamfile.jam @@ -1,6 +1,5 @@  import package ; -lib Ice++11 ;  lib po : : <name>boost_program_options ;  lib boost_system ;  lib boost_filesystem ; @@ -10,7 +9,7 @@ lib slicer-compiler :  	parser.cpp  	:  	<library>slice//Slice -	<library>Ice++11 +	<library>..//Ice++11  	<library>mcpp  	<library>boost_system  	<library>boost_filesystem diff --git a/slicer/xml/Jamfile.jam b/slicer/xml/Jamfile.jam index e98edd6..2886301 100644 --- a/slicer/xml/Jamfile.jam +++ b/slicer/xml/Jamfile.jam @@ -1,8 +1,6 @@  import testing ;  import package ; -lib pthread ; -lib Ice++11 ;  lib boost_system ;  lib boost_filesystem ;  lib boost_utf : : <name>boost_unit_test_framework ; @@ -14,8 +12,7 @@ lib slicer-xml :  	<include>..  	<library>boost_system  	<library>boost_filesystem -	<library>pthread -	<library>Ice++11 +	<library>..//Ice  	<library>../..//libxmlpp  	<library>..//adhocutil  	<library>../slicer//slicer | 
