summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-01-21 12:15:04 +0000
committerCarl Hetherington <cth@carlh.net>2015-01-21 12:15:04 +0000
commit4852f117313c4557af75b364672b194786d3a9c5 (patch)
treeca8cd231d833d7645cf648bd5f972933a1e208bb
parent9921abde166acf400a1c716c1d6f57eee1aef010 (diff)
Use API version for libkumu/asdcp libraries.
-rw-r--r--asdcplib/src/wscript10
-rw-r--r--src/wscript2
-rw-r--r--wscript2
3 files changed, 7 insertions, 7 deletions
diff --git a/asdcplib/src/wscript b/asdcplib/src/wscript
index 7c78616..e306fa5 100644
--- a/asdcplib/src/wscript
+++ b/asdcplib/src/wscript
@@ -13,8 +13,8 @@ def build(bld):
else:
obj = bld(features = 'cxx cxxshlib')
- obj.name = 'libkumu-libsub'
- obj.target = 'kumu-libsub'
+ obj.name = 'libkumu-libsub%s' % bld.env.API_VERSION
+ obj.target = 'kumu-libsub%s' % bld.env.API_VERSION
obj.uselib = 'OPENSSL BOOST_FILESYSTEM'
obj.includes = ['.']
obj.export_includes = ['.']
@@ -32,10 +32,10 @@ def build(bld):
else:
obj = bld(features = 'cxx cxxshlib')
- obj.name = 'libasdcp-libsub'
- obj.target = 'asdcp-libsub'
+ obj.name = 'libasdcp-libsub%s' % bld.env.API_VERSION
+ obj.target = 'asdcp-libsub%s' % bld.env.API_VERSION
obj.uselib = 'OPENSSL'
- obj.use = 'libkumu-libsub'
+ obj.use = 'libkumu-libsub%s' % bld.env.API_VERSION
obj.includes = ['.']
obj.export_includes = ['.']
obj.source = """
diff --git a/src/wscript b/src/wscript
index 149b9ff..89c6e89 100644
--- a/src/wscript
+++ b/src/wscript
@@ -9,7 +9,7 @@ def build(bld):
obj.name = 'libsub%s' % bld.env.API_VERSION
obj.target = 'sub%s' % bld.env.API_VERSION
obj.uselib = 'CXML DCP BOOST_FILESYSTEM BOOST_LOCALE'
- obj.use = 'libkumu-libsub libasdcp-libsub'
+ obj.use = 'libkumu-libsub%s libasdcp-libsub%s' % (bld.env.API_VERSION, bld.env.API_VERSION)
obj.export_includes = ['.']
obj.source = """
colour.cc
diff --git a/wscript b/wscript
index 4c61195..b668f68 100644
--- a/wscript
+++ b/wscript
@@ -87,7 +87,7 @@ def build(bld):
bld(source='libsub%s.pc.in' % bld.env.API_VERSION,
version=VERSION,
includedir='%s/include/libsub%s' % (bld.env.PREFIX, bld.env.API_VERSION),
- libs="-L${libdir} -lsub%s -lasdcp-libsub -lkumu-libsub -lboost_system%s" % (bld.env.API_VERSION, boost_lib_suffix),
+ libs="-L${libdir} -lsub%s -lasdcp-libsub%s -lkumu-libsub%s -lboost_system%s" % (bld.env.API_VERSION, bld.env.API_VERSION, bld.env.API_VERSION, boost_lib_suffix),
install_path='${LIBDIR}/pkgconfig')
bld.recurse('src')