From d6846680c9e226018cf5251b55a0af3d09f7bcbb Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Mon, 4 Jan 2016 20:52:58 +0000
Subject: Broken down install rules

---
 netfs/Jamfile.jam        | 9 ---------
 netfs/daemon/Jamfile.jam | 4 +++-
 netfs/fuse/Jamfile.jam   | 6 +++++-
 netfs/ice/Jamfile.jam    | 6 ++++++
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/netfs/Jamfile.jam b/netfs/Jamfile.jam
index 2bca779..80b832a 100644
--- a/netfs/Jamfile.jam
+++ b/netfs/Jamfile.jam
@@ -1,9 +1,3 @@
-import package ;
-
-alias libxmlpp : : : :
-	<cflags>"`pkg-config --cflags libxml++-2.6`"
-	<linkflags>"`pkg-config --libs libxml++-2.6`" ;
-
 lib boost_regex : : <name>boost_regex ;
 lib boost_filesystem : : <name>boost_filesystem ;
 lib boost_system : : <name>boost_system ;
@@ -21,6 +15,3 @@ build-project daemon ;
 build-project fuse ;
 build-project unittests ;
 
-explicit install ;
-package.install install : : fuse//netfs : daemon//netfsd ;
-
diff --git a/netfs/daemon/Jamfile.jam b/netfs/daemon/Jamfile.jam
index 76da61b..6519add 100644
--- a/netfs/daemon/Jamfile.jam
+++ b/netfs/daemon/Jamfile.jam
@@ -1,3 +1,4 @@
+import package ;
 
 cpp-pch pch : pch.hpp :
 	<define>_FILE_OFFSET_BITS=64
@@ -46,7 +47,7 @@ lib netfsd :
 	<library>..//Ice
 	<library>..//IceUtil
 	<library>..//IceBox
-	<library>..//libxmlpp
+	<library>../..//libxmlpp
 	<library>..//adhocutil
 	<library>..//slicer-xml
 	<cflags>-fvisibility=hidden
@@ -58,4 +59,5 @@ lib netfsd :
 	<library>..//IceBox
 	;
 
+package.install install : : : netfsd ;
 
diff --git a/netfs/fuse/Jamfile.jam b/netfs/fuse/Jamfile.jam
index 7953e86..90e6ec9 100644
--- a/netfs/fuse/Jamfile.jam
+++ b/netfs/fuse/Jamfile.jam
@@ -1,3 +1,5 @@
+import package ;
+
 lib fuse : : <name>fuse ;
 lib Glacier2 : : <name>Glacier2 ;
 
@@ -49,7 +51,7 @@ lib netfsClient :
 	<library>..//IceUtil
 	<library>..//pthread
 	<library>..//slicer
-	<library>..//libxmlpp
+	<library>../..//libxmlpp
 	<library>..//adhocutil
 	<library>..//slicer-xml
 	<cflags>-fvisibility=hidden
@@ -72,3 +74,5 @@ exe netfs :
 	<cflags>-fvisibility=hidden
 	;
 
+package.install install : : netfs : ;
+
diff --git a/netfs/ice/Jamfile.jam b/netfs/ice/Jamfile.jam
index d9d17dc..d6fe45c 100644
--- a/netfs/ice/Jamfile.jam
+++ b/netfs/ice/Jamfile.jam
@@ -1,3 +1,5 @@
+import package ;
+
 lib Ice ;
 lib IceUtil ;
 lib pthread ;
@@ -16,3 +18,7 @@ lib netfsComms :
 	<library>pthread
 	;
 
+alias install : install-lib install-slice ;
+package.install install-lib : : : netfsComms : [ glob-tree *.h ] ;
+package.install-data install-slice : netfs/ice : [ glob-tree *.ice ] ;
+
-- 
cgit v1.2.3