X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fqm-dsp%2Fwscript;h=ef15abffb73805454b9bed95ac12d6b64c8351a7;hb=1b989a93c23171f58dd639d320afc704335e8720;hp=a77822abacf672217e333f5ee3dfb599552750eb;hpb=4769db412dffcee699116a63fc714f88513fa0c6;p=ardour.git

diff --git a/libs/qm-dsp/wscript b/libs/qm-dsp/wscript
index a77822abac..ef15abffb7 100644
--- a/libs/qm-dsp/wscript
+++ b/libs/qm-dsp/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,19 +16,19 @@ APPNAME = 'qm-dsp'
 VERSION = QM_DSP_VERSION
 
 # Mandatory variables
-srcdir = '.'
-blddir = 'build'
+top = '.'
+out = 'build'
 
-def set_options(opt):
+def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
+    conf.load('compiler_cxx')
     autowaf.configure(conf)
-    conf.check_tool('compiler_cxx')
 
 def build(bld):
     # Host Library
-    obj = bld.new_task_gen('cxx', 'shlib')
+    obj = bld(features = 'cxx cxxshlib')
     obj.source = '''
             dsp/onsets/DetectionFunction.cpp
             dsp/onsets/PeakPicking.cpp
@@ -47,12 +47,13 @@ def build(bld):
             maths/MathUtilities.cpp
             base/Pitch.cpp
     '''
-    obj.export_incdirs = ['.']
+    autowaf.ensure_visible_symbols (obj, True)
+    obj.export_includes = ['.']
     obj.includes     = ['.']
     obj.name         = 'libqmdsp'
     obj.target       = 'qmdsp'
     obj.vnum         = QM_DSP_VERSION
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    obj.install_path = bld.env['LIBDIR']
 
 def shutdown():
     autowaf.shutdown()