From a478cbc53c64ff1d8ead6e7d607dbe58818ed268 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Mon, 24 Jul 2017 21:31:54 +0100
Subject: Re-enable -flto and use newly named netfs-api.so

---
 Jamroot.jam                  | 4 ++--
 mythfs/Jamfile.jam           | 2 +-
 mythfs/service/Jamfile.jam   | 4 ++--
 mythfs/unittests/Jamfile.jam | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Jamroot.jam b/Jamroot.jam
index 7a78f8d..d39b5f5 100644
--- a/Jamroot.jam
+++ b/Jamroot.jam
@@ -8,8 +8,8 @@ variant coverage : debug ;
 
 project
   : requirements
-      <variant>release:<cxxflags>"-std=c++1y -fvisibility=hidden"
-      <variant>release:<linkflags>"-Wl,-z,defs,--warn-once,--gc-sections"
+      <variant>release:<cxxflags>"-std=c++1y -fvisibility=hidden -flto"
+      <variant>release:<linkflags>"-Wl,-z,defs,--warn-once,--gc-sections -flto"
       <variant>debug:<cxxflags>"-W -Wall -Werror -Wwrite-strings -std=c++1y -fvisibility=hidden"
       <variant>debug:<linkflags>"-Wl,-z,defs,--warn-once"
       <variant>coverage:<cxxflags>"-W -Wall -Werror -Wwrite-strings -std=c++1y --coverage -fvisibility=hidden"
diff --git a/mythfs/Jamfile.jam b/mythfs/Jamfile.jam
index 25d7fb3..7159557 100644
--- a/mythfs/Jamfile.jam
+++ b/mythfs/Jamfile.jam
@@ -4,7 +4,7 @@ import package ;
 lib adhocutil : : : : <include>/usr/include/adhocutil ;
 lib slicer : : : : <include>/usr/include/slicer ;
 lib slicer-db : : : : <include>/usr/include/slicer ;
-lib netfsComms : : : : <include>/usr/include/netfs ;
+lib netfs-api : : : : <include>/usr/include/netfs ;
 lib icetray : : : : <include>/usr/include/icetray ;
 lib dbppcore : : : : <include>/usr/include/dbpp ;
 lib Ice ;
diff --git a/mythfs/service/Jamfile.jam b/mythfs/service/Jamfile.jam
index 05e65ac..6ef0337 100644
--- a/mythfs/service/Jamfile.jam
+++ b/mythfs/service/Jamfile.jam
@@ -5,7 +5,7 @@ lib mythfs :
 	[ glob *.cpp inodes/*.cpp *.ice sql/*.sql ]
 	:
 	<slicer>yes
-	<library>..//netfsComms
+	<library>..//netfs-api
 	<library>..//adhocutil
 	<library>..//dbppcore
 	<library>..//boost_system
@@ -24,7 +24,7 @@ lib mythfs :
 	<include>.
 	: :
 	<include>.
-	<library>..//netfsComms
+	<library>..//netfs-api
 	<library>..//icetray
 	;
 
diff --git a/mythfs/unittests/Jamfile.jam b/mythfs/unittests/Jamfile.jam
index af84969..a76d1ec 100644
--- a/mythfs/unittests/Jamfile.jam
+++ b/mythfs/unittests/Jamfile.jam
@@ -20,7 +20,7 @@ lib testCommon :
 	<define>ROOT=\"$(me)\"
 	<library>..//boost_system
 	<library>..//boost_filesystem
-	<library>..//netfsComms
+	<library>..//netfs-api
 	<library>..//IceUtil
 	<library>..//Ice
 	<library>..//IceBox
-- 
cgit v1.2.3