From c07fed1fc6aebe1eb2795053e7e03336452c7d75 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Wed, 4 Apr 2018 00:08:45 +0100
Subject: Tidy up build process of internal libSlice

---
 Jamroot.jam                   |  2 +-
 slicer/tool/Jamfile.jam       | 21 +--------------------
 slicer/tool/slice/Jamroot.jam | 22 ++++++++++++++++++++++
 3 files changed, 24 insertions(+), 21 deletions(-)
 create mode 100644 slicer/tool/slice/Jamroot.jam

diff --git a/Jamroot.jam b/Jamroot.jam
index d51b988..04e56ae 100644
--- a/Jamroot.jam
+++ b/Jamroot.jam
@@ -7,7 +7,7 @@ variant coverage : debug ;
 
 project
   : requirements
-			<cxxflags>-DICE_CPP11_MAPPING
+			<define>ICE_CPP11_MAPPING
 			<cxxflags>"-std=c++17 -fvisibility=hidden -fvisibility-inlines-hidden"
       <linkflags>"-Wl,-z,defs,--warn-once,--gc-sections"
       <variant>release:<cxxflags>"-flto=2"
diff --git a/slicer/tool/Jamfile.jam b/slicer/tool/Jamfile.jam
index de8b8f8..5f1586b 100644
--- a/slicer/tool/Jamfile.jam
+++ b/slicer/tool/Jamfile.jam
@@ -7,29 +7,10 @@ lib boost_system ;
 lib boost_filesystem ;
 lib mcpp ;
 
-lib Slice :
-	../../ice/cpp/src/Slice/Parser.cpp
-	../../ice/cpp/src/Slice/Grammar.cpp
-	../../ice/cpp/src/Slice/Preprocessor.cpp
-	../../ice/cpp/src/Slice/CPlusPlusUtil.cpp
-	../../ice/cpp/src/Slice/SliceUtil.cpp
-	../../ice/cpp/src/Slice/FileTracker.cpp
-	../../ice/cpp/src/Slice/Scanner.cpp
-	:
-	<define>register=
-	<cxxflags>-fPIC
-	<cxxflags>-UICE_CPP11_MAPPING
-	<cxxflags>-Wno-error=unused-parameter
-	<include>../../ice/cpp/src
-	<link>static
-	: :
-	<include>../../ice/cpp/src
-	;
-
 lib slicer-compiler :
 	parser.cpp
 	:
-	<library>Slice
+	<library>slice//Slice
 	<library>Ice++11
 	<library>mcpp
 	<library>boost_system
diff --git a/slicer/tool/slice/Jamroot.jam b/slicer/tool/slice/Jamroot.jam
new file mode 100644
index 0000000..46b4e3c
--- /dev/null
+++ b/slicer/tool/slice/Jamroot.jam
@@ -0,0 +1,22 @@
+project ice :
+  : requirements
+	;
+
+path-constant ice : ../../../ice ;
+
+lib Slice :
+	$(ice)/cpp/src/Slice/Parser.cpp
+	$(ice)/cpp/src/Slice/Grammar.cpp
+	$(ice)/cpp/src/Slice/Preprocessor.cpp
+	$(ice)/cpp/src/Slice/CPlusPlusUtil.cpp
+	$(ice)/cpp/src/Slice/SliceUtil.cpp
+	$(ice)/cpp/src/Slice/FileTracker.cpp
+	$(ice)/cpp/src/Slice/Scanner.cpp
+	:
+	<cxxflags>-fPIC
+	<include>$(ice)/cpp/src
+	<link>static
+	: :
+	<include>$(ice)/cpp/src
+	;
+
-- 
cgit v1.2.3