remove redundant os.path.join() calls when specifying install path as bld.env['LIBDIR']

[ardour.git] / libs / qm-dsp / wscript

diff --git a/libs/qm-dsp/wscript b/libs/qm-dsp/wscript
index 99ce4fdf879c2b148496afc22c8c3312dc73ddd2..ef15abffb73805454b9bed95ac12d6b64c8351a7 100644 (file)
--- 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,44 +16,44 @@ APPNAME = 'qm-dsp'
 VERSION = QM_DSP_VERSION
 
 # Mandatory variables
-srcdir = '.'
-blddir = 'build'
+top = '.'
+out = 'build'
 
-def set_options(opt):
-       autowaf.set_options(opt)
+def options(opt):
+    autowaf.set_options(opt)
 
 def configure(conf):
-       autowaf.configure(conf)
-       conf.check_tool('compiler_cxx')
+    conf.load('compiler_cxx')
+    autowaf.configure(conf)
 
 def build(bld):
-       # Host Library
-       obj = bld.new_task_gen('cxx', 'shlib')
-       obj.source = '''
-               dsp/onsets/DetectionFunction.cpp
-               dsp/onsets/PeakPicking.cpp
-               dsp/phasevocoder/PhaseVocoder.cpp
-               dsp/rateconversion/Decimator.cpp
-               dsp/rhythm/BeatSpectrum.cpp
-               dsp/signalconditioning/DFProcess.cpp
-               dsp/signalconditioning/Filter.cpp
-               dsp/signalconditioning/FiltFilt.cpp
-               dsp/signalconditioning/Framer.cpp
-               dsp/transforms/FFT.cpp
-               dsp/wavelet/Wavelet.cpp
-               maths/Correlation.cpp
-               maths/CosineDistance.cpp
-               maths/KLDivergence.cpp
-               maths/MathUtilities.cpp
-               base/Pitch.cpp
-       '''
-       obj.export_incdirs = ['.']
-       obj.includes     = ['.']
-       obj.name         = 'libqmdsp'
-       obj.target       = 'qmdsp'
-       obj.vnum         = QM_DSP_VERSION
-       obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    # Host Library
+    obj = bld(features = 'cxx cxxshlib')
+    obj.source = '''
+            dsp/onsets/DetectionFunction.cpp
+            dsp/onsets/PeakPicking.cpp
+            dsp/phasevocoder/PhaseVocoder.cpp
+            dsp/rateconversion/Decimator.cpp
+            dsp/rhythm/BeatSpectrum.cpp
+            dsp/signalconditioning/DFProcess.cpp
+            dsp/signalconditioning/Filter.cpp
+            dsp/signalconditioning/FiltFilt.cpp
+            dsp/signalconditioning/Framer.cpp
+            dsp/transforms/FFT.cpp
+            dsp/wavelet/Wavelet.cpp
+            maths/Correlation.cpp
+            maths/CosineDistance.cpp
+            maths/KLDivergence.cpp
+            maths/MathUtilities.cpp
+            base/Pitch.cpp
+    '''
+    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 = bld.env['LIBDIR']
 
 def shutdown():
-       autowaf.shutdown()
-
+    autowaf.shutdown()