convert property_foo().set_value(bar) to property_foo() = bar

[ardour.git] / gtk2_ardour / SConscript

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index 23368ad910cd8265c6c1fd0a2f025e0c8ef33e57..4479f345ad941d56f0f70cd6b9c9229f6042c3af 100644 (file)
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -15,6 +15,7 @@ gtkardour = env.Copy()
 domain = 'gtk_ardour'
 
 gtkardour.Append(DOMAIN=domain, MAJOR=1,MINOR=0,MICRO=2)
+gtkardour.Append(CCFLAGS="-DPACKAGE=\\\"" + domain + "\\\"")
 gtkardour.Append(CXXFLAGS="-DPACKAGE=\\\"" + domain + "\\\"")
 gtkardour.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
 gtkardour.Append(CXXFLAGS="-DFLOWCANVAS_AA")
@@ -44,6 +45,7 @@ gtkardour.Merge ([
     libraries['soundtouch'],
     libraries['samplerate'],
     libraries['jack'],
+    libraries['glade2'],
     libraries['libglademm']
 ])
 
@@ -116,6 +118,7 @@ glade_factory.cc
 grouped_buttons.cc
 gtk-custom-hruler.c
 gtk-custom-ruler.c
+imageframe.cc
 imageframe_socket_handler.cc
 imageframe_time_axis.cc
 imageframe_time_axis_group.cc
@@ -123,7 +126,6 @@ imageframe_time_axis_view.cc
 imageframe_view.cc
 io_selector.cc
 keyboard.cc
-keyboard_target.cc
 location_ui.cc
 main.cc
 marker.cc
@@ -204,7 +206,7 @@ executable = 'ardour.bin'
 
 ardour = gtkardour.Program(target = executable, source = gtkardour_files + extra_sources)
 mtest = gtkardour.Program(target = 'mtest', source = mtest_files)
-itest = gtkardour.Program(target = 'itest', source = itest_files)
+#itest = gtkardour.Program(target = 'itest', source = itest_files)
 
 Default(ardour)
 
@@ -220,6 +222,7 @@ if env['NLS']:
 
 env.Alias('install', env.InstallAs(os.path.join(install_prefix, 'bin')+'/ardour', ardour))
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour'), 'ardour_ui.rc'))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour'), 'ardour-menus.xml'))
 env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour'), 'splash.ppm'))
 env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour/glade'), glade_files))