Remove autowaf external and wscript (broken intermediary revision).

4 files changed, 13 insertions, 14 deletions

diff --git a/core.lv2/autowaf b/core.lv2/autowaf
deleted file mode 120000
index c8f914c..0000000
--- a/core.lv2/autowaf
+++ /dev/null
@@ -1 +0,0 @@
-../autowaf
\ No newline at end of file
diff --git a/core.lv2/wscript b/core.lv2/wscript
index 872dfb9..b7f8cca 100644
--- a/core.lv2/wscript
+++ b/core.lv2/wscript
@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 import sys
-import autowaf
-import Options
+
+from waflib.extras import autowaf as autowaf
+import waflib.Options as Options
 
 # Version of this package (even if built as a child)
 LV2CORE_VERSION = '4.0pre1'
@@ -60,7 +61,7 @@ def configure(conf):
 
 def build(bld):
 	# Header "library"
-	obj = bld.new_task_gen()
+	obj = bld()
 	obj.export_includes = ['.']
 	obj.name            = 'liblv2core'
 	obj.target          = 'lv2core'
diff --git a/waf b/waf
deleted file mode 120000
index cf2d494..0000000
--- a/waf
+++ /dev/null
@@ -1 +0,0 @@
-autowaf/waf
\ No newline at end of file
diff --git a/wscript b/wscript
index e827b2b..8276c03 100644
--- a/wscript
+++ b/wscript
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
-import autowaf
 import datetime
 import os
 
-import Logs
+from waflib.extras import autowaf as autowaf
+import waflib.Logs as Logs
 
 # Version of this package (even if built as a child)
 LV2EXT_VERSION = datetime.date.isoformat(datetime.datetime.now()).replace('-', '.')
@@ -18,16 +18,16 @@ out = 'build'
 
 def options(opt):
 	autowaf.set_options(opt)
-	opt.tool_options('compiler_cc')
-	opt.tool_options('compiler_cxx')
-	opt.sub_options('core.lv2')
+	opt.load('compiler_cc')
+	opt.load('compiler_cxx')
+	opt.recurse('core.lv2')
 
 def configure(conf):
 	autowaf.set_recursive()
 	autowaf.configure(conf)
-	conf.sub_config('core.lv2');
-	conf.check_tool('compiler_cc')
-	conf.check_tool('compiler_cxx')
+	conf.recurse('core.lv2');
+	conf.load('compiler_cc')
+	conf.load('compiler_cxx')
 	conf.env.append_value('CFLAGS', '-std=c99')
 	pat = conf.env['cshlib_PATTERN']
 	ext = pat[pat.rfind('.'):]
@@ -44,7 +44,7 @@ def build_extension(bld, name, dir):
 
 def build(bld):
 	autowaf.set_recursive()
-	bld.add_subdirs('core.lv2')
+	bld.recurse('core.lv2')
 	ext = '''
 		atom
 		contexts