Fix mantis bug #1619; de-selecting Options->Crossfades->Show now hides all crossfades...

[ardour.git] / gtk2_ardour / SConscript

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index a97bc234b87163deb7cb5e475f2d28f767baed17..24adb555387e4b51735e7c768fb39fb70fa4bff5 100644 (file)
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -4,7 +4,7 @@ import os
 import os.path
 import glob
 
-Import('env install_prefix final_prefix config_prefix libraries i18n version')
+Import('env install_prefix final_prefix config_prefix libraries i18n ardour_version')
 
 gtkardour = env.Copy()
 gtkmmtests = env.Copy()
@@ -19,6 +19,7 @@ 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(CPPPATH="#/")  # for top level svn_revision.h
 #gtkardour.Append(CXXFLAGS="-DFLOWCANVAS_AA")
 gtkardour.Append(PACKAGE=domain)
 gtkardour.Append(POTFILE=domain + '.pot')
@@ -109,6 +110,7 @@ color_manager.cc
 crossfade_edit.cc
 crossfade_view.cc
 curvetest.cc
+enums.cc
 editing.cc
 editor.cc
 editor_actions.cc
@@ -132,6 +134,7 @@ editor_region_list.cc
 editor_route_list.cc
 editor_rulers.cc
 editor_scrub.cc
+editor_selection.cc
 editor_selection_list.cc
 editor_tempodisplay.cc
 editor_timefx.cc
@@ -142,7 +145,6 @@ export_range_markers_dialog.cc
 gain_automation_time_axis.cc
 gain_meter.cc
 ghostregion.cc
-grouped_buttons.cc
 gtk-custom-hruler.c
 gtk-custom-ruler.c
 imageframe.cc
@@ -166,6 +168,7 @@ new_session_dialog.cc
 option_editor.cc
 opts.cc
 pan_automation_time_axis.cc
+panner.cc
 panner2d.cc
 panner_ui.cc
 playlist_selector.cc
@@ -258,7 +261,7 @@ versionflag = '-DVERSIONSTRING=\\\"' + env['VERSION'] + '\\\"'
 
 gtkardour.Append(CXXFLAGS=versionflag)
 
-executable = 'ardour.bin'
+executable = 'ardour-' + ardour_version
 
 ardour = gtkardour.Program(target = executable, source = gtkardour_files + extra_sources)
 ardourlib = gtkardour.SharedLibrary(target = 'ardourgtk', source = gtkardour_files + extra_sources)
@@ -269,15 +272,31 @@ rcu = gtkardour.Program(target = 'rcu', source = rcu_files)
 tt = gtkmmtests.Program(target = 'tt', source = tt_files)
 
 my_subst_dict = { }
+
+#
+# null substitution just to avoid ardour.bindings being in svn
+#
+
+ardourbindings = env.SubstInFile ('ardour.bindings', 'ardour.bindings.in', SUBST_DICT = my_subst_dict);
+
 my_subst_dict['%INSTALL_PREFIX%'] = final_prefix
+my_subst_dict['%LIBDIR%'] = env['LIBDIR']
+my_subst_dict['%VERSION%'] = ardour_version
 
 ardoursh = env.SubstInFile ('ardour.sh','ardour.sh.in', SUBST_DICT = my_subst_dict);
 env.AddPostAction (ardoursh, Chmod ('$TARGET', 0755))
 
+ardourdev = env.SubstInFile ('ardev_common.sh','ardev_common.sh.in', SUBST_DICT = my_subst_dict);
+env.AddPostAction (ardourdev, Chmod ('$TARGET', 0755))
+
+Default(ardourbindings)
+Default(ardourdev)
+Default(ardoursh)
+
 if env['VST']:
        Default(ardourlib)
        # the library - into the library dir
-       env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), ardourlib))
+       env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), ardourlib))
 else:
 
        if env['VERSIONED']:
@@ -288,7 +307,7 @@ else:
         #install
 
        # the executable - into the library dir
-       env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), ardour))
+       env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), ardour))
        # the script - into the bin dir
        env.Alias('install', env.InstallAs(os.path.join(install_prefix, 'bin')+'/ardour2', ardoursh))
 
@@ -301,19 +320,21 @@ env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.bindings'))
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.colors'))
 # data files
-env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2'), 'splash.png'))
-env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/pixmaps'), pixmap_files))
-env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/icons'), icon_files))
+env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2'), 'splash.png'))
+env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2', 'pixmaps'), pixmap_files))
+env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2', 'icons'), icon_files))
 
-env.Alias ('version', gtkardour.VersionBuild(['version.cc','version.h'], 'SConscript'))
+env.Alias ('version', gtkardour.VersionBuild(['version.cc','version.h'], []))
                
 #dist
 env.Alias ('tarball', env.Distribute (env['DISTTREE'],
                                       [ 'SConscript',
                                         'i18n.h', 'gettext.h',
                                        'ardour.sh.in',
+                                       'ardev_common.sh.in',
+                                       'ardev', 'ardbg',
                                         'ardour2_ui.rc', 'splash.png',
-                                        'ardour.menus', 'ardour.bindings', 'ardour.colors',
+                                        'ardour.menus', 'ardour.bindings.in', 'ardour.colors',
                                        'editor_xpms'
                                         ] +
                                       gtkardour_files +