Update wscripts for portability and steps towards waf 1.6 migration.

Use obj.defines and obj.includes instead of c[xx]flags (more compiler portable).
Use lists instead of space delimited strings (more flexible and waf 1.6 compatible).
Fix crazy long lines.


git-svn-id: svn://localhost/ardour2/branches/3.0@9523 d708f5d6-7413-0410-9779-e7cbd77b26cf

2 files changed, 161 insertions, 94 deletions

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index e65aded080..c869ef9194 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -234,23 +234,28 @@ def set_options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    autowaf.build_version_files(path_prefix+'version.h', path_prefix+'version.cc',
-                    'gtk2_ardour', MAJOR, MINOR, MICRO)
+    autowaf.build_version_files(
+        path_prefix + 'version.h',
+        path_prefix + 'version.cc',
+        'gtk2_ardour', MAJOR, MINOR, MICRO)
     autowaf.configure(conf)
     conf.check_tool('compiler_cxx')
 
     if re.search ("linux", sys.platform) != None:
         autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA')
-        #
-        #       TODO: Insert a sanity check for on OS X
-        #       to ensure that CoreAudio is present....
-        #       Really shouldn't these checks be in AutoWaf?
-        #
-    autowaf.check_pkg(conf, 'flac', uselib_store='FLAC', atleast_version='1.2.1')
-    autowaf.check_pkg(conf, 'gthread', uselib_store='GTHREAD', atleast_version='2.10.1')
-    autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK', atleast_version='2.18')
-    autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.18')
-    autowaf.check_pkg(conf, 'libgnomecanvasmm-2.6', uselib_store='GNOMECANVASMM', atleast_version='2.16')
+
+    # TODO: Insert a sanity check for on OS X to ensure CoreAudio is present
+
+    autowaf.check_pkg(conf, 'flac', uselib_store='FLAC',
+                      atleast_version='1.2.1')
+    autowaf.check_pkg(conf, 'gthread', uselib_store='GTHREAD',
+                      atleast_version='2.10.1')
+    autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK',
+                      atleast_version='2.18')
+    autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM',
+                      atleast_version='2.18')
+    autowaf.check_pkg(conf, 'libgnomecanvasmm-2.6',
+                      uselib_store='GNOMECANVASMM', atleast_version='2.16')
     autowaf.check_pkg(conf, 'ogg', uselib_store='OGG', atleast_version='1.1.2')
 
     conf.check_tool('misc') # subst tool
@@ -287,8 +292,8 @@ def build_color_scheme(path, prefix):
 
 
 def build(bld):
-    # GTK front-end; if we're using VST we build this as a shared library, otherwise
-    # it's a normal executabale
+    # GTK front-end; if we're using VST we build this as a shared library,
+    # otherwise it's a normal executabale
     if bld.env['VST_SUPPORT']:
         obj = bld.new_task_gen(features = 'cxx cc cshlib')
     else:
@@ -310,16 +315,17 @@ def build(bld):
                           libgtkmm2ext libtaglib libgnomecanvas-2'''
     if sys.platform == 'darwin':
         obj.uselib_local + ' libappleutility'
-    obj.cflags       = ['-DPACKAGE="gtk2_ardour"']
-    obj.cxxflags     = ['-DPACKAGE="gtk2_ardour"']
-    obj.cxxflags     += ['-DVERSIONSTRING="' + bld.env['VERSION'] + '"']
-    obj.cxxflags     += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"']
-    obj.cxxflags     += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"']
-    obj.cxxflags     += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"']
-    obj.cxxflags     += ['-DLOCALEDIR="' + os.path.join(
-                    os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
-    obj.cxxflags     += ['-DPROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"']
-    obj.cxxflags     += ['-I../libs']
+    obj.defines     = [
+        'PACKAGE="gtk2_ardour"',
+        'VERSIONSTRING="' + bld.env['VERSION'] + '"',
+        'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
+        'CONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"',
+        'MODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"',
+        'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']),
+                                     'locale') + '"',
+        'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"'
+        ]
+    obj.includes += ['../libs']
 
     if bld.env['HAVE_SUIL']:
         obj.source += [ 'lv2_plugin_ui.cc' ]
@@ -333,10 +339,10 @@ def build(bld):
 
     if bld.env['VST_SUPPORT']:
         obj.source += [ 'vst_pluginui.cc' ]
-        obj.cxxflags += [ '-DVST_SUPPORT' ]
+        obj.defines += [ 'VST_SUPPORT' ]
 
     if bld.env['PHONE_HOME']:
-        obj.cxxflags += [ '-DPHONE_HOME' ]
+        obj.defines += [ 'PHONE_HOME' ]
 
     if bld.env['COREAUDIO']:
         TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc']
@@ -346,8 +352,8 @@ def build(bld):
         obj.source += [ 'x11.cc' ]
 
     if bld.env['VST_SUPPORT']:
-        # If we require VST support we build a stub main() and the FST library here using
-        # winegcc, and link it to the GTK front-end library
+        # If we require VST support we build a stub main() and the FST library
+        # here using winegcc, and link it to the GTK front-end library
         obj = bld.new_task_gen (features = 'cxx cc cprogram wine')
         obj.source = '''
                 ../libs/fst/fst.c
@@ -361,7 +367,9 @@ def build(bld):
         obj.linkflags = ['-mwindows', '-Wl,--export-dynamic', '-lpthread']
         obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX']
         obj.uselib = 'ALSA'
-        obj.uselib_local = '''libpbd libmidipp libtaglib libardour libardour_cp libgtkmm2ext libtaglib gtk2_ardour'''
+        obj.uselib_local = ['libpbd','libmidipp','libtaglib','libardour',
+                            'libardour_cp','libgtkmm2ext','libtaglib',
+                            'gtk2_ardour']
 
     # Wrappers
 
@@ -437,9 +445,11 @@ def build(bld):
             light_rc_subst_dict[key] = fontstyle
 
     # RC files
-    dark_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme ('gtk2_ardour/ardour3_ui_dark.rc.in', 'ARDOUR_DARK')
+    dark_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme(
+        'gtk2_ardour/ardour3_ui_dark.rc.in', 'ARDOUR_DARK')
     dark_rc_subst_dict['COLPREFIX'] = 'ARDOUR_DARK'
-    light_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme ('gtk2_ardour/ardour3_ui_light.rc.in', 'ARDOUR_LIGHT')
+    light_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme(
+        'gtk2_ardour/ardour3_ui_light.rc.in', 'ARDOUR_LIGHT')
     light_rc_subst_dict['COLPREFIX'] = 'ARDOUR_LIGHT'
 
     obj              = bld.new_task_gen('subst')
@@ -467,22 +477,25 @@ def build(bld):
     obj.argv = menus_argv
     obj.stdin = 'ardour.menus.in'
     obj.stdout = 'ardour.menus'
-    bld.install_files(os.path.join(bld.env['CONFIGDIR'], 'ardour3'), 'ardour.menus')
+    bld.install_files(os.path.join(bld.env['CONFIGDIR'], 'ardour3'),
+                      'ardour.menus')
 
     # Keybindings
 
-    # 'SAE-de-keypad', 'SAE-de-nokeypad', 'SAE-us-keypad', 'SAE-us-nokeypad', 'ergonomic-us'
+    # 'SAE-de-keypad', 'SAE-de-nokeypad', 'SAE-us-keypad',
+    # 'SAE-us-nokeypad', 'ergonomic-us'
 
     for b in [ 'mnemonic-us' ] :
         obj = bld.new_task_gen (
-                target = b + '.bindings',
-                source = b + '.bindings.in',
-                rule = '../tools/fmt-bindings --winkey="%s" --accelmap <${SRC} >${TGT}' % bld.env['WINDOWS_KEY']
-                )
+            target = b + '.bindings',
+            source = b + '.bindings.in',
+            rule = '../tools/fmt-bindings --winkey="%s" --accelmap <${SRC} >${TGT}' % bld.env['WINDOWS_KEY']
+            )
         obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
 
     # not modified at present
-    bld.install_files(os.path.join(bld.env['CONFIGDIR'], 'ardour3'), 'step_editing.bindings')
+    bld.install_files(os.path.join(bld.env['CONFIGDIR'], 'ardour3'),
+                      'step_editing.bindings')
 
     # Icons/Images
     bld.install_files('${DATADIR}/ardour3/icons', 'icons/*.png')
@@ -500,7 +513,9 @@ def build(bld):
         mo_files = glob.glob (os.path.join (bld.get_curdir(), 'po/*.mo'))
         for mo in mo_files:
             lang = os.path.basename (mo).replace ('.mo', '')
-            bld.install_as (os.path.join (bld.env['PREFIX'], 'share', 'locale', lang, 'LC_MESSAGES', APPNAME + '.mo'), mo)
+            bld.install_as (os.path.join(bld.env['PREFIX'], 'share', 'locale',
+                                         lang, 'LC_MESSAGES', APPNAME + '.mo'),
+                            mo)
 
 def i18n(bld):
-    autowaf.build_i18n (bld, srcdir, 'gtk2_ardour', APPNAME, gtk2_ardour_sources)
+    autowaf.build_i18n(bld, srcdir, 'gtk2_ardour', APPNAME, gtk2_ardour_sources)
diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 6425e71bf4..b4d4d96f62 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -235,28 +235,43 @@ def set_options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    autowaf.build_version_files(path_prefix+'ardour/version.h', path_prefix+'version.cc',
-                    'libardour3', MAJOR, MINOR, MICRO)
+    autowaf.build_version_files(
+        path_prefix + 'ardour/version.h',
+        path_prefix + 'version.cc',
+        'libardour3', MAJOR, MINOR, MICRO)
     autowaf.configure(conf)
     conf.check_tool('compiler_cxx gas')
-    autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', atleast_version='0.3.2')
-    autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.118.2')
+    autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO',
+                      atleast_version='0.3.2')
+    autowaf.check_pkg(conf, 'jack', uselib_store='JACK',
+                      atleast_version='0.118.2')
     autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
-    autowaf.check_pkg(conf, 'lrdf', uselib_store='LRDF', atleast_version='0.4.0')
-    autowaf.check_pkg(conf, 'samplerate', uselib_store='SAMPLERATE', atleast_version='0.1.0')
-    autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')
-    autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV', atleast_version='0.0.0', mandatory=False)
+    autowaf.check_pkg(conf, 'lrdf', uselib_store='LRDF',
+                      atleast_version='0.4.0')
+    autowaf.check_pkg(conf, 'samplerate', uselib_store='SAMPLERATE',
+                      atleast_version='0.1.0')
+    autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP',
+                      atleast_version='2.0')
+    autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV',
+                      atleast_version='0.0.0', mandatory=False)
     if conf.env['HAVE_LILV']:
-        autowaf.check_pkg(conf, 'suil-0', uselib_store='SUIL', atleast_version='0.2.0', mandatory=False)
+        autowaf.check_pkg(conf, 'suil-0', uselib_store='SUIL',
+                          atleast_version='0.2.0', mandatory=False)
     else:
-        autowaf.check_pkg(conf, 'slv2', uselib_store='SLV2', atleast_version='0.6.4', mandatory=False)
+        autowaf.check_pkg(conf, 'slv2', uselib_store='SLV2',
+                          atleast_version='0.6.4', mandatory=False)
         if conf.env['HAVE_SLV2']:
-            autowaf.check_pkg(conf, 'rasqal', uselib_store='RASQAL', atleast_version='0.9.14', mandatory=False)
-    autowaf.check_pkg(conf, 'soundtouch-1.0', uselib_store='SOUNDTOUCH', mandatory=False)
-    autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False)
+            autowaf.check_pkg(conf, 'rasqal', uselib_store='RASQAL',
+                              atleast_version='0.9.14', mandatory=False)
+    autowaf.check_pkg(conf, 'soundtouch-1.0', uselib_store='SOUNDTOUCH',
+                      mandatory=False)
+    autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT',
+                      atleast_version='1.12.0', mandatory=False)
     autowaf.check_pkg(conf, 'ogg', uselib_store='OGG', atleast_version='1.1.2')
-    autowaf.check_pkg(conf, 'flac', uselib_store='FLAC', atleast_version='1.2.1')
-    autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL', atleast_version='7.0.0')
+    autowaf.check_pkg(conf, 'flac', uselib_store='FLAC',
+                      atleast_version='1.2.1')
+    autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL',
+                      atleast_version='7.0.0')
 
     # we don't try to detect this, since its part of our source tree
 
@@ -268,26 +283,48 @@ def configure(conf):
     conf.check(header_name='sys/vfs.h', define_name='HAVE_SYS_VFS_H')
     conf.check(header_name='wordexp.h', define_name='HAVE_WORDEXP')
 
-    conf.check(header_name='jack/session.h', uselib = [ 'JACK' ], define_name='HAVE_JACK_SESSION')
+    conf.check(header_name='jack/session.h', uselib = [ 'JACK' ],
+               define_name='HAVE_JACK_SESSION')
 
     conf.check(header_name='unistd.h', define_name='HAVE_UNISTD')
 
-    conf.check_cc(fragment = "#include <jack/jack.h>\nvoid callback (int code, const char* reason, void* arg) { return; }\nint main(int argc, char **argv) { jack_client_t* c; jack_on_info_shutdown (c, callback, (void*) 0); return 0; }\n",
+    conf.check_cc(fragment = '''
+#include <jack/jack.h>
+void callback(int code, const char* reason, void* arg) { return; }
+int main(int argc, char **argv) {
+    jack_client_t* c;
+    jack_on_info_shutdown(c, callback, (void*) 0);
+    return 0;
+}''',
                   uselib= [ 'JACK' ],
                   msg = 'Checking for jack_on_info_shutdown',
                   define_name = 'HAVE_JACK_ON_INFO_SHUTDOWN',
                   okmsg = 'present')
 
-    missing_jack_message = 'missing - a version of JACK that supports jack_port_set_latency_range() is required to compile Ardour3\nCurrently this means using JACK version 0.120.1 from http://www.jackaudio.org/download\n'
-
-    conf.check_cc(fragment = "#include <jack/jack.h>\nint main(int argc, char **argv) { jack_port_t* p; jack_latency_range_t r; jack_port_set_latency_range (p, JackCaptureLatency, &r); return 0; }\n",
+    missing_jack_message = '''missing - a version of JACK that supports \
+jack_port_set_latency_range() is required to compile Ardour3.  Currently this\
+means using JACK version 0.120.1 from http://www.jackaudio.org/download'''
+
+    conf.check_cc(fragment = '''
+#include <jack/jack.h>
+int main(int argc, char **argv) {
+    jack_port_t* p;
+    jack_latency_range_t r;
+    jack_port_set_latency_range(p, JackCaptureLatency, &r);
+    return 0;
+}''',
                   uselib = [ 'JACK' ],
                   msg = 'Checking for new JACK latency API',
                   okmsg = 'present',
                   mandatory = True,
                   errmsg = missing_jack_message)
 
-    conf.check_cc(fragment = '#include <jack/jack.h>\nint main(int argc, char **argv) { jack_port_type_get_buffer_size ((jack_client_t*)0, ""); }\n',
+    conf.check_cc(fragment = '''
+#include <jack/jack.h>
+int main(int argc, char **argv) {
+   jack_port_type_get_buffer_size((jack_client_t*)0, "");
+   return 0;
+}''',
                   uselib = [ 'JACK' ],
                   msg = 'Checking for new jack_port_type_get_buffer_size',
                   okmsg = 'present',
@@ -301,7 +338,7 @@ def configure(conf):
 
     if conf.env['HAVE_LILV'] or conf.env['HAVE_SLV2']:
         conf.define ('LV2_SUPPORT', 1)
-    
+
     conf.write_config_header('libardour-config.h')
 
     # Boost headers
@@ -319,32 +356,40 @@ def build(bld):
     obj.includes     = ['.', '../surfaces/control_protocol', '..']
     obj.name         = 'libardour'
     obj.target       = 'ardour'
-    obj.uselib       = 'GLIBMM GTHREAD AUBIO SIGCPP XML UUID JACK SNDFILE SAMPLERATE LRDF AUDIOUNIT OSX BOOST CURL DL'
-    obj.uselib_local = 'libpbd libmidipp libevoral libvamphost libvampplugin libtaglib librubberband libaudiographer'
+    obj.uselib       = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
+                        'JACK','SNDFILE','SAMPLERATE','LRDF','AUDIOUNIT',
+                        'OSX','BOOST','CURL','DL']
+    obj.uselib_local = ['libpbd','libmidipp','libevoral','libvamphost',
+                        'libvampplugin','libtaglib','librubberband',
+                        'libaudiographer']
     obj.vnum         = LIBARDOUR_LIB_VERSION
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-    obj.cxxflags     = ['-DPACKAGE="libardour3"']
-    obj.cxxflags     += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"']
-    obj.cxxflags     += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"']
-    obj.cxxflags     += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"']
-    obj.cxxflags     += ['-DLOCALEDIR="' + os.path.join(
-                    os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
-    obj.cxxflags     += ['-DVAMP_DIR="' + os.path.join(
-                    os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"']
-    obj.cxxflags     += ['-DPROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"']
+    obj.defines      = [
+        'PACKAGE="libardour3"',
+        'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
+        'CONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"',
+        'MODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"',
+        'LOCALEDIR="' + os.path.join(
+            os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
+        'VAMP_DIR="' + os.path.join(
+            os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"',
+        'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"'
+        ]
 
     #obj.source += ' st_stretch.cc st_pitch.cc '
     #obj.uselib += ' SOUNDTOUCH '
     #obj.add_objects = 'default/libs/surfaces/control_protocol/smpte_1.o'
 
     if bld.env['HAVE_LILV']:
-        obj.source += [ 'lv2_plugin_lilv.cc', 'lv2_event_buffer.cc', 'uri_map.cc', 'rdff.c' ]
-        obj.uselib += ' LILV '
+        obj.source += [ 'lv2_plugin_lilv.cc', 'lv2_event_buffer.cc',
+                        'uri_map.cc', 'rdff.c' ]
+        obj.uselib += ['LILV']
         if bld.env['HAVE_SUIL']:
-            obj.uselib += ' SUIL '
+            obj.uselib += ['SUIL']
     elif bld.env['HAVE_SLV2']:
-        obj.source += [ 'lv2_plugin.cc', 'lv2_event_buffer.cc', 'uri_map.cc', 'rdff.c' ]
-        obj.uselib += ' SLV2 RASQAL '
+        obj.source += [ 'lv2_plugin.cc', 'lv2_event_buffer.cc',
+                        'uri_map.cc', 'rdff.c' ]
+        obj.uselib += ['SLV2','RASQAL']
 
     if bld.env['VST_SUPPORT']:
         obj.source += [ 'vst_plugin.cc', 'session_vst.cc' ]
@@ -353,21 +398,24 @@ def build(bld):
 
     if bld.env['COREAUDIO']:
         obj.source += [ 'coreaudiosource.cc', 'caimportable.cc' ]
-        obj.uselib_local += ' libappleutility'
+        obj.uselib_local += ['libappleutility']
         obj.source += [ 'audio_unit.cc' ]
 
     if bld.env['FPU_OPTIMIZATION']:
-        if bld.env['build_target'] == 'i386' or bld.env['build_target'] == 'i686':
+        if (bld.env['build_target'] == 'i386'
+            or bld.env['build_target'] == 'i686'):
             obj.source += [ 'sse_functions_xmm.cc', 'sse_functions.s' ]
         elif bld.env['build_target'] == 'x86_64':
             obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit.s' ]
 
     # i18n
     if bld.env['ENABLE_NLS']:
-        mo_files = glob.glob (os.path.join (bld.get_curdir(), 'po/*.mo'))
+        mo_files = glob.glob(os.path.join(bld.get_curdir(), 'po/*.mo'))
         for mo in mo_files:
-            lang = os.path.basename (mo).replace ('.mo', '')
-            bld.install_as (os.path.join (bld.env['PREFIX'], 'share', 'locale', lang, 'LC_MESSAGES', APPNAME + '.mo'), mo)
+            lang = os.path.basename(mo).replace('.mo', '')
+            bld.install_as(os.path.join(bld.env['PREFIX'], 'share', 'locale',
+                                        lang, 'LC_MESSAGES', APPNAME + '.mo'),
+                           mo)
 
     if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:
         # Unit tests
@@ -381,22 +429,26 @@ def build(bld):
                 test/testrunner.cpp
         '''.split()
         testobj.includes     = obj.includes + ['test', '../pbd']
-        testobj.uselib       = 'CPPUNIT SIGCPP JACK GLIBMM GTHREAD SAMPLERATE XML LRDF COREAUDIO'
-        testobj.uselib_local = 'libpbd libmidipp libardour'
+        testobj.uselib       = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD',
+                                'SAMPLERATE','XML','LRDF','COREAUDIO']
+        testobj.uselib_local = ['libpbd','libmidipp','libardour']
         testobj.name         = 'libardour-tests'
         testobj.target       = 'run-tests'
         testobj.install_path = ''
-        testobj.cxxflags     = ['-DPACKAGE="libardour3test"']
-        testobj.cxxflags     += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"']
-        testobj.cxxflags     += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"']
-        testobj.cxxflags     += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"']
-        testobj.cxxflags     += ['-DLOCALEDIR="' + os.path.join(
-                        os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
-        testobj.cxxflags     += ['-DVAMP_DIR="' + os.path.join(
-                        os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"']
+        testobj.defines      = [
+            'PACKAGE="libardour3test"',
+            'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
+            'CONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"',
+            'MODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"',
+            'LOCALEDIR="' + os.path.join(
+                os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
+            'VAMP_DIR="' + os.path.join(
+                os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"'
+            ]
         if bld.env['FPU_OPTIMIZATION']:
             testobj.source += [ 'sse_functions_xmm.cc' ]
-            if bld.env['build_target'] == 'i386' or bld.env['build_target'] == 'i686':
+            if (bld.env['build_target'] == 'i386'
+                or bld.env['build_target'] == 'i686'):
                 testobj.source += [ 'sse_functions.s' ]
             elif bld.env['build_target'] == 'x86_64':
                 testobj.source += [ 'sse_functions_64bit.s' ]