make transport buttons and shuttle controller work with MIDI CC's

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

diff --git a/libs/surfaces/generic_midi/SConscript b/libs/surfaces/generic_midi/SConscript
index 1760eb24e912386c1435267077b80a652ecd4587..b0921888528961d54ff3545164184f339d8fff45 100644 (file)
--- a/libs/surfaces/generic_midi/SConscript
+++ b/libs/surfaces/generic_midi/SConscript
@@ -23,6 +23,7 @@ genericmidi.Append(POTFILE = domain + '.pot')
 genericmidi_files=Split("""
 interface.cc
 generic_midi_control_protocol.cc
+midicontrollable.cc
 """)
 
 genericmidi.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
@@ -33,13 +34,14 @@ genericmidi.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
 genericmidi.Merge ([
        libraries['ardour'],
        libraries['ardour_cp'],
+       libraries['sndfile-ardour'],
        libraries['midi++2'],
-       libraries['pbd3'],
+       libraries['pbd'],
        libraries['sigc2'],
        libraries['usb'],
        libraries['xml'],
-    libraries['glib2'],
-    libraries['glibmm2']
+       libraries['glib2'],
+       libraries['glibmm2']
        ])
 
 libardour_genericmidi = genericmidi.SharedLibrary('ardour_genericmidi', genericmidi_files)
@@ -49,7 +51,7 @@ 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('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2', 'surfaces'), libardour_genericmidi))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                     [ 'SConscript' ] +