summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-11-23 02:25:23 +0000
committerDavid Robillard <d@drobilla.net>2012-11-23 02:25:23 +0000
commit3a779910b25092981e7dd84d976987e7556916a4 (patch)
tree826aaab605cd2bddc3aba9cddd2ca6c70942fcfa
parent40e7c46be2a8d4db8dfddbd0c25a44608a21cb9d (diff)
downloadlilv-3a779910b25092981e7dd84d976987e7556916a4.tar.gz
lilv-3a779910b25092981e7dd84d976987e7556916a4.tar.bz2
lilv-3a779910b25092981e7dd84d976987e7556916a4.zip
Correctly depend on serd at build time (fix compilation in odd cases)
git-svn-id: http://svn.drobilla.net/lad/trunk/lilv@4855 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--NEWS1
-rw-r--r--wscript9
2 files changed, 5 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 0517142..d90f795 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
lilv (0.14.5) unstable;
* Disable timestamps in HTML documentation for reproducible build
+ * Correctly depend on serd at build time (fix compilation in odd cases)
-- David Robillard <d@drobilla.net> Sun, 09 Sep 2012 03:19:01 -0400
diff --git a/wscript b/wscript
index 1e64859..856aca6 100644
--- a/wscript
+++ b/wscript
@@ -234,7 +234,7 @@ def build(bld):
defines = ['LILV_SHARED', 'LILV_INTERNAL'],
cflags = libflags,
lib = lib)
- autowaf.use_lib(bld, obj, 'SORD SRATOM LV2')
+ autowaf.use_lib(bld, obj, 'SERD SORD SRATOM LV2')
# Static library
if bld.env.BUILD_STATIC:
@@ -247,7 +247,7 @@ def build(bld):
vnum = LILV_VERSION,
install_path = '${LIBDIR}',
defines = defines + ['LILV_INTERNAL'])
- autowaf.use_lib(bld, obj, 'SORD SRATOM LV2')
+ autowaf.use_lib(bld, obj, 'SERD SORD SRATOM LV2')
if bld.env.BUILD_TESTS:
test_libs = lib
@@ -293,7 +293,7 @@ def build(bld):
defines = defines + ['LILV_INTERNAL'],
cflags = test_cflags,
lib = test_libs)
- autowaf.use_lib(bld, obj, 'SORD SRATOM LV2')
+ autowaf.use_lib(bld, obj, 'SERD SORD SRATOM LV2')
# Unit test program
bpath = os.path.abspath(os.path.join(out, 'test', 'test_plugin.lv2'))
@@ -302,13 +302,12 @@ def build(bld):
source = 'test/lilv_test.c',
includes = ['.', './src'],
use = 'liblilv_profiled',
- uselib = 'SORD LV2',
lib = test_libs,
target = 'test/lilv_test',
install_path = None,
defines = defines + ['LILV_TEST_BUNDLE=\"%s/\"' % bpath],
cflags = test_cflags)
- autowaf.use_lib(bld, obj, 'SORD SRATOM LV2')
+ autowaf.use_lib(bld, obj, 'SERD SORD SRATOM LV2')
# Utilities
if bld.env.BUILD_UTILS: