From 741965b51e2b5c36bbf5f5e212f36a60a16aca07 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe <dan@randomdan.homeip.net> Date: Sun, 15 Feb 2015 15:32:25 +0000 Subject: Centralize slicer lib defs --- netfs/Jamfile.jam | 2 ++ netfs/daemon/Jamfile.jam | 8 +++----- netfs/fuse/Jamfile.jam | 10 ++++------ 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/netfs/Jamfile.jam b/netfs/Jamfile.jam index d006225..dd8865e 100644 --- a/netfs/Jamfile.jam +++ b/netfs/Jamfile.jam @@ -14,6 +14,8 @@ lib IceUtil : : <name>IceUtil ; lib IceBox : : <name>IceBox ; lib pthread : : <name>pthread ; lib fuse : : <name>fuse ; +lib slicer : : : : <include>/usr/include/slicer ; +lib slicer-xml : : : : <include>/usr/include/slicer ; build-project daemon ; build-project fuse ; diff --git a/netfs/daemon/Jamfile.jam b/netfs/daemon/Jamfile.jam index d42175d..07bdcee 100644 --- a/netfs/daemon/Jamfile.jam +++ b/netfs/daemon/Jamfile.jam @@ -1,5 +1,3 @@ -lib slicer : : : : <include>/usr/include/slicer ; -lib slicer-xml : : : : <include>/usr/include/slicer ; cpp-pch pch : pch.hpp : <define>_FILE_OFFSET_BITS=64 @@ -20,14 +18,14 @@ lib netfsdConfiguration : <library>..//pthread <library>..//boost_filesystem <library>..//boost_system - <library>slicer + <library>..//slicer <slicer>yes : : <include>. <library>..//IceUtil <library>..//Ice <library>..//boost_system - <library>slicer + <library>..//slicer ; lib netfsd : @@ -49,7 +47,7 @@ lib netfsd : <library>..//IceUtil <library>..//IceBox <library>..//libxmlpp - <library>slicer-xml + <library>..//slicer-xml : : <include>. <implicit-dependency>../ice//netfsComms diff --git a/netfs/fuse/Jamfile.jam b/netfs/fuse/Jamfile.jam index 8223aa7..e7558f6 100644 --- a/netfs/fuse/Jamfile.jam +++ b/netfs/fuse/Jamfile.jam @@ -1,5 +1,3 @@ -lib slicer : : : : <include>/usr/include/slicer ; -lib slicer-xml : : : : <include>/usr/include/slicer ; cpp-pch pch : pch.hpp : <define>_FILE_OFFSET_BITS=64 @@ -19,12 +17,12 @@ obj configuration : <library>..//Ice <library>..//IceUtil <library>..//pthread - <library>slicer + <library>..//slicer : : <library>..//IceUtil <library>..//Ice <library>..//boost_system - <library>slicer + <library>..//slicer ; exe netfs : @@ -46,8 +44,8 @@ exe netfs : <library>..//Ice <library>..//IceUtil <library>..//pthread - <library>slicer + <library>..//slicer <library>..//libxmlpp - <library>slicer-xml + <library>..//slicer-xml ; -- cgit v1.2.3