From e84092a7acee6c4d1493cbdd23ec5676b923f44d Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 21 Jan 2018 00:41:34 +0100 Subject: Don't build libraries twice when testing is enabled --- src/server/wscript | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'src/server') diff --git a/src/server/wscript b/src/server/wscript index a8efd2f8..c19168f2 100644 --- a/src/server/wscript +++ b/src/server/wscript @@ -61,24 +61,11 @@ def build(bld): target = 'ingen_server', install_path = '${LIBDIR}', use = 'libingen libingen_socket', - cxxflags = bld.env.PTHREAD_CFLAGS, - linkflags = bld.env.PTHREAD_LINKFLAGS) + cxxflags = bld.env.PTHREAD_CFLAGS + bld.env.INGEN_TEST_CXXFLAGS, + linkflags = bld.env.PTHREAD_LINKFLAGS + bld.env.INGEN_TEST_LINKFLAGS) core_libs = 'GLIBMM LV2 LILV RAUL SERD SORD' autowaf.use_lib(bld, obj, core_libs) - if bld.env.BUILD_TESTS: - obj = bld(features = 'cxx cxxshlib', - source = core_source, - export_includes = ['../..'], - includes = ['.', '../..'], - name = 'libingen_server_profiled', - target = 'ingen_server_profiled', - install_path = '${LIBDIR}', - use = 'libingen_profiled', - cxxflags = bld.env.PTHREAD_CFLAGS + bld.env.INGEN_TEST_CXXFLAGS, - linkflags = bld.env.PTHREAD_LINKFLAGS + bld.env.INGEN_TEST_LINKFLAGS) - autowaf.use_lib(bld, obj, core_libs) - if bld.env.HAVE_JACK: obj = bld(features = 'cxx cxxshlib', source = 'JackDriver.cpp ingen_jack.cpp', -- cgit v1.2.1