diff options
| -rw-r--r-- | netfs/daemon/Jamfile.jam | 18 | ||||
| -rw-r--r-- | netfs/fuse/Jamfile.jam | 26 | ||||
| -rw-r--r-- | netfs/ice/Jamfile.jam | 4 | ||||
| -rw-r--r-- | netfs/lib/Jamfile.jam | 6 | ||||
| -rw-r--r-- | netfs/unittests/Jamfile.jam | 4 | 
5 files changed, 29 insertions, 29 deletions
| diff --git a/netfs/daemon/Jamfile.jam b/netfs/daemon/Jamfile.jam index 4368f2c..c4ae90b 100644 --- a/netfs/daemon/Jamfile.jam +++ b/netfs/daemon/Jamfile.jam @@ -1,6 +1,6 @@  import package ; -lib netfsdConfiguration : +lib netfsd-configuration :  	daemonConfig.ice  	:  	<library>..//Ice @@ -23,11 +23,11 @@ lib netfsd :  	[ glob *.cpp ]  	:  	<define>_FILE_OFFSET_BITS=64 -	<implicit-dependency>../ice//netfsComms -	<implicit-dependency>netfsdConfiguration -	<library>netfsdConfiguration -	<library>../ice//netfsComms -	<library>../lib//netfsCommon +	<implicit-dependency>../ice//netfs-api +	<implicit-dependency>netfsd-configuration +	<library>netfsd-configuration +	<library>../ice//netfs-api +	<library>../lib//netfs-common  	<library>..//boost_random  	<library>..//boost_thread  	<library>..//boost_filesystem @@ -39,9 +39,9 @@ lib netfsd :  	<library>..//slicer-xml  	: :  	<include>. -	<implicit-dependency>../ice//netfsComms -	<library>netfsdConfiguration -	<implicit-dependency>netfsdConfiguration +	<implicit-dependency>../ice//netfs-api +	<library>netfsd-configuration +	<implicit-dependency>netfsd-configuration  	<library>..//IceBox  	; diff --git a/netfs/fuse/Jamfile.jam b/netfs/fuse/Jamfile.jam index 854d233..b17ca0b 100644 --- a/netfs/fuse/Jamfile.jam +++ b/netfs/fuse/Jamfile.jam @@ -3,7 +3,7 @@ import package ;  lib fuse : : <name>fuse ;  lib Glacier2 : : <name>Glacier2 ; -lib netfsClientConfiguration : +lib netfs-client-configuration :  	fuseConfig.ice  	:  	<slicer>yes @@ -19,16 +19,16 @@ lib netfsClientConfiguration :  	<library>..//slicer  	; -lib netfsClient : -	netfsClientConfiguration +lib netfs-client : +	netfs-client-configuration  	[ glob *.cpp : netfs.cpp ]  	:  	<define>_FILE_OFFSET_BITS=64 -	<implicit-dependency>../ice//netfsComms -	<library>netfsClientConfiguration -	<implicit-dependency>netfsClientConfiguration -	<library>../ice//netfsComms -	<library>../lib//netfsCommon +	<implicit-dependency>../ice//netfs-api +	<library>netfs-client-configuration +	<implicit-dependency>netfs-client-configuration +	<library>../ice//netfs-api +	<library>../lib//netfs-common  	<library>..//boost_thread  	<library>..//boost_system  	<library>..//boost_filesystem @@ -41,17 +41,17 @@ lib netfsClient :  	<library>..//slicer-xml  	: :  	<include>. -	<library>../ice//netfsComms +	<library>../ice//netfs-api  	<library>Glacier2 -	<implicit-dependency>../ice//netfsComms -	<library>netfsClientConfiguration -	<implicit-dependency>netfsClientConfiguration +	<implicit-dependency>../ice//netfs-api +	<library>netfs-client-configuration +	<implicit-dependency>netfs-client-configuration  	<define>_FILE_OFFSET_BITS=64  	;  exe netfs :  	netfs.cpp : -	<library>netfsClient +	<library>netfs-client  	<library>fuse  	<library>..//adhocutil  	; diff --git a/netfs/ice/Jamfile.jam b/netfs/ice/Jamfile.jam index 9f6ea43..e74b09e 100644 --- a/netfs/ice/Jamfile.jam +++ b/netfs/ice/Jamfile.jam @@ -4,7 +4,7 @@ lib Ice ;  lib IceUtil ;  lib pthread ; -lib netfsComms : +lib netfs-api :  	[ glob *.cpp *.ice ] :  	<define>_FILE_OFFSET_BITS=64  	<library>Ice @@ -19,6 +19,6 @@ lib netfsComms :  	;  alias install : install-lib install-slice ; -package.install install-lib : : : netfsComms : [ glob-tree *.h ] ; +package.install install-lib : : : netfs-api : [ glob-tree *.h ] ;  package.install-data install-slice : netfs/ice : [ glob-tree *.ice ] ; diff --git a/netfs/lib/Jamfile.jam b/netfs/lib/Jamfile.jam index dbc4b2e..4ece6b4 100644 --- a/netfs/lib/Jamfile.jam +++ b/netfs/lib/Jamfile.jam @@ -1,13 +1,13 @@ -lib netfsCommon : +lib netfs-common :  	[ glob *.cpp ]  	:  	<define>_FILE_OFFSET_BITS=64  	<include>../ice  	<library>..//boost_system  	<library>..//boost_thread -	<library>../ice//netfsComms +	<library>../ice//netfs-api  	<library>..//adhocutil -	<implicit-dependency>../ice//netfsComms +	<implicit-dependency>../ice//netfs-api  	: :  	<include>.  	; diff --git a/netfs/unittests/Jamfile.jam b/netfs/unittests/Jamfile.jam index 21965e5..88fa556 100644 --- a/netfs/unittests/Jamfile.jam +++ b/netfs/unittests/Jamfile.jam @@ -16,8 +16,8 @@ lib testMocks :  	<library>boost_system  	<library>boost_filesystem  	<library>../daemon//netfsd -	<library>../fuse//netfsClient -	<library>../ice//netfsComms +	<library>../fuse//netfs-client +	<library>../ice//netfs-api  	<library>..//adhocutil  	<define>BOOST_TEST_DYN_LINK  	<library>boost_utf | 
