Fix compile when using external version of libltc

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index ade8fa79049e4886a7a3b61c25a8d55db5e757fb..9e3f4fef4dd3171db708282d1fa674ae3c70bcea 100644 (file)
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -36,7 +36,7 @@
 
 #include <glibmm/threads.h>
 
-#include <ltc/ltc.h>
+#include <ltc.h>
 
 #include "pbd/error.h"
 #include "pbd/event_loop.h"

diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h
index 8c50aea5d3d525a5f11969f135b75cb5b8ec0964..cb1e3650c5d04c3d8177acdce747b3b012f1596e 100644 (file)
--- a/libs/ardour/ardour/slave.h
+++ b/libs/ardour/ardour/slave.h
@@ -25,7 +25,7 @@
 #include <glibmm/threads.h>
 
 #include <jack/jack.h>
-#include <ltc/ltc.h>
+#include <ltc.h>
 
 #include "pbd/signals.h"
 

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 435213b5f92d5d850d5a6cbe6040d23148971ada..336274dcefbfd18221eff2d1561daee8d8738242 100644 (file)
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -341,15 +341,14 @@ def build(bld):
                         'OSX','BOOST','CURL','DL']
     obj.use          = ['libpbd','libmidipp','libevoral', 'libvampplugin',
                         'libaudiographer', 
-                        'libltc_includes',
-                        'libltc',
                         'libtimecode_includes',
                         ]
     if bld.is_defined('USE_EXTERNAL_LIBS'):
-        obj.uselib.extend(['RUBBERBAND', 'TAGLIB', 'VAMPSDK',
+        obj.uselib.extend(['RUBBERBAND', 'TAGLIB', 'VAMPSDK', 'LIBLTC',
                            'VAMPHOSTSDK'])
     else:
-        obj.use.extend(['librubberband', 'libtaglib', 'libvamphost'])
+        obj.use.extend(['librubberband', 'libtaglib', 'libvamphost'
+                        'libltc_includes', 'libltc'])
 
     obj.vnum         = LIBARDOUR_LIB_VERSION
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')

diff --git a/libs/libltc/wscript b/libs/libltc/wscript
index 7938cd18fdf9fa17b2dbd892cd3c8eda938a1102..8cf7bb6389d9e2f32f54502410b5c6013b93c8fa 100644 (file)
--- a/libs/libltc/wscript
+++ b/libs/libltc/wscript
@@ -38,13 +38,13 @@ def configure(conf):
 def build(bld):
     if bld.is_defined('USE_EXTERNAL_LIBS'):
         return
-    bld (export_includes = ['.'],
-         includes     = ['.'],
+    bld (export_includes = ['ltc'],
          name = 'libltc_includes'
          )
 
     bld.stlib (source = ['ltc.c', 'timecode.c', 'encoder.c', 'decoder.c'],
                cflags = [ '-fPIC' ],
+               includes = ['.'],
                target = 'libltc',
                use    = 'libltc_includes'
                )