src-tree cleanup: separate surfaces from libraries

libardourcp and now libardour_midisurface are not control
surfaces, but helper libraries for those.
They need to be deployed to the library folder (shared between
ctrl surfaces) and not scanned as ctrl surfaces at runtime.

gtk2_ardour/ardev_common.sh.in

@@ -42,7 +42,7 @@ export ARDOUR_DLL_PATH=$libs
 export GTK_PATH=~/.ardour3:$libs/clearlooks-newer
 export VAMP_PATH=$libs/vamp-plugins:$libs/vamp-pyin${VAMP_PATH:+:$VAMP_PATH}
 
-export LD_LIBRARY_PATH=$libs/ptformat:$libs/qm-dsp:$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/surfaces/midi_surface:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/widgets:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/audiographer:$libs/temporal:$libs/libltc:$libs/canvas:$libs/waveview:$libs/ardouralsautil${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH=$libs/ptformat:$libs/qm-dsp:$libs/vamp-sdk:$libs/surfaces:$libs/ctrl-interface/control_protocol:$libs/ctrl-interface/midi_surface:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/widgets:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/audiographer:$libs/temporal:$libs/libltc:$libs/canvas:$libs/waveview:$libs/ardouralsautil${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 
 # DYLD_LIBRARY_PATH is for darwin.
 export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH

libs/ardour/wscript

@@ -391,7 +391,7 @@ def build(bld):
         obj.defines      = []
 
     obj.export_includes = ['.']
-    obj.includes     = ['.', '../vst3/', '../surfaces/control_protocol', '..']
+    obj.includes     = ['.', '../vst3/', '../ctrl-interface/control_protocol', '..']
     obj.name         = 'libardour'
     obj.target       = 'ardour'
     obj.uselib       = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID', 'LO',

libs/ctrl-interface/midi_surface/wscript

@@ -18,7 +18,7 @@ def build(bld):
             midi_surface.cc
             midi_byte_array.cc
     '''
-    obj.export_includes = ['.']
+    obj.export_includes = ['.', './midi_surface']
     obj.defines      = [ 'PACKAGE="ardour_midisurface"' ]
     obj.defines     += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
     obj.defines     += [ 'VERSIONSTRING="' + bld.env['VERSION'] + '"' ]
@@ -27,7 +27,7 @@ def build(bld):
     obj.target       = 'ardour_midisurface'
     obj.uselib       = 'GLIB GLIBMM SIGCPP XML OSX'
     obj.use          = 'libardour libardour_cp libpbd libevoral libmidipp libtemporal'
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
+    obj.install_path = bld.env['LIBDIR']
 
 def shutdown():
     autowaf.shutdown()

libs/surfaces/faderport/wscript

@@ -23,7 +23,7 @@ def build(bld):
     obj.export_includes = ['.']
     obj.defines      = [ 'PACKAGE="ardour_faderport"' ]
     obj.defines     += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
-    obj.includes     = [ '.', '..', './faderport']
+    obj.includes     = [ '.', './faderport']
     obj.name         = 'libardour_faderport'
     obj.target       = 'ardour_faderport'
     obj.uselib       = 'GTKMM GTK GDK XML OSX'

libs/surfaces/wscript

@@ -20,8 +20,6 @@ top = '.'
 out = 'build'
 
 children = [
-    'control_protocol',
-    'midi_surface',
     'faderport',
     'faderport8',
     'cc121',
@@ -82,8 +80,6 @@ def configure(conf):
         sub_config_and_use(conf, i)
 
 def build(bld):
-    bld.recurse('control_protocol')
-    bld.recurse('midi_surface')
     bld.recurse('generic_midi')
     bld.recurse('faderport')
     bld.recurse('faderport8')

tools/linux_packaging/build

@@ -353,7 +353,7 @@ cp $GTKSTACK_ROOT/lib/gtk-2.0/2.10.0/engines/libpixmap.so $Libraries
 
 # Control Surfaces
 cp $BUILD_ROOT/libs/surfaces/*/libardour_*.so* $Surfaces
-cp $BUILD_ROOT/libs/surfaces/control_protocol/libardourcp.so* $Libraries
+cp $BUILD_ROOT/libs/ctrl-interface/*/libardour_*.so* $Libraries
 
 # MidiMaps
 # got to be careful with names here

tools/osx_packaging/osx_build

@@ -316,7 +316,7 @@ cp $BUILD_ROOT/libs/clearlooks-newer/libclearlooks.dylib $GTK_ENGINE_DIR/libclea
 
 # Control Surface shared libraries
 cp $BUILD_ROOT/libs/surfaces/*/libardour_*.dylib $Surfaces
-cp $BUILD_ROOT/libs/surfaces/control_protocol/libardourcp*.dylib $Frameworks
+cp $BUILD_ROOT/libs/ctrl-interface/*/libardour_*.dylib $Frameworks
 
 # Panners
 cp $BUILD_ROOT/libs/panners/*/lib*.dylib $Panners

wscript

@@ -314,6 +314,7 @@ children = [
         'libs/pbd',
         'libs/midi++2',
         'libs/evoral',
+        'libs/ctrl-interface',
         'libs/surfaces',
         'libs/panners',
         'libs/backends',