build fixes for external libsndfile, plus make ogg & FLAC required libs now

[ardour.git] / libs / surfaces / tranzport / SConscript

diff --git a/libs/surfaces/tranzport/SConscript b/libs/surfaces/tranzport/SConscript
index 2739f17614abc3e2638113270dd2e842eab86a8a..ff48eb64e3dbb0e3dce0d529fba279eb421616d1 100644 (file)
--- a/libs/surfaces/tranzport/SConscript
+++ b/libs/surfaces/tranzport/SConscript
@@ -1,11 +1,12 @@
 # -*- python -*-
 
 import os
+import os.path
 import glob
 
 Import('env final_prefix install_prefix final_config_prefix libraries i18n')
 
-tranzport = env.Copy()
+tranzport = env.Clone()
 
 #
 # this defines the version number of libardour_tranzport
@@ -21,34 +22,62 @@ tranzport.Append(POTFILE = domain + '.pot')
 
 tranzport_files=Split("""
 interface.cc
-tranzport_control_protocol.cc
+buttons.cc
+io.cc
+io_usb.cc
+panner.cc
+lights.cc
+screen.cc
+state.cc
+wheel_modes.cc
+button_events.cc
+general.cc
+lcd.cc
+mode.cc
+show.cc
+init.cc
+wheel.cc
 """)
 
+#figure out when to do
+#io_usb.cc
+#io_midi.cc
+#io_kernel.cc
+
 tranzport.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
 tranzport.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"")
 tranzport.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"")
 tranzport.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
+#if env['HAVE_TRANZPORT_KERNEL_DRIVER']:
+#    tranzport.Append(CXXFLAGS="-DHAVE_TRANZPORT_KERNEL_DRIVER=1")
 
-tranzport.Append(CPPPATH=libraries['ardour'].get ('CPPPATH', []))
-tranzport.Append(CPPPATH=libraries['sigc2'].get ('CPPPATH', []))
-tranzport.Append(CPPPATH=libraries['pbd3'].get ('CPPPATH', []))
-tranzport.Append(CPPPATH=libraries['midi++2'].get ('CPPPATH', []))
+#merge more into tranzport files for the right io lib
+tranzport.Append(CPPPATH = libraries['jack'].get('CPPPATH', []))
 
 tranzport.Merge ([
-       libraries['xml'],
-       libraries['usb']
-       ])
+    libraries['ardour'],
+    libraries['ardour_cp'],
+    libraries['sigc2'],
+    libraries['pbd'],
+    libraries['midi++2'],
+    libraries['xml'],
+    libraries['glib2'],
+    libraries['glibmm2'],
+    libraries['usb'],
+    libraries['sndfile']
+    ])
 
 libardour_tranzport = tranzport.SharedLibrary('ardour_tranzport', tranzport_files)
 
-Default(libardour_tranzport)
-
-if env['NLS']:
-       i18n (tranzport, tranzport_files, env)
-             
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2/surfaces'), libardour_tranzport))
+if tranzport['TRANZPORT']:
+    Default(libardour_tranzport)
+    if env['NLS']:
+        i18n (tranzport, tranzport_files, env)
+#    if env['HAVE_TRANZPORT_KERNEL_DRIVER']:
+#        tranzport.Merge([ libraries['usb'] ])
+    env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3', 'surfaces'), libardour_tranzport))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
-                                    [ 'SConscript', 'i18n.h', 'gettext.h' ] +
-                                    tranzport_files + 
-                                    glob.glob('po/*.po') + glob.glob('*.h')))
+                     [ 'SConscript' ] +
+                     tranzport_files + 
+                     glob.glob('po/*.po') + glob.glob('*.h')))