From 9781f471ead15435901c747f891eac0bbc5d7d46 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Wed, 17 Dec 2014 16:03:07 +0000
Subject: Centralize boost_utf declaration

---
 p2pvr/Jamfile.jam                  | 2 ++
 p2pvr/daemon/Jamfile.jam           | 4 +---
 p2pvr/daemon/unittests/Jamfile.jam | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/p2pvr/Jamfile.jam b/p2pvr/Jamfile.jam
index 0268285..7b4df03 100644
--- a/p2pvr/Jamfile.jam
+++ b/p2pvr/Jamfile.jam
@@ -2,6 +2,8 @@ import package ;
 import type ; 
 import generators ; 
 
+lib boost_utf : : <name>boost_unit_test_framework ;
+
 alias glibmm : : : :
 	<cflags>"`pkg-config --cflags glibmm-2.4`"
 	<linkflags>"`pkg-config --libs glibmm-2.4`"
diff --git a/p2pvr/daemon/Jamfile.jam b/p2pvr/daemon/Jamfile.jam
index 0f7eb53..43465df 100644
--- a/p2pvr/daemon/Jamfile.jam
+++ b/p2pvr/daemon/Jamfile.jam
@@ -9,8 +9,6 @@ cpp-pch pch : pch.hpp :
 	<library>../daemonbase//p2pvrdaemonbase
 ;
 
-lib boost_utf : : <name>boost_unit_test_framework ;
-
 lib p2pvrdaemon :
 	pch
 	[ glob-tree *.cpp *.sql : dummy* test*.cpp ]
@@ -30,7 +28,7 @@ unit-test testEmbedding :
 	test/dummySelect.sql
 	:
 	<define>BOOST_TEST_DYN_LINK
-	<library>boost_utf
+	<library>..//boost_utf
 	<library>../lib//p2pvrlib
 	;
 
diff --git a/p2pvr/daemon/unittests/Jamfile.jam b/p2pvr/daemon/unittests/Jamfile.jam
index 07fe5e9..794248a 100644
--- a/p2pvr/daemon/unittests/Jamfile.jam
+++ b/p2pvr/daemon/unittests/Jamfile.jam
@@ -17,7 +17,7 @@ unit-test testp2ice :
 	<dependency>../../p2comp//p2pvrp2comp
 	<library>boost_system
 	<library>boost_filesystem
-	<library>..//boost_utf
+	<library>../..//boost_utf
 	<define>ROOT=\"$(me)\"
 	;
 
-- 
cgit v1.2.3