summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2015-12-23 20:34:19 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2015-12-23 20:34:19 +0000
commit7cc74bfdfb0a861126ea570826943892e0e7d92d (patch)
treee5e4fec34d6e4c09d2b27a3b377aca63de2aa715
parentCreate IceTray and DryIce for bootstrapping and dry running IceBox services (diff)
downloadgentoobrowse-api-7cc74bfdfb0a861126ea570826943892e0e7d92d.tar.bz2
gentoobrowse-api-7cc74bfdfb0a861126ea570826943892e0e7d92d.tar.xz
gentoobrowse-api-7cc74bfdfb0a861126ea570826943892e0e7d92d.zip
Use installed icetray
-rw-r--r--gentoobrowse-api/service/Jamfile.jam4
-rw-r--r--gentoobrowse-api/unittests/Jamfile.jam5
2 files changed, 6 insertions, 3 deletions
diff --git a/gentoobrowse-api/service/Jamfile.jam b/gentoobrowse-api/service/Jamfile.jam
index fd2e8b5..946da69 100644
--- a/gentoobrowse-api/service/Jamfile.jam
+++ b/gentoobrowse-api/service/Jamfile.jam
@@ -2,6 +2,8 @@ import generators ;
import type ;
import lex ;
+lib icetray : : : : <include>/usr/include/icetray ;
+
lib gentoobrowse-service :
[ glob *.cpp ]
[ glob *.ll ]
@@ -10,7 +12,7 @@ lib gentoobrowse-service :
:
<slicer>pure
<library>..//adhocutil
- <library>../../icetray//icetray
+ <library>icetray
<library>..//dbppcore
<library>..//IceBox
<library>..//slicer
diff --git a/gentoobrowse-api/unittests/Jamfile.jam b/gentoobrowse-api/unittests/Jamfile.jam
index 1a6f41c..a4bd4ec 100644
--- a/gentoobrowse-api/unittests/Jamfile.jam
+++ b/gentoobrowse-api/unittests/Jamfile.jam
@@ -3,6 +3,7 @@ import testing ;
lib boost_utf : : <name>boost_unit_test_framework ;
lib dbpp-postgresql : : : : <include>/usr/include/dbpp-postgresql ;
lib dl ;
+lib dryice : : : : <include>/usr/include/icetray ;
path-constant me : . ;
@@ -24,13 +25,13 @@ lib testCommon :
<library>..//Ice
<library>..//IceUtil
<library>..//IceBox
- <library>../../icetray//dryice
+ <library>dryice
<library>../service//gentoobrowse-service
: :
<library>..//dbppcore
<library>..//adhocutil
<library>..//IceBox
- <library>../../icetray//dryice
+ <library>dryice
;