From 845bea5a017e8af87cd03bdb54249559f33a14f4 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 18 Jan 2020 14:39:24 +0000
Subject: Multiple fixes to build

Use a library to remove duplicate builds in test, deps on xslt, includes
---
 gentoobrowse/src/Jamfile.jam | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/gentoobrowse/src/Jamfile.jam b/gentoobrowse/src/Jamfile.jam
index a35ccc4..6237741 100644
--- a/gentoobrowse/src/Jamfile.jam
+++ b/gentoobrowse/src/Jamfile.jam
@@ -1,5 +1,6 @@
 import icespider ;
 import testing ;
+import sequence ;
 
 lib icespider-core ;
 lib icespider-common ;
@@ -7,12 +8,12 @@ lib icespider-xslt : : : : <library>../..//libxmlpp ;
 lib icespider-fcgi ;
 lib icespider-filesessions ;
 lib icespider-testing ;
-lib adhocutil ;
+lib adhocutil : : : : <include>/usr/include/adhocutil ;
 lib tidy ;
 lib Ice : : <name>Ice++11 ;
 lib pthread ;
 lib stdc++fs ;
-lib slicer ;
+lib slicer : : : : <include>/usr/include/slicer ;
 lib slicer-json ;
 lib slicer-xml ;
 lib slicer-db ;
@@ -32,8 +33,6 @@ lib icespider : :
 	<name>icespider-core
 	: :
 	<include>/usr/include/icespider
-	<include>/usr/include/slicer
-	<include>/usr/include/adhocutil
 	<include>/usr/share/icespider/ice
 	<library>icespider-common
 	<library>icespider-xslt
@@ -44,11 +43,11 @@ lib icespider : :
 	<library>slicer
 	;
 
-alias gentoobrowse :
+lib gentoobrowse :
 	[ glob *.cpp *.ice *.json : test.cpp ]
 	:
 	<slicer>yes
-	: :
+	<ice-visibility>hidden
 	<library>gentoobrowse-api
 	<library>slicer-json
 	<library>slicer-xml
@@ -59,30 +58,24 @@ alias gentoobrowse :
 exe gentoobrowse-cgi :
 	gentoobrowse
 	:
-	<slicer>yes
 	<library>icespider-fcgi
-	<ice-visibility>hidden
 	;
 
 path-constant me : . ;
-obj test :
+
+run
 	test.cpp
+	: -- :
+	[ sequence.insertion-sort [ glob ../xslt/*.xslt ] ]
 	:
 	<define>BOOST_TEST_DYN_LINK
 	<define>ROOT=\"$(me)\"
-	<library>icespider-testing
-	<library>gentoobrowse
-	;
-
-run
-	test
-	gentoobrowse
-	: : :
-	<slicer>yes
 	<library>stdc++fs
 	<library>tidy
 	<library>../..//libxmlpp
 	<library>icespider-testing
+	<library>gentoobrowse
+	<library>icespider
 	<library>boost_unit_test_framework
 	: gentoobrowse-test ;
 
-- 
cgit v1.2.3