Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas

[ardour.git] / libs / surfaces / frontier / wscript

diff --git a/libs/surfaces/frontier/wscript b/libs/surfaces/frontier/wscript
index 6c383aa072532228fd6e3257c47cb5c04af0aafd..614c6f28417b63fba44123ee60e13db6371ea2ff 100644 (file)
--- a/libs/surfaces/frontier/wscript
+++ b/libs/surfaces/frontier/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,32 +16,32 @@ APPNAME = 'libsurfaces'
 VERSION = LIBSURFACES_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)
+    autowaf.configure(conf)
 
 def build(bld):
-        # Generic MIDI
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = '''
-               generic_midi_control_protocol.cc
-               interface.cc
-               midicontrollable.cc
-        '''
-        obj.export_incdirs = ['./generic_midi']
-        obj.cxxflags     = '-DPACKAGE="ardour_genericmidi"'
-        obj.includes     = ['.', './generic_midi']
-        obj.name         = 'libgeneric_midi'
-        obj.target       = 'generic_midi'
-        obj.uselib_local = 'libardour libsurfaces'
-        obj.vnum         = LIBSURFACES_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
+    # Generic MIDI
+    obj = bld(features = 'cxx cxxshlib')
+    obj.source = '''
+            generic_midi_control_protocol.cc
+            interface.cc
+            midicontrollable.cc
+    '''
+    obj.export_includes = ['./generic_midi']
+    obj.defines      = [ 'PACKAGE="ardour_frontier"' ]
+    obj.defines     += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
+    obj.includes     = ['.', './generic_midi']
+    obj.name         = 'libgeneric_midi'
+    obj.target       = 'generic_midi'
+    obj.use          = 'libardour libardourcp'
+    obj.vnum         = LIBSURFACES_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()