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

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

diff --git a/libs/surfaces/generic_midi/SConscript b/libs/surfaces/generic_midi/SConscript
index 51e0ff88c8a7cecee8c707155bd2b662271807f7..9edb76327af23f38c6b30edb8053c25a1d27a1e2 100644 (file)
--- a/libs/surfaces/generic_midi/SConscript
+++ b/libs/surfaces/generic_midi/SConscript
@@ -1,6 +1,7 @@
 # -*- python -*-
 
 import os
+import os.path
 import glob
 
 Import('env final_prefix install_prefix final_config_prefix libraries i18n')
@@ -29,15 +30,15 @@ genericmidi.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"")
 genericmidi.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"")
 genericmidi.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
 
-genericmidi.Append(CPPPATH=libraries['ardour'].get ('CPPPATH', []))
-genericmidi.Append(CPPPATH=libraries['sigc2'].get ('CPPPATH', []))
-genericmidi.Append(CPPPATH=libraries['pbd3'].get ('CPPPATH', []))
-genericmidi.Append(CPPPATH=libraries['midi++2'].get ('CPPPATH', []))
-
 genericmidi.Merge ([
-            libraries['usb'],
-            libraries['xml']
-            ])
+       libraries['ardour'],
+       libraries['ardour_cp'],
+       libraries['midi++2'],
+       libraries['pbd3'],
+       libraries['sigc2'],
+       libraries['usb'],
+       libraries['xml']
+       ])
 
 libardour_genericmidi = genericmidi.SharedLibrary('ardour_genericmidi', genericmidi_files)
 
@@ -46,6 +47,8 @@ Default(libardour_genericmidi)
 if env['NLS']:
        i18n (genericmidi, genericmidi_files, env)
              
+env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2/surfaces'), libardour_genericmidi))
+
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                     [ 'SConscript', 'i18n.h', 'gettext.h' ] +
                                     genericmidi_files +