Update autowaf.

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

diff --git a/autowaf.py b/autowaf.py
index f9b2109806d7041471cd7d97ce7c8e4f28d82c9a..21ec430d37dd263cd7d7fb94e0a5b8b11dceb6d9 100644 (file)
--- a/autowaf.py
+++ b/autowaf.py
@@ -81,18 +81,8 @@ def check_header(conf, name, define='', mandatory=False):
                else:
                        conf.check(header_name=name, mandatory=mandatory)
 
-def check_tool(conf, name):
-       "Check for a tool iff it hasn't been checked for yet"
-       if type(conf.env['AUTOWAF_TOOLS']) != dict:
-               conf.env['AUTOWAF_TOOLS'] = {}
-
-       checked = conf.env['AUTOWAF_TOOLS']
-       if not name in checked:
-               conf.check_tool(name)
-               checked[name] = True
-
 def nameify(name):
-       return name.replace('/', '_').replace('++', 'PP').replace('-', '_')
+       return name.replace('/', '_').replace('++', 'PP').replace('-', '_').replace('.', '_')
 
 def check_pkg(conf, name, **args):
        if not 'mandatory' in args:
@@ -133,9 +123,9 @@ def configure(conf):
                conf.env.append_value('CCFLAGS', vals.split())
                conf.env.append_value('CXXFLAGS', vals.split())
        conf.line_just = 43
-       check_tool(conf, 'misc')
-       check_tool(conf, 'compiler_cc')
-       check_tool(conf, 'compiler_cxx')
+       conf.check_tool('misc')
+       conf.check_tool('compiler_cc')
+       conf.check_tool('compiler_cxx')
        conf.env['BUILD_DOCS'] = Options.options.build_docs
        conf.env['DEBUG'] = Options.options.debug
        conf.env['STRICT'] = Options.options.strict
@@ -239,7 +229,7 @@ def use_lib(bld, obj, libs):
                        inc_flag = '-iquote ' + os.path.join(abssrcdir, l.lower())
                        for f in ['CCFLAGS', 'CXXFLAGS']:
                                if not inc_flag in bld.env[f]:
-                                       bld.env.prepend_value(f, inc_flag)
+                                       bld.env.append_value(f, inc_flag)
                else:
                        if hasattr(obj, 'uselib'):
                                obj.uselib += ' ' + l
@@ -336,6 +326,7 @@ def build_dox(bld, name, version, srcdir, blddir):
        }
        obj.install_path = ''
        out1 = bld.new_task_gen('command-output')
+       out1.dependencies = [obj]
        out1.stdout = '/doc/doxygen.out'
        out1.stdin = '/doc/reference.doxygen' # whatever..
        out1.command = 'doxygen'

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index a43573c8017ece145cf495fe79c9e514cf51839d..39951e35622e085a70f60124fe55a6ae71c8f62a 100644 (file)
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -200,7 +200,7 @@ def configure(conf):
        autowaf.build_version_files(path_prefix+'version.h', path_prefix+'version.cc',
                        'gtk2_ardour', MAJOR, MINOR, MICRO)
        autowaf.configure(conf)
-       autowaf.check_tool(conf, 'compiler_cxx')
+       conf.check_tool('compiler_cxx')
 
        autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA')
        autowaf.check_pkg(conf, 'flac', uselib_store='FLAC', atleast_version='1.2.1')

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 58e22cca27f79c773f402a8c0cbe8e6c675f59dc..b9a90ea4861b8049ced21a0c0dc04559c760f2b0 100644 (file)
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -188,7 +188,7 @@ def configure(conf):
        autowaf.build_version_files(path_prefix+'ardour/version.h', path_prefix+'version.cc',
                        'libardour3', MAJOR, MINOR, MICRO)
        autowaf.configure(conf)
-       autowaf.check_tool(conf, 'compiler_cxx gas')
+       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.109.0')
        autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')

diff --git a/libs/evoral/wscript b/libs/evoral/wscript
index a00ea26c43e66145778a5e891130a1a2516456ce..dd5b6f6db9e544dd57d1b927857e47ca9dcb05d8 100644 (file)
--- a/libs/evoral/wscript
+++ b/libs/evoral/wscript
@@ -26,7 +26,7 @@ def set_options(opt):
 
 def configure(conf):
        autowaf.configure(conf)
-       autowaf.check_tool(conf, 'compiler_cxx')
+       conf.check_tool('compiler_cxx')
        autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False)
        autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.2')
        autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.14.0')

diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index ec1fd3282c5aacb3bd716b57935ffe8e59bb0877..212a4719890f4eb68149969091fc6c959b711599 100644 (file)
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -31,7 +31,7 @@ def configure(conf):
        autowaf.build_version_files(path_prefix+'gtkmm2ext/version.h', path_prefix+'version.cc',
                        'libgtkmm2ext', MAJOR, MINOR, MICRO)
        autowaf.configure(conf)
-       autowaf.check_tool(conf, 'compiler_cxx')
+       conf.check_tool('compiler_cxx')
        autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.8')
 
 def build(bld):

diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript
index b3dd3ef79f29c0b3167f1b7619e69a7699b2d5d6..9d25ac9930c3d683db84424fe0b97742dc4d8069 100644 (file)
--- a/libs/midi++2/wscript
+++ b/libs/midi++2/wscript
@@ -31,7 +31,7 @@ def configure(conf):
        autowaf.build_version_files(path_prefix+'midi++/version.h', path_prefix+'version.cc',
                        'midipp', MAJOR, MINOR, MICRO)
        autowaf.configure(conf)
-       autowaf.check_tool(conf, 'compiler_cxx')
+       conf.check_tool('compiler_cxx')
        autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.109.0')
        autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
        autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')

diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index cd1197fb1736bfb7c41192c2b5d4d3c0d91794f7..c06cd315032a08fa5b983e4e9165371b86114628 100644 (file)
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -31,7 +31,7 @@ def configure(conf):
        autowaf.build_version_files(path_prefix+'pbd/version.h', path_prefix+'version.cc',
                        'libpbd', MAJOR, MINOR, MICRO)
        autowaf.configure(conf)
-       autowaf.check_tool(conf, 'compiler_cxx')
+       conf.check_tool('compiler_cxx')
        autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
        autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')
        autowaf.check_pkg(conf, 'uuid', uselib_store='UUID')

diff --git a/libs/rubberband/wscript b/libs/rubberband/wscript
index 658e2d7249a95429022d46908e6485cefd17cfbf..765a807ba81cf730078715cfa903b13ea7219d6b 100644 (file)
--- a/libs/rubberband/wscript
+++ b/libs/rubberband/wscript
@@ -25,7 +25,7 @@ def set_options(opt):
 
 def configure(conf):
        autowaf.configure(conf)
-       autowaf.check_tool(conf, 'compiler_cxx')
+       conf.check_tool('compiler_cxx')
 
 def build(bld):
        # Library

diff --git a/libs/taglib/wscript b/libs/taglib/wscript
index d496360ed6c847e28efc7e967141667d639de182..8b15a78ed19b6c32aa0201b18aa7fea0b5943eeb 100644 (file)
--- a/libs/taglib/wscript
+++ b/libs/taglib/wscript
@@ -27,7 +27,7 @@ def set_options(opt):
 
 def configure(conf):
        autowaf.configure(conf)
-       autowaf.check_tool(conf, 'compiler_cxx')
+       conf.check_tool('compiler_cxx')
 
 def build(bld):
        # Library

diff --git a/libs/vamp-plugins/wscript b/libs/vamp-plugins/wscript
index 4768523e168e3907b5e1ce7b67a7ac8e543ca614..08226993ad3408b85fbbd5f645bf9351b2181f2b 100644 (file)
--- a/libs/vamp-plugins/wscript
+++ b/libs/vamp-plugins/wscript
@@ -24,7 +24,7 @@ def set_options(opt):
 
 def configure(conf):
        autowaf.configure(conf)
-       autowaf.check_tool(conf, 'compiler_cxx')
+       conf.check_tool('compiler_cxx')
        autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', mandatory=True)
        autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', mandatory=False)
 

diff --git a/libs/vamp-sdk/wscript b/libs/vamp-sdk/wscript
index b608ce5bb2c1c22dae4f6095ae75f07ec93c4c6e..f1b5a3fa9270b4384d63009df8373d82c65c05c1 100644 (file)
--- a/libs/vamp-sdk/wscript
+++ b/libs/vamp-sdk/wscript
@@ -24,7 +24,7 @@ def set_options(opt):
 
 def configure(conf):
        autowaf.configure(conf)
-       autowaf.check_tool(conf, 'compiler_cxx')
+       conf.check_tool('compiler_cxx')
        autowaf.check_pkg(conf, 'fftw3', uselib_store='FFTW3', mandatory=True)
        autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', mandatory=True)
        conf.env.append_value('CXXFLAGS', '-DHAVE_FFTW3')