Use test_search_path to find test data in xpath test

[ardour.git] / libs / pbd / wscript

diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index 4cb4a20f3ea3346f4f013e8d73adbf6eac3d30e4..5c8ed194a8d38e1296dc0822f0226b6380980ad9 100644 (file)
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -43,7 +43,6 @@ libpbd_sources = [
     'debug.cc',
     'enumwriter.cc',
     'event_loop.cc',
-    'dmalloc.cc',
     'enums.cc',
     'epa.cc',
     'error.cc',
@@ -112,10 +111,10 @@ def build(bld):
 
     # Library
     if bld.is_defined ('INTERNAL_SHARED_LIBS'):
-        print 'BUILD SHARED LIB'
+        print('BUILD SHARED LIB')
         obj              = bld.shlib(features = 'cxx cxxshlib', source=libpbd_sources)
     else:
-        print 'BUILD STATIC LIB'
+        print('BUILD STATIC LIB')
         obj              = bld.stlib(features = 'cxx cxxstlib', source=libpbd_sources)
         obj.cxxflags     = [ '-fPIC' ]
 
@@ -129,7 +128,7 @@ def build(bld):
     obj.uselib       = 'GLIBMM SIGCPP XML UUID SNDFILE GIOMM'
     if sys.platform == 'darwin':
         TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc']
-        obj.source += 'cocoa_open_uri.mm'
+        obj.source += [ 'cocoa_open_uri.mm' ]
         obj.uselib += ' OSX'
     obj.vnum         = LIBPBD_LIB_VERSION
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
@@ -148,6 +147,7 @@ def build(bld):
                 test/signals_test.cc
                 test/convert_test.cc
                 test/filesystem_test.cc
+                test/test_common.cc
         '''.split()
         testobj.target       = 'run-tests'
         testobj.includes     = obj.includes + ['test', '../pbd']