Return silence from read_from_sources() if we try to read a channel that our source...

[ardour.git] / libs / midi++2 / wscript

diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript
index aa6f8a67ca03749e4f9eeaee39e0e63d5f069fa5..d4f71124aa5be4c319ae9cf6538f7a48aa36904d 100644 (file)
--- a/libs/midi++2/wscript
+++ b/libs/midi++2/wscript
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-import autowaf
+from waflib.extras import autowaf as autowaf
 import os
 import sys
 
@@ -20,52 +20,53 @@ APPNAME = 'libmidipp'
 VERSION = LIBMIDIPP_VERSION
 
 # Mandatory variables
-srcdir = '.'
-blddir = 'build'
+top = '.'
+out = 'build'
 
 path_prefix = 'libs/midi++2/'
 
-def set_options(opt):
-       autowaf.set_options(opt)
+def options(opt):
+    autowaf.set_options(opt)
 
 def configure(conf):
-       autowaf.build_version_files(path_prefix+'midi++/version.h', path_prefix+'version.cc',
-                       'midipp', MAJOR, MINOR, MICRO)
-       autowaf.configure(conf)
-       conf.check_tool('compiler_cxx')
-       autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.118.2')
-       autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
-       autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')
+    conf.load('compiler_cxx')
+    autowaf.build_version_files(path_prefix+'midi++/version.h', path_prefix+'version.cc',
+                    'midipp', MAJOR, MINOR, MICRO)
+    autowaf.configure(conf)
+    autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.118.2')
+    autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
+    autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')
 
-       # Boost headers
-       autowaf.check_header(conf, 'boost/shared_ptr.hpp')
-       autowaf.check_header(conf, 'boost/weak_ptr.hpp')
+    # Boost headers
+    autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp')
+    autowaf.check_header(conf, 'cxx', 'boost/weak_ptr.hpp')
 
 def build(bld):
-       # Library
-       obj = bld.new_task_gen('cxx', 'shlib')
-       obj.source = '''
-               midi.cc
-               channel.cc
-               manager.cc
-               parser.cc
-               port.cc
-               midnam_patch.cc
-               mmc.cc
-               mtc.cc
-               version.cc
-       '''
-       # everybody loves JACK
-       obj.cxxflags = [ '-DWITH_JACK_MIDI' ]
-       obj.export_incdirs = ['.']
-       obj.includes     = ['.', '../surfaces/control_protocol']
-       obj.name         = 'libmidipp'
-       obj.target       = 'midipp'
-       obj.uselib       = 'GLIBMM SIGCPP XML JACK OSX'
-       obj.uselib_local = 'libpbd libevoral'
-       obj.vnum         = LIBMIDIPP_LIB_VERSION
-       obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    # Library
+    obj = bld(features = 'cxx cxxshlib')
+    obj.source = '''
+            midi.cc
+            channel.cc
+            ipmidi_port.cc
+            jack_midi_port.cc
+            manager.cc
+            parser.cc
+            port.cc
+            midnam_patch.cc
+            mmc.cc
+            mtc.cc
+            version.cc
+    '''
+    # everybody loves JACK
+    obj.cxxflags = [ '-DWITH_JACK_MIDI' ]
+    obj.export_includes = ['.']
+    obj.includes     = ['.', '../surfaces/control_protocol']
+    obj.name         = 'libmidipp'
+    obj.target       = 'midipp'
+    obj.uselib       = 'GLIBMM SIGCPP XML JACK OSX'
+    obj.use          = 'libpbd libevoral libtimecode'
+    obj.vnum         = LIBMIDIPP_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
 
 def shutdown():
-       autowaf.shutdown()
-
+    autowaf.shutdown()