diff options
| -rw-r--r-- | Jamroot.jam | 40 | ||||
| -rw-r--r-- | libjsonpp/Jamfile.jam | 15 | ||||
| -rw-r--r-- | libjsonpp/parse.cpp | 1 | ||||
| -rw-r--r-- | libjsonpp/pch.hpp | 16 | ||||
| -rw-r--r-- | libjsonpp/serialize.cpp | 1 | ||||
| -rw-r--r-- | libjsonpp/testEncoding.cpp | 2 | ||||
| -rw-r--r-- | libjsonpp/testParse.cpp | 2 | ||||
| -rw-r--r-- | libjsonpp/testSerialise.cpp | 2 |
8 files changed, 3 insertions, 76 deletions
diff --git a/Jamroot.jam b/Jamroot.jam index 3e015d5..4120691 100644 --- a/Jamroot.jam +++ b/Jamroot.jam @@ -1,9 +1,7 @@ import os ; -import slice ; using gcc : : [ os.environ CXX ] ; -variant component ; variant coverage : debug ; project @@ -14,55 +12,17 @@ project <variant>debug:<linkflags>"-Wl,-z,defs,--warn-once" <variant>coverage:<cxxflags>"-W -Wall -Werror -Wwrite-strings -std=c++1y --coverage -fvisibility=hidden" <variant>coverage:<linkflags>"-Wl,-z,defs,--warn-once --coverage" - <variant>component:<cxxflags>"-W -Wall -Werror -Wwrite-strings -std=c++1y -fPIC -fvisibility=hidden" - <variant>component:<linkflags>"-Wl,-z,lazy,--warn-once,-fPIC" ; -build-project gentoobrowse-api ; -build-project gentoobrowse-client ; -# build-project icetray ; -build-project libadhocutil ; -build-project libdbpp ; build-project libjsonpp ; -build-project libmisc ; -build-project libmysqlpp ; -build-project libodbcpp ; -build-project libpqpp ; -build-project libsqlitepp ; -build-project libtmdb ; -build-project mythfs ; -build-project netfs ; -# build-project p2pvr ; -build-project project2 ; -build-project slicer ; # Some useful aliases -lib xml++-3.0 ; -lib xml2 ; lib glibmm-2.4 ; lib gobject-2.0 ; lib glib-2.0 ; lib sigc-2.0 ; -alias libxmlpp : : : : - <include>/usr/include/libxml++-3.0 - <include>/usr/lib/libxml++-3.0/include - <include>/usr/include/libxml2 - <include>/usr/include/glibmm-2.4 - <include>/usr/lib/glibmm-2.4/include - <include>/usr/include/glib-2.0 - <include>/usr/lib/glib-2.0/include - <include>/usr/include/sigc++-2.0 - <include>/usr/lib/sigc++-2.0/include - <library>xml++-3.0 - <library>xml2 - <library>glibmm-2.4 - <library>gobject-2.0 - <library>glib-2.0 - <library>sigc-2.0 - ; - alias glibmm : : : : <include>/usr/include/glibmm-2.4 <include>/usr/lib/glibmm-2.4/include diff --git a/libjsonpp/Jamfile.jam b/libjsonpp/Jamfile.jam index b9b9b33..54caf38 100644 --- a/libjsonpp/Jamfile.jam +++ b/libjsonpp/Jamfile.jam @@ -2,24 +2,17 @@ import package ; import testing ; import lex ; -alias glibmm : : : : - <cflags>"`pkg-config --cflags glibmm-2.4`" - <linkflags>"`pkg-config --libs glibmm-2.4`" - ; lib boost_utf : : <name>boost_unit_test_framework ; lib boost_system ; lib boost_filesystem ; path-constant me : . ; -cpp-pch pch : pch.hpp : - <library>glibmm - ; lib jsonpp : - pch [ glob *.cpp *.ll : test*.cpp ] + [ glob *.cpp *.ll : test*.cpp ] : <include>. - <library>glibmm + <library>..//glibmm <define>yyFlexLexer=jsonBaseFlexLexer : : <include>. @@ -27,7 +20,6 @@ lib jsonpp : run testParse.cpp - pch : : : <define>ROOT=\"$(me)\" <define>BOOST_TEST_DYN_LINK @@ -41,7 +33,6 @@ run run testSerialise.cpp - pch : : : <define>ROOT=\"$(me)\" <define>BOOST_TEST_DYN_LINK @@ -55,7 +46,6 @@ run run testEncoding.cpp - pch : : : <define>ROOT=\"$(me)\" <define>BOOST_TEST_DYN_LINK @@ -68,3 +58,4 @@ run ; package.install install : <install-source-root>. : : jsonpp : [ glob *.h ] ; + diff --git a/libjsonpp/parse.cpp b/libjsonpp/parse.cpp index d74d8f0..3c5189b 100644 --- a/libjsonpp/parse.cpp +++ b/libjsonpp/parse.cpp @@ -1,4 +1,3 @@ -#include <pch.hpp> #include "jsonpp.h" #include <FlexLexer.h> #include "jsonFlexLexer.h" diff --git a/libjsonpp/pch.hpp b/libjsonpp/pch.hpp deleted file mode 100644 index 97eb890..0000000 --- a/libjsonpp/pch.hpp +++ /dev/null @@ -1,16 +0,0 @@ -#ifdef BOOST_BUILD_PCH_ENABLED -#ifndef JSON_PCH -#define JSON_PCH - -#include <boost/variant.hpp> -#include <boost/bind.hpp> -#include <boost/function.hpp> -#include <glibmm/ustring.h> -#include <glibmm/convert.h> -#include <map> -#include <list> -#include <stack> - -#endif -#endif - diff --git a/libjsonpp/serialize.cpp b/libjsonpp/serialize.cpp index b9456a7..97cf7ba 100644 --- a/libjsonpp/serialize.cpp +++ b/libjsonpp/serialize.cpp @@ -1,4 +1,3 @@ -#include <pch.hpp> #include "jsonpp.h" #include <glibmm/convert.h> #include <ios> diff --git a/libjsonpp/testEncoding.cpp b/libjsonpp/testEncoding.cpp index 025de2e..a983bdf 100644 --- a/libjsonpp/testEncoding.cpp +++ b/libjsonpp/testEncoding.cpp @@ -1,5 +1,3 @@ -#include <pch.hpp> - #define BOOST_TEST_MODULE encoding #include <boost/test/unit_test.hpp> diff --git a/libjsonpp/testParse.cpp b/libjsonpp/testParse.cpp index fd98c44..77fe975 100644 --- a/libjsonpp/testParse.cpp +++ b/libjsonpp/testParse.cpp @@ -1,5 +1,3 @@ -#include <pch.hpp> - #define BOOST_TEST_MODULE parsing #include <boost/test/unit_test.hpp> diff --git a/libjsonpp/testSerialise.cpp b/libjsonpp/testSerialise.cpp index 98e9b41..fb90930 100644 --- a/libjsonpp/testSerialise.cpp +++ b/libjsonpp/testSerialise.cpp @@ -1,5 +1,3 @@ -#include <pch.hpp> - #define BOOST_TEST_MODULE serialise #include <boost/test/unit_test.hpp> |