From 0b0d2bf2762e521dfede3a8d1a8194c3e6f6435d Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Thu, 18 May 2017 20:16:56 +0100 Subject: Rename libraries cos I never liked the original naming, more in keeping with other projects now --- netfs/daemon/Jamfile.jam | 18 +++++++++--------- netfs/fuse/Jamfile.jam | 26 +++++++++++++------------- netfs/ice/Jamfile.jam | 4 ++-- netfs/lib/Jamfile.jam | 6 +++--- 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 : ..//Ice @@ -23,11 +23,11 @@ lib netfsd : [ glob *.cpp ] : _FILE_OFFSET_BITS=64 - ../ice//netfsComms - netfsdConfiguration - netfsdConfiguration - ../ice//netfsComms - ../lib//netfsCommon + ../ice//netfs-api + netfsd-configuration + netfsd-configuration + ../ice//netfs-api + ../lib//netfs-common ..//boost_random ..//boost_thread ..//boost_filesystem @@ -39,9 +39,9 @@ lib netfsd : ..//slicer-xml : : . - ../ice//netfsComms - netfsdConfiguration - netfsdConfiguration + ../ice//netfs-api + netfsd-configuration + netfsd-configuration ..//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 : : fuse ; lib Glacier2 : : Glacier2 ; -lib netfsClientConfiguration : +lib netfs-client-configuration : fuseConfig.ice : yes @@ -19,16 +19,16 @@ lib netfsClientConfiguration : ..//slicer ; -lib netfsClient : - netfsClientConfiguration +lib netfs-client : + netfs-client-configuration [ glob *.cpp : netfs.cpp ] : _FILE_OFFSET_BITS=64 - ../ice//netfsComms - netfsClientConfiguration - netfsClientConfiguration - ../ice//netfsComms - ../lib//netfsCommon + ../ice//netfs-api + netfs-client-configuration + netfs-client-configuration + ../ice//netfs-api + ../lib//netfs-common ..//boost_thread ..//boost_system ..//boost_filesystem @@ -41,17 +41,17 @@ lib netfsClient : ..//slicer-xml : : . - ../ice//netfsComms + ../ice//netfs-api Glacier2 - ../ice//netfsComms - netfsClientConfiguration - netfsClientConfiguration + ../ice//netfs-api + netfs-client-configuration + netfs-client-configuration _FILE_OFFSET_BITS=64 ; exe netfs : netfs.cpp : - netfsClient + netfs-client fuse ..//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 ] : _FILE_OFFSET_BITS=64 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 ] : _FILE_OFFSET_BITS=64 ../ice ..//boost_system ..//boost_thread - ../ice//netfsComms + ../ice//netfs-api ..//adhocutil - ../ice//netfsComms + ../ice//netfs-api : : . ; 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 : boost_system boost_filesystem ../daemon//netfsd - ../fuse//netfsClient - ../ice//netfsComms + ../fuse//netfs-client + ../ice//netfs-api ..//adhocutil BOOST_TEST_DYN_LINK boost_utf -- cgit v1.2.3