From e04eced93da1907e803c065a953ffe0d6540e1cb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 16 Jan 2016 15:58:56 +0000 Subject: Use asdclib-cth rather than in-tree copy. --- wscript | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 7e35890..d44faf6 100644 --- a/wscript +++ b/wscript @@ -35,8 +35,12 @@ def configure(conf): conf.env.LIB_CXML = ['glibmm-2.4', 'glib-2.0', 'pcre', 'sigc-2.0', 'rt', 'xml++-2.6', 'xml2', 'pthread', 'lzma', 'dl', 'z'] conf.env.STLIB_CXML = ['cxml'] conf.check_cfg(package='libcxml', atleast_version='0.14.0', args='--cflags', uselib_store='CXML', mandatory=True) + conf.env.HAVE_ASDCPLIB_CTH = 1 + conf.env.STATIC_ASDCPLIB_CTH = ['asdcplib-cth', 'kumu-cth'] + conf.check_cfg(package='libasdcp-cth', atleast_version='2.5.11-cth1', args='--cflags', uselib_store='ASDCPLIB_CTH', mandatory=True) else: conf.check_cfg(package='libcxml', atleast_version='0.14.0', args='--cflags --libs', uselib_store='CXML', mandatory=True) + conf.check_cfg(package='libasdcp-cth', atleast_version='2.5.11-cth1', args='--cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True) boost_lib_suffix = '' if conf.env.TARGET_WINDOWS: @@ -83,7 +87,6 @@ def configure(conf): if not conf.env.DISABLE_TESTS: conf.recurse('test') - conf.recurse('asdcplib') def build(bld): create_version_cc(bld, VERSION) @@ -96,14 +99,13 @@ 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%s -lkumu-libsub%s -lboost_system%s" % (bld.env.API_VERSION, bld.env.API_VERSION, bld.env.API_VERSION, boost_lib_suffix), + libs="-L${libdir} -lsub%s -lboost_system%s" % (bld.env.API_VERSION, boost_lib_suffix), install_path='${LIBDIR}/pkgconfig') bld.recurse('src') if not bld.env.DISABLE_TESTS: bld.recurse('test') bld.recurse('tools') - bld.recurse('asdcplib') bld.add_post_fun(post) -- cgit v1.2.3