aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-05-02 22:57:09 +0000
committerDavid Robillard <d@drobilla.net>2011-05-02 22:57:09 +0000
commit9cdd6c6219e9a103bdaa9249ad270ee54cf62a92 (patch)
treeab45744e78da921681e41507be9b7ccd2347ab08
parent3ef3583423f162dc1860523deed95fa215ff5c10 (diff)
downloadserd-9cdd6c6219e9a103bdaa9249ad270ee54cf62a92.tar.gz
serd-9cdd6c6219e9a103bdaa9249ad270ee54cf62a92.tar.bz2
serd-9cdd6c6219e9a103bdaa9249ad270ee54cf62a92.zip
Define SERD_CFLAGS and SERD_LIBS in environment (for recursive project building).
git-svn-id: http://svn.drobilla.net/serd/trunk@155 490d8e77-9747-427b-9fa3-0b8f29cee8a0
-rw-r--r--serd.pc.in4
-rw-r--r--wscript9
2 files changed, 10 insertions, 3 deletions
diff --git a/serd.pc.in b/serd.pc.in
index c6006255..c611e692 100644
--- a/serd.pc.in
+++ b/serd.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
Name: Serd
Version: @SERD_VERSION@
Description: Lightweight RDF syntax library
-Libs: -L${libdir} -lserd-@SERD_MAJOR_VERSION@
-Cflags: -I${includedir}/serd-@SERD_MAJOR_VERSION@
+Libs: @SERD_LIBS@
+Cflags: @SERD_CFLAGS@
diff --git a/wscript b/wscript
index 41a68dc3..fc8b93da 100644
--- a/wscript
+++ b/wscript
@@ -53,6 +53,11 @@ def configure(conf):
autowaf.define(conf, 'SERD_VERSION', SERD_VERSION)
conf.write_config_header('serd-config.h', remove=False)
+ conf.env['SERD_CFLAGS'] = '-I%s/serd-%s' % (
+ conf.env['INCLUDEDIR'], SERD_MAJOR_VERSION);
+ conf.env['SERD_LIBS'] = '-L%s -lserd-%s' % (
+ conf.env['LIBDIR'], SERD_MAJOR_VERSION);
+
autowaf.display_msg(conf, "Utilities", str(conf.env['BUILD_UTILS']))
autowaf.display_msg(conf, "Unit tests", str(conf.env['BUILD_TESTS']))
print('')
@@ -64,7 +69,9 @@ def build(bld):
# Pkgconfig file
autowaf.build_pc(bld, 'SERD', SERD_VERSION, SERD_MAJOR_VERSION, [],
- {'SERD_MAJOR_VERSION' : SERD_MAJOR_VERSION})
+ {'SERD_CFLAGS' : bld.env['SERD_CFLAGS'],
+ 'SERD_LIBS' : bld.env['SERD_LIBS'],
+ 'SERD_MAJOR_VERSION' : SERD_MAJOR_VERSION})
lib_source = '''
src/env.c