Merged timbyr's win32 branch. -r 547:566.

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

diff --git a/libs/surfaces/control_protocol/SConscript b/libs/surfaces/control_protocol/SConscript
index e3927fa7ac93b620dc8badb3c5609dd5e31747cc..38ff95d9f0da8c4f93d2d64359d48f9e1f5c3c82 100644 (file)
--- a/libs/surfaces/control_protocol/SConscript
+++ b/libs/surfaces/control_protocol/SConscript
@@ -36,7 +36,9 @@ cp.Merge ([
     libraries['pbd3'],
     libraries['midi++2'],
     libraries['xml'],
-    libraries['usb']
+    libraries['usb'],
+    libraries['glib2'],
+    libraries['glibmm2']
        ])
 
 libardour_cp = cp.SharedLibrary('ardour_cp', cp_files)
@@ -46,9 +48,9 @@ Default(libardour_cp)
 if env['NLS']:
        i18n (cp, cp_files, env)
              
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2/surfaces'), libardour_cp))
+env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libardour_cp))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
-                                    [ 'SConscript', 'i18n.h', 'gettext.h' ] +
+                                    [ 'SConscript' ] +
                                     cp_files + 
                                     glob.glob('po/*.po') + glob.glob('*.h')))