breakout control protocol code into LGPL library; fix panner buttons even more than...

[ardour.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index f8093e4f6f8d531ee73bc64b75ae646768a61023..15d7ac743698f1712dcee8656d402368664217fa 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -390,11 +390,15 @@ libraries['pango'].ParseConfig ('pkg-config --cflags --libs pango')
 libraries['libgnomecanvas2'] = LibraryInfo()
 libraries['libgnomecanvas2'].ParseConfig ('pkg-config --cflags --libs libgnomecanvas-2.0')
 
-libraries['glade2'] = LibraryInfo()
-libraries['glade2'].ParseConfig ('pkg-config --cflags --libs libglade-2.0')
-
 #libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
 
+# The Ardour Control Protocol Library
+
+libraries['ardour_cp'] = LibraryInfo (LIBS='ardour_cp', LIBPATH='#libs/surfaces/control_protocol',
+                                      CPPPATH='#libs/surfaces/control_protocol')
+
+# The Ardour backend/engine
+
 libraries['ardour'] = LibraryInfo (LIBS='ardour', LIBPATH='#libs/ardour', CPPPATH='#libs/ardour')
 libraries['midi++2'] = LibraryInfo (LIBS='midi++', LIBPATH='#libs/midi++2', CPPPATH='#libs/midi++2')
 libraries['pbd3']    = LibraryInfo (LIBS='pbd', LIBPATH='#libs/pbd3', CPPPATH='#libs/pbd3')
@@ -424,10 +428,9 @@ libraries['usb'] = conf.Finish ()
 libraries['lo'] = LibraryInfo ()
 
 conf = Configure (libraries['lo'])
-if conf.CheckLib ('lo', 'lo_server_new'):
-    have_liblo = True
-else:
-    have_liblo = False
+if conf.CheckLib ('lo', 'lo_server_new') == False:
+    print "liblo does not appear to be installed."
+    exit (0)
     
 libraries['lo'] = conf.Finish ()
 
@@ -486,8 +489,9 @@ if env['SYSLIBS']:
     libraries['pangomm'].ParseConfig ('pkg-config --cflags --libs pangomm-1.4')
     libraries['libgnomecanvasmm'] = LibraryInfo()
     libraries['libgnomecanvasmm'].ParseConfig ('pkg-config --cflags --libs libgnomecanvasmm-2.6')
-    libraries['libglademm'] = LibraryInfo()
-    libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4')
+
+#    libraries['libglademm'] = LibraryInfo()
+#    libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4')
 
 #    libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
     libraries['soundtouch'] = LibraryInfo()
@@ -535,9 +539,9 @@ else:
     libraries['soundtouch'] = LibraryInfo(LIBS='soundtouch',
                                           LIBPATH='#libs/soundtouch',
                                           CPPPATH=['#libs', '#libs/soundtouch'])
-    libraries['libglademm'] = LibraryInfo(LIBS='libglademm',
-                                          LIBPATH='#libs/libglademm',
-                                          CPPPATH='#libs/libglademm')
+#    libraries['libglademm'] = LibraryInfo(LIBS='libglademm',
+#                                          LIBPATH='#libs/libglademm',
+#                                          CPPPATH='#libs/libglademm')
 
     coredirs = [
         'libs/soundtouch',
@@ -558,7 +562,6 @@ else:
        'libs/gtkmm2/atk',
        'libs/gtkmm2/gdk',
        'libs/gtkmm2/gtk',
-    'libs/libglademm',
        'libs/libgnomecanvasmm',
 #      'libs/flowcanvas',
     'libs/gtkmm2ext',
@@ -568,11 +571,11 @@ else:
 surface_subdirs = []
 
 if env['SURFACES']:
-    surface_subdirs += [ 'libs/surfaces/generic_midi' ]
+    surface_subdirs += [ 'libs/surfaces/control_protocol', 'libs/surfaces/generic_midi' ]
     if have_libusb:
         surface_subdirs += [ 'libs/surfaces/tranzport' ]
-    if have_liblo:
-        surface_subdirs += [ 'libs/surfaces/osc' ]        
+    if os.access ('libs/surfaces/sony9pin', os.F_OK):
+        surface_subdirs += [ 'libs/surfaces/sony9pin' ]
     
 opts.Save('scache.conf', env)
 Help(opts.GenerateHelpText(env))
@@ -850,9 +853,9 @@ for subdir in coredirs:
     SConscript (subdir + '/SConscript')
 
 for sublistdir in [subdirs, gtk_subdirs, surface_subdirs]:
-       for subdir in sublistdir:
-               SConscript (subdir + '/SConscript')
-
+    for subdir in sublistdir:
+        SConscript (subdir + '/SConscript')
+            
 # cleanup
 env.Clean ('scrub', [ 'scache.conf', '.sconf_temp', '.sconsign.dblite', 'config.log'])