initial commit of hand merging, plus getting "ancient" waf script to work correctly

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

diff --git a/libs/surfaces/control_protocol/wscript b/libs/surfaces/control_protocol/wscript
index 6dc2e554477887f1cd11f4cef63524b02968a380..e3092b56060471c6b22d55bc747a76597f663628 100644 (file)
--- a/libs/surfaces/control_protocol/wscript
+++ b/libs/surfaces/control_protocol/wscript
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-import autowaf
+from waflib.extras import autowaf as autowaf
 import os
 
 # Library version (UNIX style major, minor, micro)
@@ -10,30 +10,29 @@ APPNAME = 'libardour_cp'
 LIBARDOUR_CP_LIB_VERSION = '4.1.0'
 
 # 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):
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = '''
-               basic_ui.cc
-               control_protocol.cc
-        '''
-        obj.export_incdirs = ['.', './control_protocol' ]
-        obj.cxxflags     = '-DPACKAGE="ardour_cp"'
-        obj.includes     = ['.', './control_protocol']
-        obj.name         = 'libardour_cp'
-        obj.target       = 'ardourcp'
-        obj.uselib_local = 'libardour libtimecode'
-        obj.vnum         = LIBARDOUR_CP_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    obj = bld(features = 'cxx cxxshlib')
+    obj.source = '''
+            basic_ui.cc
+            control_protocol.cc
+    '''
+    obj.export_includes = ['.', './control_protocol' ]
+    obj.cxxflags     = '-DPACKAGE="ardour_cp" -fPIC'
+    obj.includes     = ['.', './control_protocol']
+    obj.name         = 'libardour_cp'
+    obj.target       = 'ardourcp'
+    obj.use          = 'libardour libtimecode'
+    obj.vnum         = LIBARDOUR_CP_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()