Merge branch 'master' into export-dialog

[ardour.git] / libs / timecode / wscript

diff --git a/libs/timecode/wscript b/libs/timecode/wscript
index 4eb3c66c8f813658b45bea4ff5b7bfe81b4bdf52..034292b1ddd01951e63a38583194cfeeec3c4606 100644 (file)
--- a/libs/timecode/wscript
+++ b/libs/timecode/wscript
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
-import autowaf
-import Options
+from waflib.extras import autowaf as autowaf
+from waflib import Options
 import os
 
 # Version of this package (even if built as a child)
@@ -19,28 +19,26 @@ APPNAME = 'timecode'
 VERSION = TIMECODE_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):
-       # Library
-       obj = bld.new_task_gen('cxx', 'shlib')
-       obj.source         = [ 'src/time.cc', 'src/bbt_time.cc' ]
-       obj.export_incdirs = ['.']
-       obj.includes       = ['.', './src']
-       obj.name           = 'libtimecode'
-       obj.target         = 'timecode'
-       obj.vnum           = TIMECODE_LIB_VERSION
-       obj.install_path   = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    # Library
+    obj = bld(features = 'cxx cxxshlib')
+    obj.source         = [ 'src/time.cc', 'src/bbt_time.cc' ]
+    obj.export_includes = ['.']
+    obj.includes       = ['.', './src']
+    obj.name           = 'libtimecode'
+    obj.target         = 'timecode'
+    obj.vnum           = TIMECODE_LIB_VERSION
+    obj.install_path   = os.path.join(bld.env['LIBDIR'], 'ardour3')
 
 def shutdown():
-       autowaf.shutdown()
-
+    autowaf.shutdown()