From 723ab60b39aed9a9190e047fc5803c1f4e1adac3 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 29 Sep 2011 19:17:54 +0000
Subject: Upgrade to waf 1.6.7 and autowaf r52.

git-svn-id: svn://localhost/ardour2/branches/3.0@10162 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/surfaces/osc/wscript | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'libs/surfaces/osc/wscript')

diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript
index 4d62bda7bc..1ab9bf42a7 100644
--- a/libs/surfaces/osc/wscript
+++ b/libs/surfaces/osc/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)
@@ -9,10 +9,10 @@ import os
 LIBARDOUR_OSC_LIB_VERSION = '4.1.0'
 
 # Mandatory variables
-srcdir = '.'
-blddir = 'build'
+top = '.'
+out = 'build'
 
-def set_options(opt):
+def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
@@ -20,20 +20,20 @@ def configure(conf):
     autowaf.check_pkg(conf, 'liblo', uselib_store='LO', linkflags='-llo')
 
 def build(bld):
-    obj = bld.new_task_gen('cxx', 'shlib')
+    obj = bld(features = 'cxx cxxshlib')
     obj.source = '''
             osc.cc
             osc_controllable.cc
             osc_route_observer.cc
             interface.cc
     '''
-    obj.export_incdirs = ['.']
+    obj.export_includes = ['.']
     obj.cxxflags     = '-DPACKAGE="ardour_cp"'
     obj.includes     = ['.', './osc']
     obj.name         = 'libardour_osc'
     obj.target       = 'ardour_osc'
     obj.uselib       = ' LO '
-    obj.uselib_local = 'libardour libardour_cp libpbd'
+    obj.use          = 'libardour libardour_cp libpbd'
     obj.vnum         = LIBARDOUR_OSC_LIB_VERSION
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
 
-- 
cgit v1.2.3