diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2017-05-21 15:57:25 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2017-05-21 15:57:25 +0100 |
| commit | ebcb1535c88c695ddde5fe09e0d8c29657cf0f27 (patch) | |
| tree | 907f06300bc1b6de6daab2cc7a74d5dc821a7bb8 | |
| parent | Remove Project2 components (diff) | |
| download | p2pvr-ebcb1535c88c695ddde5fe09e0d8c29657cf0f27.tar.bz2 p2pvr-ebcb1535c88c695ddde5fe09e0d8c29657cf0f27.tar.xz p2pvr-ebcb1535c88c695ddde5fe09e0d8c29657cf0f27.zip | |
Single definition of glibmm
| -rw-r--r-- | libtmdb/Jamfile.jam | 6 | ||||
| -rw-r--r-- | p2pvr/Jamfile.jam | 22 |
2 files changed, 10 insertions, 18 deletions
diff --git a/libtmdb/Jamfile.jam b/libtmdb/Jamfile.jam index c8cf6b3..3144459 100644 --- a/libtmdb/Jamfile.jam +++ b/libtmdb/Jamfile.jam @@ -1,9 +1,5 @@ import testing ; -alias glibmm : : : : - <cflags>"`pkg-config --cflags glibmm-2.4`" - <linkflags>"`pkg-config --libs glibmm-2.4`" - ; lib slicer : : : : <include>/usr/include/slicer ; lib slicer-json : : : : <include>/usr/include/slicer ; lib Ice ; @@ -25,7 +21,7 @@ lib tmdb : <library>slicer <library>slicer-json <library>boost_system - <library>glibmm + <library>..//glibmm <library>curl <library>adhocutil <slicer>yes diff --git a/p2pvr/Jamfile.jam b/p2pvr/Jamfile.jam index 0e61105..a74d82c 100644 --- a/p2pvr/Jamfile.jam +++ b/p2pvr/Jamfile.jam @@ -5,46 +5,42 @@ import generators ; lib boost_utf : : <name>boost_unit_test_framework ; lib adhocutil : : : : <include>/usr/include/adhocutil ; -alias glibmm : : : : - <cflags>"`pkg-config --cflags glibmm-2.4`" - <linkflags>"`pkg-config --libs glibmm-2.4`" - ; -alias p2common : glibmm : : : +alias p2common : ..//glibmm : : : <include>/usr/include/project2/common <include>/usr/include/project2/lib <linkflags>"-lp2common" ; -alias p2cgi : glibmm : : : +alias p2cgi : ..//glibmm : : : <include>/usr/include/project2/cgi <linkflags>"-lp2cgicommon" ; -alias p2xml : glibmm : : : +alias p2xml : ..//glibmm : : : <include>/usr/include/project2/xml <linkflags>"-lp2xml" ; -alias p2sql : glibmm : : : +alias p2sql : ..//glibmm : : : <include>/usr/include/dbpp <include>/usr/include/project2/sql <include>/usr/include/project2/basics <linkflags>"-lp2sql -ldbppcore" ; -alias p2streams : glibmm : : : +alias p2streams : ..//glibmm : : : <include>/usr/include/project2/streams <linkflags>"-lp2streams" ; -alias p2ut : glibmm : : : +alias p2ut : ..//glibmm : : : <include>/usr/include/project2/ut <linkflags>"-lp2ut -lp2ut" ; -alias p2basics : glibmm : : : +alias p2basics : ..//glibmm : : : <include>/usr/include/project2/basics <linkflags>"-lp2basics" ; -alias p2ice : glibmm : : : +alias p2ice : ..//glibmm : : : <include>/usr/include/project2/ice <linkflags>"-lp2ice -lp2iceclient" ; -alias p2daemonlib : glibmm : : : +alias p2daemonlib : ..//glibmm : : : <cflags>"-I /usr/include/project2/daemon/lib" <linkflags>"-lp2daemonlib" ; |