From 68c651d05f142cb13dab3216954b5d2b3eca6d89 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 23 Oct 2015 01:36:23 +0100
Subject: Tidy up and alias glibmm and libxml++ refs

---
 Jamroot.jam             | 40 ++++++++++++++++++++++++++++++++++++++++
 slicer/db/Jamfile.jam   |  7 +------
 slicer/json/Jamfile.jam |  9 ++-------
 slicer/xml/Jamfile.jam  |  8 ++------
 4 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/Jamroot.jam b/Jamroot.jam
index 81d620f..a0b4d73 100644
--- a/Jamroot.jam
+++ b/Jamroot.jam
@@ -33,3 +33,43 @@ alias all :
 		slicer
 	;
 
+# Some useful aliases
+
+lib xml++-2.6 ;
+lib xml2 ;
+lib glibmm-2.4 ;
+lib gobject-2.0 ;
+lib glib-2.0 ;
+lib sigc-2.0 ;
+
+alias libxmlpp : : : :
+	<include>/usr/include/libxml++-2.6
+	<include>/usr/lib64/libxml++-2.6/include
+	<include>/usr/include/libxml2
+	<include>/usr/include/glibmm-2.4
+	<include>/usr/lib64/glibmm-2.4/include
+	<include>/usr/include/glib-2.0
+	<include>/usr/lib64/glib-2.0/include
+	<include>/usr/include/sigc++-2.0
+	<include>/usr/lib64/sigc++-2.0/include
+	<library>xml++-2.6
+	<library>xml2
+	<library>glibmm-2.4
+	<library>gobject-2.0
+	<library>glib-2.0
+	<library>sigc-2.0
+	;
+
+alias glibmm : : : :
+	<include>/usr/include/glibmm-2.4
+	<include>/usr/lib64/glibmm-2.4/include
+	<include>/usr/include/glib-2.0
+	<include>/usr/lib64/glib-2.0/include
+	<include>/usr/include/sigc++-2.0
+	<include>/usr/lib64/sigc++-2.0/include
+	<library>glibmm-2.4
+	<library>gobject-2.0
+	<library>glib-2.0
+	<library>sigc-2.0
+	;
+
diff --git a/slicer/db/Jamfile.jam b/slicer/db/Jamfile.jam
index cbe7927..309c4ba 100644
--- a/slicer/db/Jamfile.jam
+++ b/slicer/db/Jamfile.jam
@@ -1,10 +1,5 @@
 import testing ;
 
-alias glibmm : : : :
-	<cflags>"`pkg-config --cflags glibmm-2.4`"
-	<linkflags>"`pkg-config --libs glibmm-2.4`"
-	;
-
 lib dbppcore : : : : <include>/usr/include/dbpp ;
 lib dbpp-postgresql : : : : <include>/usr/include/dbpp-postgresql ;
 lib adhocutil : : : : <include>/usr/include/adhocutil ;
@@ -19,7 +14,7 @@ lib slicer-db :
 	<include>..
 	<library>IceUtil
 	<library>dbppcore
-	<library>glibmm
+	<library>../..//glibmm
 	<library>adhocutil
 	<library>../slicer//slicer
 	<cflags>-fvisibility=hidden
diff --git a/slicer/json/Jamfile.jam b/slicer/json/Jamfile.jam
index d369eec..dd32479 100644
--- a/slicer/json/Jamfile.jam
+++ b/slicer/json/Jamfile.jam
@@ -1,10 +1,5 @@
-alias glibmm : : : :
-	<cflags>"`pkg-config --cflags glibmm-2.4`"
-	<linkflags>"`pkg-config --libs glibmm-2.4`"
-	;
-
 lib jsonpp : : : :
-	<cflags>"`pkg-config --cflags glibmm-2.4`"
+	<library>../..//glibmm
 	;
 
 lib boost_system ;
@@ -20,7 +15,7 @@ lib slicer-json :
 	<library>boost_filesystem
 	<library>IceUtil
 	<library>jsonpp
-	<library>glibmm
+	<library>../..//glibmm
 	<library>adhocutil
 	<library>../slicer//slicer
 	<cflags>-fvisibility=hidden
diff --git a/slicer/xml/Jamfile.jam b/slicer/xml/Jamfile.jam
index 7b07545..7dffbcb 100644
--- a/slicer/xml/Jamfile.jam
+++ b/slicer/xml/Jamfile.jam
@@ -1,8 +1,4 @@
 import testing ;
-
-alias libxmlpp : : : :
-	<cflags>"`pkg-config --cflags libxml++-2.6`"
-	<linkflags>"`pkg-config --libs libxml++-2.6`" ;
 lib boost_system ;
 lib boost_filesystem ;
 lib boost_utf : : <name>boost_unit_test_framework ;
@@ -16,13 +12,13 @@ lib slicer-xml :
 	<library>boost_system
 	<library>boost_filesystem
 	<library>IceUtil
-	<library>libxmlpp
+	<library>../..//libxmlpp
 	<library>adhocutil
 	<library>../slicer//slicer
 	<cflags>-fvisibility=hidden
 	<variant>release:<cflags>-flto
 	: :
-	<library>libxmlpp
+	<library>../..//libxmlpp
 	;
 
 run testSpecifics.cpp
-- 
cgit v1.2.3