use libltc and libtimecode as static libs, and upgrade to waf 1.7

This is slightly awkward. It is important that we only link once to the static lib. Doing this at executable link time did not
work, possibly because waf insisted on putting the two static libraries at the front of the link list. So instead libardour
is now the point where linkage to these libraries occurs (and nowhere else). This should never be changed unless the change
just moves the linkage point to another location.

Also fix a bug with the libardour version tha was picked up by waf 1.7

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index ebc28ebf8f736bb806fd590d9827f9c7b4c05a55..cc494c2ba2f8a185ce1da58dd46f4b2d75219ca4 100644 (file)
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -434,7 +434,10 @@ def build(bld):
                          'ardour',
                          'libardour_cp',
                          'libgtkmm2ext',
-                         'libtaglib' ]
+                         'libtaglib',
+                         'timecode_includes'
+                         ]
+
     if sys.platform == 'darwin':
         obj.use += ' libappleutility'
     obj.defines     += [

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 6fec6ae9d0db53a3f708a71235516b36ececb819..838e72279cf38f050055fb6e53634fc24b8b1456 100644 (file)
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -317,7 +317,7 @@ def build(bld):
     # major increment <=> incompatible changes
     # minor increment <=> compatible changes (additions)
     # micro increment <=> no interface changes
-    LIBARDOUR_LIB_VERSION = "3.0.0."
+    LIBARDOUR_LIB_VERSION = "3.0.0"
 
     # Library
     if bld.is_defined ('INTERNAL_SHARED_LIBS'):
@@ -343,7 +343,7 @@ def build(bld):
                         'OSX','BOOST','CURL','DL']
     obj.use          = ['libpbd','libmidipp','libevoral','libvamphost',
                         'libvampplugin','libtaglib','librubberband',
-                        'libaudiographer','libltc','libtimecode']
+                        'libaudiographer', 'ltc', 'timecode' ]
     obj.vnum         = LIBARDOUR_LIB_VERSION
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
     obj.defines      += [

diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript
index e27c4876ee2cc3f05f0f77ccfdf24692ea69c1b0..39a4411dc0f40132e5de48fc73aa5e05a33dc583 100644 (file)
--- a/libs/midi++2/wscript
+++ b/libs/midi++2/wscript
@@ -77,7 +77,7 @@ def build(bld):
     obj.name         = 'libmidipp'
     obj.target       = 'midipp'
     obj.uselib       = 'GLIBMM SIGCPP XML JACK OSX'
-    obj.use          = 'libpbd libevoral libtimecode'
+    obj.use          = 'libpbd libevoral timecode_includes'
     obj.vnum         = LIBMIDIPP_LIB_VERSION
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
 

diff --git a/libs/surfaces/control_protocol/wscript b/libs/surfaces/control_protocol/wscript
index e1e1af950caf4fb4578136864bdfbbc618771226..a597ca9e2ad50c48bb8d6cb2b9aae2ec78469fef 100644 (file)
--- a/libs/surfaces/control_protocol/wscript
+++ b/libs/surfaces/control_protocol/wscript
@@ -43,7 +43,7 @@ def build(bld):
     obj.includes     = ['.', './control_protocol']
     obj.name         = 'libardour_cp'
     obj.target       = 'ardourcp'
-    obj.use          = 'ardour libtimecode'
+    obj.use          = 'ardour'
     obj.vnum         = LIBARDOUR_CP_LIB_VERSION
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
 

diff --git a/waf b/waf
index 6780539c8e2e9decf73439b2a8e294a77bfdedbf..9d2582a24ae88927c870031947139253f1c7b959 100755 (executable)
Binary files a/waf and b/waf differ