Upgrade to waf 1.5.4.

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

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 025cd78271ec543c104532b46abb31a04f8dc603..6949d05d3d486dc10bf0029db792080fca292db9 100644 (file)
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -220,13 +220,13 @@ def build(bld):
        obj.uselib       += ' GTKMM GNOMECANVASMM'
        obj.uselib_local = '''libpbd libmidipp libtaglib libardour libsurfaces
                              libgtkmm2ext libtaglib'''
-       obj.cxxflags     = '-DVERSIONSTRING=\\\"' + GTK2_ARDOUR_VERSION + '\\\"'
-       obj.cxxflags     += ' -DPACKAGE=\\\"gtk2_ardour\\\"'
-       obj.cxxflags     += ' -DDATA_DIR=\\\"' + os.path.normpath(bld.env['DATADIRNAME']) + '\\\"'
-       obj.cxxflags     += ' -DCONFIG_DIR=\\\"' + os.path.normpath(bld.env['CONFIGDIRNAME']) + '\\\"'
-       obj.cxxflags     += ' -DMODULE_DIR=\\\"' + os.path.normpath(bld.env['LIBDIRNAME']) + '\\\"'
-       obj.cxxflags     += ' -DLOCALEDIR=\\\"' + os.path.join(
-                       os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '\\\"'
+       obj.cxxflags     = ['-DVERSIONSTRING="' + GTK2_ARDOUR_VERSION + '"']
+       obj.cxxflags     += ['-DPACKAGE="gtk2_ardour"']
+       obj.cxxflags     += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIRNAME']) + '"']
+       obj.cxxflags     += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIRNAME']) + '"']
+       obj.cxxflags     += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIRNAME']) + '"']
+       obj.cxxflags     += ['-DLOCALEDIR="' + os.path.join(
+                       os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '"']
        
        # Wrappers
 

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index ad6faca6711508c453bb9a6a668858da85bbcddf..342ca79a0a570d3f01677342dbd148e4ac59031a 100644 (file)
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -218,14 +218,14 @@ def build(bld):
        obj.uselib_local = 'libpbd libmidipp libevoral libvamphost libvampplugin libtaglib'
        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     = ['-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.source += ' rb_effect.cc '
        obj.uselib_local += ' librubberband '
        #obj.source += ' st_stretch.cc st_pitch.cc '

diff --git a/libs/evoral/wscript b/libs/evoral/wscript
index c9b400720bb86c8b77da13deac62fc57991394b8..20a2088d17ddcd727f715fa01e9ce4a0059c0b76 100644 (file)
--- a/libs/evoral/wscript
+++ b/libs/evoral/wscript
@@ -53,7 +53,7 @@ def build(bld):
                src/libsmf/smf_tempo.c
        '''
        libsmf.export_incdirs = ['./src/libsmf']
-       libsmf.defines      = 'SMF_VERSION=\\\"1.2\\\"'
+       libsmf.defines      = 'SMF_VERSION="1.2"'
        libsmf.includes     = ['./src']
        libsmf.name         = 'libsmf'
        libsmf.target       = 'smf'

diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index 48a21a71e221c011b9af278ea4b52e48e6ec44fc..81c0dfbacd5e07d60375618a24b6d63d88260780 100644 (file)
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -70,9 +70,10 @@ def build(bld):
        obj.uselib_local = 'libpbd'
        obj.vnum         = GTKMM2EXT_LIB_VERSION
        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-       obj.cxxflags     = '-DPACKAGE=\\\"libgtkmm2ext\\\"'
-       obj.cxxflags     += ' -DLOCALEDIR=\\\"' + os.path.join(
-                       os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '\\\"'
+       obj.cxxflags     = [
+                       '-DPACKAGE="libgtkmm2ext"',
+                       '-DLOCALEDIR="' + os.path.join(
+                               os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '"']
 
 def shutdown():
        autowaf.shutdown()

diff --git a/libs/pbd/gettext.h b/libs/pbd/gettext.h
index 339c74ffe77844c9aa6d4d6c7479ca18f6e378a2..2645402e95ea7e6648560effb35d608d0f0219ce 100644 (file)
--- a/libs/pbd/gettext.h
+++ b/libs/pbd/gettext.h
@@ -20,7 +20,7 @@
 #define _LIBGETTEXT_H 1
 
 /* NLS can be disabled through the configure --disable-nls option.  */
-#if ENABLE_NLS
+#ifdef ENABLE_NLS
 
 /* Get declarations of GNU message catalog functions.  */
 # include <libintl.h>

diff --git a/libs/pbd/mountpoint.cc b/libs/pbd/mountpoint.cc
index e85a299e0bc623bde29839660debbfc70a7bae15..cdc4ccea8d833a1c5a2123862ffd20b24a2fa199 100644 (file)
--- a/libs/pbd/mountpoint.cc
+++ b/libs/pbd/mountpoint.cc
@@ -32,7 +32,7 @@ using std::string;
 #include "wafconfig.h"
 #endif
 
-#if HAVE_GETMNTENT
+#ifdef HAVE_GETMNTENT
 #include <mntent.h>
 
 struct mntent_sorter {

diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index 4c69934baf33cc2fad6d20c425963a7e14b46bab..5e21f8ce7def542d20529441a249c04bb9209b76 100644 (file)
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -91,9 +91,9 @@ def build(bld):
        obj.uselib       = 'GLIBMM SIGCPP XML UUID'
        obj.vnum         = LIBPBD_LIB_VERSION
        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-       obj.cxxflags     = '-DPACKAGE=\\\"libpbd\\\"'
+       obj.cxxflags     = ['-DPACKAGE="libpbd"']
        if bld.env['PBD_HAVE_EXECINFO']:
-               obj.cxxflags += ' -DHAVE_EXECINFO '
+               obj.cxxflags += ['-DHAVE_EXECINFO']
        
 def shutdown():
        autowaf.shutdown()

diff --git a/libs/rubberband/wscript b/libs/rubberband/wscript
index 2ef9155dfbc62e545c71171e28317704ada02673..b5f0e2ad7a49fd52473c0c5bff22bf9c657ba0c3 100644 (file)
--- a/libs/rubberband/wscript
+++ b/libs/rubberband/wscript
@@ -58,7 +58,7 @@ def build(bld):
        obj.uselib_local = 'libvamphost'
        obj.vnum         = LIBRUBBERBAND_LIB_VERSION
        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-       obj.cxxflags     = '-DPACKAGE=\\\"librubberband\\\"'
+       obj.cxxflags     = '-DPACKAGE="librubberband"'
        
 def shutdown():
        autowaf.shutdown()

diff --git a/libs/surfaces/control_protocol/wscript b/libs/surfaces/control_protocol/wscript
index 78a674b375264b8b774671ef759209dea538f946..7994bcf77e2491d719b6af2607310c6e1c69ae3a 100644 (file)
--- a/libs/surfaces/control_protocol/wscript
+++ b/libs/surfaces/control_protocol/wscript
@@ -26,7 +26,7 @@ def build(bld):
                smpte.cc
        '''
        obj.export_incdirs = ['.']
-       obj.cxxflags     = '-DPACKAGE=\\\"ardour_cp\\\"'
+       obj.cxxflags     = '-DPACKAGE="ardour_cp"'
        obj.includes     = ['.']
        obj.name         = 'libsurfaces'
        obj.target       = 'surfaces'

diff --git a/libs/surfaces/frontier/wscript b/libs/surfaces/frontier/wscript
index 5fea9631dd65283780fe6223cca64f9713b32b64..d063008a787b29882cf08ec5bc333305ea9be04a 100644 (file)
--- a/libs/surfaces/frontier/wscript
+++ b/libs/surfaces/frontier/wscript
@@ -34,7 +34,7 @@ def build(bld):
                midicontrollable.cc
        '''
        obj.export_incdirs = ['./generic_midi']
-       obj.cxxflags     = '-DPACKAGE=\\\"ardour_genericmidi\\\"'
+       obj.cxxflags     = '-DPACKAGE="ardour_genericmidi"'
        obj.includes     = ['.', './generic_midi']
        obj.name         = 'libgeneric_midi'
        obj.target       = 'generic_midi'

diff --git a/libs/surfaces/generic_midi/wscript b/libs/surfaces/generic_midi/wscript
index f0b245040ad2185e39ba42fdf4721e3ab0ea7384..81a8bda7922b0be0e811defb3a40224f7954936c 100644 (file)
--- a/libs/surfaces/generic_midi/wscript
+++ b/libs/surfaces/generic_midi/wscript
@@ -26,7 +26,7 @@ def build(bld):
                midicontrollable.cc
        '''
        obj.export_incdirs = ['./generic_midi']
-       obj.cxxflags     = '-DPACKAGE=\\\"ardour_genericmidi\\\"'
+       obj.cxxflags     = '-DPACKAGE="ardour_genericmidi"'
        obj.includes     = ['.', './generic_midi']
        obj.name         = 'libgeneric_midi'
        obj.target       = 'generic_midi'

diff --git a/libs/surfaces/mackie/wscript b/libs/surfaces/mackie/wscript
index 6225ae42e782e5119f4650a05208b5f383c3b5c9..e8d5216694e56b895d86c71e4e3fcaceda79abdb 100644 (file)
--- a/libs/surfaces/mackie/wscript
+++ b/libs/surfaces/mackie/wscript
@@ -41,7 +41,7 @@ def build(bld):
                types.cc
        '''
        obj.export_incdirs = ['./mackie']
-       obj.cxxflags     = '-DPACKAGE=\\\"ardour_mackie\\\"'
+       obj.cxxflags     = '-DPACKAGE="ardour_mackie"'
        obj.includes     = ['.', './mackie']
        obj.name         = 'libmackie'
        obj.target       = 'mackie'

diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript
index 74e21fa3a8263293265c933bc59ec5502049ff78..95566b9339bb7de05e5e6cfadd10e09061ec9e18 100644 (file)
--- a/libs/surfaces/osc/wscript
+++ b/libs/surfaces/osc/wscript
@@ -33,7 +33,7 @@ def build(bld):
                interface.cc
        '''
        obj.export_incdirs = ['./osc']
-       obj.cxxflags     = '-DPACKAGE=\\\"ardour_cp\\\"'
+       obj.cxxflags     = '-DPACKAGE="ardour_cp"'
        obj.includes     = ['.', './osc']
        obj.name         = 'libsurfaces'
        obj.target       = 'surfaces'

diff --git a/libs/surfaces/powermate/wscript b/libs/surfaces/powermate/wscript
index 95aeb7e9f6f7ad102cd17da506085a3fa0ca8c0e..2ce356b0f40c221dac88de1283a1995c9ad04a80 100644 (file)
--- a/libs/surfaces/powermate/wscript
+++ b/libs/surfaces/powermate/wscript
@@ -25,7 +25,7 @@ def build(bld):
                powermate.cc
        '''
        obj.export_incdirs = ['./powermate']
-       obj.cxxflags     = '-DPACKAGE=\\\"ardour_powermate\\\"'
+       obj.cxxflags     = '-DPACKAGE="ardour_powermate"'
        obj.includes     = ['.', './powermate']
        obj.name         = 'libpowermate'
        obj.target       = 'powermate'

diff --git a/libs/surfaces/tranzport/wscript b/libs/surfaces/tranzport/wscript
index e6ee417140d6f22433fa7d7bfabe42a493d74727..d6ab02471a9d825c43c1424b6f6f0e92aae781a4 100644 (file)
--- a/libs/surfaces/tranzport/wscript
+++ b/libs/surfaces/tranzport/wscript
@@ -39,7 +39,7 @@ def build(bld):
                wheel_modes.cc
        '''
        obj.export_incdirs = ['./tranzport']
-       obj.cxxflags     = '-DPACKAGE=\\\"ardour_tranzport\\\"'
+       obj.cxxflags     = '-DPACKAGE="ardour_tranzport"'
        obj.includes     = ['.', './tranzport']
        obj.name         = 'libtranzport'
        obj.target       = 'tranzport'

diff --git a/libs/surfaces/wiimote/wscript b/libs/surfaces/wiimote/wscript
index 6136d7b685b082b2b6a74d103958a097a8cc094b..b5c6e1cd284ffdf230faa0619a58cf1ac1bc03d2 100644 (file)
--- a/libs/surfaces/wiimote/wscript
+++ b/libs/surfaces/wiimote/wscript
@@ -25,7 +25,7 @@ def build(bld):
                interface.cc
        '''
        obj.export_incdirs = ['./wiimote']
-       obj.cxxflags     = '-DPACKAGE=\\\"ardour_wiimote\\\"'
+       obj.cxxflags     = '-DPACKAGE="ardour_wiimote"'
        obj.includes     = ['.', './wiimote']
        obj.name         = 'libwiimote'
        obj.target       = 'wiimote'

diff --git a/waf b/waf
index 1c066b9a95fc605021e4ceabf77e10e9087a1b43..924d0e6aa5f9c5d0362903605b5316e0e0481d15 100755 (executable)
Binary files a/waf and b/waf differ