Upgrade to waf 1.6.7 and autowaf r52.

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

libs/vamp-plugins/wscript

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-import autowaf
+from waflib.extras import autowaf as autowaf
 import os
 
 # Version of this package (even if built as a child)
@@ -16,10 +16,10 @@ APPNAME = 'libardourvampplugins'
 VERSION = LIBARDOURVAMPPLUGINS_VERSION
 
 # Mandatory variables
-srcdir = '.'
-blddir = 'build'
+top = '.'
+out = 'build'
 
-def set_options(opt):
+def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
@@ -27,11 +27,11 @@ def configure(conf):
     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)
-    conf.write_config_header('libvampplugins-config.h')
+    conf.write_config_header('libvampplugins-config.h', remove=False)
 
 def build(bld):
     # Library
-    obj = bld.new_task_gen('cxx', 'shlib')
+    obj = bld(features = 'cxx cxxshlib')
     obj.source = '''
             plugins.cpp
             AmplitudeFollower.cpp
@@ -40,12 +40,12 @@ def build(bld):
             SpectralCentroid.cpp
             ZeroCrossing.cpp
     '''
-    obj.export_incdirs = ['.']
+    obj.export_includes = ['.']
     obj.includes     = ['.']
     obj.name         = 'libardourvampplugins'
     obj.target       = 'ardourvampplugins'
     obj.uselib       = 'FFTW3F'
-    obj.uselib_local = 'libvampplugin libqmdsp'
+    obj.use          = 'libvampplugin libqmdsp'
     if bld.env['HAVE_AUBIO']:
         obj.source += ' Onset.cpp '
         obj.uselib += ' AUBIO '