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

2013-04-04 00:32:52 -04:00
parent 1d8bac08c0
commit aaea166135
244 changed files with 131902 additions and 7357 deletions
--- a/libs/surfaces/control_protocol/wscript
+++ b/libs/surfaces/control_protocol/wscript
@@ -30,7 +30,7 @@ def build(bld):
    obj.includes     = ['.', './control_protocol']
    obj.name         = 'libardour_cp'
    obj.target       = 'ardourcp'
-    obj.use          = 'ardour libtimecode'
+    obj.use          = 'libardour libtimecode'
    obj.vnum         = LIBARDOUR_CP_LIB_VERSION
    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')