From 4a97550203d65df6bca38616319e2be174c817a0 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 10 Sep 2012 17:27:01 +0000 Subject: Support parallel installable debug libraries. git-svn-id: http://svn.drobilla.net/sord/trunk@264 3d64ff67-21c5-427c-a301-fe4f08042e5a --- sord.pc.in | 4 ++-- waf | Bin 72589 -> 72332 bytes wscript | 8 ++------ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/sord.pc.in b/sord.pc.in index 1fe414c..a0a89c1 100644 --- a/sord.pc.in +++ b/sord.pc.in @@ -6,6 +6,6 @@ includedir=@INCLUDEDIR@ Name: Sord Version: @SORD_VERSION@ Description: A lightweight C library for storing RDF statements in memory. -Requires: serd-0 -Libs: -L${libdir} -lsord-@SORD_MAJOR_VERSION@ +Requires: @LIB_SERD@ +Libs: -L${libdir} -l@LIB_SORD@ Cflags: -I${includedir}/sord-@SORD_MAJOR_VERSION@ diff --git a/waf b/waf index 3088b02..9fb2955 100755 Binary files a/waf and b/waf differ diff --git a/wscript b/wscript index c93c443..98b59ab 100644 --- a/wscript +++ b/wscript @@ -76,13 +76,9 @@ def configure(conf): autowaf.define(conf, 'SORD_DEBUG_WRITE', 1) autowaf.define(conf, 'SORD_VERSION', SORD_VERSION) + autowaf.set_lib_env(conf, 'sord', SORD_VERSION) conf.write_config_header('sord_config.h', remove=False) - # Set up env for building against this serd in case we are a child - conf.env.INCLUDES_SORD = ['${INCLUDEDIR}/sord-%s' % SORD_MAJOR_VERSION] - conf.env.LIBPATH_SORD = [conf.env.LIBDIR] - conf.env.LIB_SORD = ['sord-%s' % 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) @@ -130,7 +126,7 @@ def build(bld): includes = ['.', './src'], export_includes = ['.'], name = 'libsord_static', - target = 'sord-%s' % SORD_MAJOR_VERSION, + target = 'sord-%s' % lib_suff, vnum = SORD_VERSION, install_path = '${LIBDIR}', libs = libs, -- cgit v1.2.1