summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-05-02 22:57:28 +0000
committerDavid Robillard <d@drobilla.net>2011-05-02 22:57:28 +0000
commit86a0dfa80fff11f10bf6e3634b404a93d0800abb (patch)
treec91d9d652ca0e57f7aa7bcfa39bd82d6988d8674
parent98d5ce707366a4955bf072389cbc8b1029e1d2a9 (diff)
downloadsord-86a0dfa80fff11f10bf6e3634b404a93d0800abb.tar.gz
sord-86a0dfa80fff11f10bf6e3634b404a93d0800abb.tar.bz2
sord-86a0dfa80fff11f10bf6e3634b404a93d0800abb.zip
Include Serd flags in pkg-config file
git-svn-id: http://svn.drobilla.net/sord/trunk@103 3d64ff67-21c5-427c-a301-fe4f08042e5a
-rw-r--r--sord.pc.in4
-rw-r--r--wscript7
2 files changed, 8 insertions, 3 deletions
diff --git a/sord.pc.in b/sord.pc.in
index 4705fc3..890a4cb 100644
--- a/sord.pc.in
+++ b/sord.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
Name: Sord
Version: @SORD_VERSION@
Description: A lightweight C library for storing RDF statements in memory.
-Libs: -L${libdir} -lsord-@SORD_MAJOR_VERSION@
-Cflags: -I${includedir}/sord-@SORD_MAJOR_VERSION@
+Libs: @SORD_LIBS@ @SERD_LIBS@
+Cflags: @SORD_CFLAGS@ @SERD_CFLAGS@
diff --git a/wscript b/wscript
index af0c593..3964a64 100644
--- a/wscript
+++ b/wscript
@@ -58,6 +58,11 @@ def configure(conf):
autowaf.define(conf, 'SORD_VERSION', SORD_VERSION)
conf.write_config_header('sord-config.h', remove=False)
+ conf.env['SORD_CFLAGS'] = '-I%s/sord-%s' % (
+ conf.env['INCLUDEDIR'], SORD_MAJOR_VERSION)
+ conf.env['SORD_LIBS'] = '-L%s -lsord-%s' % (
+ conf.env['LIBDIR'], SORD_MAJOR_VERSION)
+
autowaf.display_msg(conf, "Utilities", bool(conf.env['BUILD_UTILS']))
autowaf.display_msg(conf, "Unit tests", bool(conf.env['BUILD_TESTS']))
autowaf.display_msg(conf, "Debug dumping", dump)
@@ -70,7 +75,7 @@ def build(bld):
bld.install_files(includedir, bld.path.ant_glob('sord/*.hpp'))
# Pkgconfig file
- autowaf.build_pc(bld, 'SORD', SORD_VERSION, SORD_MAJOR_VERSION, [],
+ autowaf.build_pc(bld, 'SORD', SORD_VERSION, SORD_MAJOR_VERSION, 'SERD',
{'SORD_MAJOR_VERSION' : SORD_MAJOR_VERSION})
# Library