build fixes for external libsndfile, plus make ogg & FLAC required libs now
[ardour.git] / gtk2_ardour / SConscript
index f1309b8c00313e53cfc0d004c403a0d68c12c047..bffb28e66a151d7e36d03604889d4a44cccd01bf 100644 (file)
@@ -6,8 +6,8 @@ import glob
 
 Import('env install_prefix final_prefix config_prefix libraries i18n ardour_version')
 
-gtkardour = env.Copy()
-gtkmmtests = env.Copy()
+gtkardour = env.Clone()
+gtkmmtests = env.Clone()
 
 #
 # this defines the version number of the GTK interface to ardour
@@ -18,54 +18,60 @@ domain = 'gtk2_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=["-DLIBSIGC_DISABLE_DEPRECATED", "-DGLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED", "-DGLIBMM_EXCEPTIONS_ENABLED", "-DGLIBMM_PROPERTIES_ENABLED"])
 gtkardour.Append(CPPPATH="#/")  # for top level svn_revision.h
 #gtkardour.Append(CXXFLAGS="-DFLOWCANVAS_AA")
 gtkardour.Append(PACKAGE=domain)
 gtkardour.Append(POTFILE=domain + '.pot')
 
-if gtkardour['DIST_TARGET'] == 'panther' or gtkardour['DIST_TARGET'] == 'tiger':
-       gtkardour.Append (LINKFLAGS="-Xlinker -headerpad -Xlinker 2048")
+if gtkardour['IS_OSX']:
+       gtkardour.Append (LINKFLAGS="-Xlinker -headerpad -Xlinker 2048 -framework CoreAudio")
 
 gtkardour.Merge ([
     libraries['ardour'],
     libraries['ardour_cp'],
-    libraries['gtkmm2ext'],
-    libraries['midi++2'],
-    libraries['pbd'],
-    libraries['gtkmm2'],
+    libraries['asound'],
+    libraries['atkmm'],
+    libraries['cairomm'],
+    libraries['fftw3'],
+    libraries['fftw3f'],
+    libraries['flac'],
+    libraries['freetype2'],
+    libraries['gdkmm2'],
     libraries['glib2'],
+    libraries['glibmm2'],
+    libraries['gtk2'],
+    libraries['gtkmm2'],
+    libraries['gtkmm2ext'],
+    libraries['jack'],
     libraries['libgnomecanvas2'],
     libraries['libgnomecanvasmm'],
-    libraries['sysmidi'],
-    libraries['sndfile-ardour'],
-    libraries['flac'],
     libraries['lrdf'],
-    libraries['glibmm2'],
+    libraries['midi++2'],
     libraries['pangomm'],
-    libraries['atkmm'],
-    libraries['gdkmm2'],
+    libraries['pbd'],
+    libraries['samplerate'],
     libraries['sigc2'],
-    libraries['gtk2'],
+    libraries['sndfile'],
+    libraries['taglib'],
+    libraries['sysmidi'],
+    libraries['vamp'],
+    libraries['vamphost'],
     libraries['xml'],
-    libraries['xslt'],
-    libraries['soundtouch'],
-    libraries['samplerate'],
-    libraries['jack'],
-    libraries['sysaudio']
+    libraries['xslt']
 ])
 
 gtkmmtests.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
 
 gtkmmtests.Merge ([
-    libraries['gtkmm2'],
+    libraries['atkmm'],
+    libraries['gdkmm2'],
     libraries['glib2'],
     libraries['glibmm2'],
+    libraries['gtk2'],
+    libraries['gtkmm2'],
     libraries['pangomm'],
-    libraries['atkmm'],
-    libraries['gdkmm2'],
-    libraries['sigc2'],
-    libraries['gtk2']
+    libraries['sigc2']
 ])
 
 if gtkardour['DMALLOC']:
@@ -76,17 +82,25 @@ if gtkardour['FFT_ANALYSIS']:
        gtkardour.Merge ([libraries['fftw3f']])
        gtkardour.Append(CCFLAGS='-DFFT_ANALYSIS')
 
+if gtkardour['FREESOUND']:
+       gtkardour.Merge ([libraries['curl']])
+       gtkardour.Append(CCFLAGS='-DFREESOUND')
+
+if gtkardour['RUBBERBAND']:
+       gtkardour.Merge ([ libraries['rubberband'] ])
+else:
+       gtkardour.Merge ([ libraries['soundtouch'] ])
+
 skipped_files=Split("""
 connection_editor.cc
 """)
 
 audiounit_files=Split("""
-au_pluginui.cc
+au_pluginui.mm
 """)
 
 gtkosx_files=Split("""
-sync-menu.c
-cocoacarbon.c
+cocoacarbon.mm
 """)
 
 x11_files=Split("""
@@ -96,48 +110,46 @@ x11.cc
 gtkardour_files=Split("""
 about.cc
 actions.cc
-add_route_dialog.cc
 add_midi_cc_track_dialog.cc
+add_route_dialog.cc
 ardour_dialog.cc
-ardour_ui.cc
 ardour_ui2.cc
+ardour_ui.cc
 ardour_ui_dependents.cc
 ardour_ui_dialogs.cc
 ardour_ui_ed.cc
 ardour_ui_mixer.cc
 ardour_ui_options.cc
 audio_clock.cc
-audio_time_axis.cc
 audio_region_editor.cc
-control_point.cc
-automation_line.cc
-automation_time_axis.cc
-automation_streamview.cc
+audio_region_view.cc
+audio_streamview.cc
+audio_time_axis.cc
 automation_controller.cc
+automation_line.cc
 automation_region_view.cc
-bundle_manager.cc
-midi_port_dialog.cc
-midi_time_axis.cc
-midi_streamview.cc
+automation_streamview.cc
+automation_time_axis.cc
 axis_view.cc
+bundle_manager.cc
+canvas-program-change.cc
+canvas-note-event.cc
+canvas-note.cc
 canvas-simpleline.c
-simpleline.cc
 canvas-simplerect.c
-simplerect.cc
 canvas-waveview.c
-diamond.cc
-canvas-midi-event.cc
+control_point.cc
 crossfade_edit.cc
 crossfade_view.cc
 curvetest.cc
-enums.cc
+diamond.cc
 editing.cc
-editor.cc
 editor_actions.cc
 editor_audio_import.cc
 editor_audiotrack.cc
 editor_canvas.cc
 editor_canvas_events.cc
+editor.cc
 editor_cursors.cc
 editor_edit_groups.cc
 editor_export_audio.cc
@@ -158,62 +170,76 @@ editor_selection_list.cc
 editor_tempodisplay.cc
 editor_timefx.cc
 engine_dialog.cc
-export_dialog.cc
-export_session_dialog.cc
-export_region_dialog.cc
-export_range_markers_dialog.cc
+enums.cc
+export_format_dialog.cc
+export_main_dialog.cc
+export_channel_selector.cc
+export_filename_selector.cc
+export_format_selector.cc
+export_timespan_selector.cc
 gain_meter.cc
+generic_pluginui.cc
 ghostregion.cc
 gtk-custom-hruler.c
 gtk-custom-ruler.c
 io_selector.cc
-port_matrix.cc
 keyboard.cc
 keyeditor.cc
-ladspa_pluginui.cc
 latency_gui.cc
+level_meter.cc
+lineset.cc
 location_ui.cc
 main.cc
 marker.cc
+midi_port_dialog.cc
+midi_region_view.cc
+midi_scroomer.cc
+midi_streamview.cc
+midi_time_axis.cc
+midi_channel_selector.cc
 mixer_strip.cc
 mixer_ui.cc
 new_session_dialog.cc
 option_editor.cc
 opts.cc
-panner.cc
 panner2d.cc
+panner.cc
 panner_ui.cc
+piano_roll_header.cc
 playlist_selector.cc
 plugin_selector.cc
 plugin_ui.cc
+port_matrix.cc
+processor_box.cc
 prompter.cc
 public_editor.cc
-processor_box.cc
 region_gain_line.cc
 region_selection.cc
 region_view.cc
-audio_region_view.cc
-midi_region_view.cc
-tape_region_view.cc
+rhythm_ferret.cc
 route_params_ui.cc
 route_processor_selection.cc
+route_time_axis.cc
 route_ui.cc
 selection.cc
-sfdb_ui.cc
 send_ui.cc
+session_metadata_dialog.cc
+sfdb_ui.cc
+simpleline.cc
+simplerect.cc
+splash.cc
 streamview.cc
-audio_streamview.cc
+tape_region_view.cc
 tempo_dialog.cc
+tempo_lines.cc
 theme_manager.cc
 time_axis_view.cc
 time_axis_view_item.cc
-route_time_axis.cc
 time_selection.cc
 ui_config.cc
 utils.cc
 version.cc
 waveview.cc
-tempo_lines.cc
 """)
 
 fft_analysis_files=Split("""
@@ -222,11 +248,19 @@ fft_graph.cc
 fft_result.cc
 """)
 
+freesound_files=Split("""
+sfdb_freesound_mootcher.cc
+""")
+
 pixmap_files = glob.glob('pixmaps/*.xpm')
 icon_files = glob.glob ('icons/*.png')
 
 intl_files = gtkardour_files + glob.glob('*.h')
 
+evtest_files=Split("""
+evtest.cc
+""")
+
 mtest_files=Split("""
 mtest.cc
 """)
@@ -256,40 +290,34 @@ if env['VST']:
        extra_sources += vst_files
        gtkardour.Append (CCFLAGS="-DVST_SUPPORT", CPPPATH="#libs/fst")
 
-cmt_files=Split("""
-canvas-imageframe.c
-editor_imageframe.cc
-imageframe.cc
-imageframe_socket_handler.cc
-imageframe_time_axis.cc
-imageframe_time_axis_group.cc
-imageframe_time_axis_view.cc
-imageframe_view.cc
-marker_time_axis.cc
-marker_time_axis_view.cc
-marker_view.cc
-visual_time_axis.cc
-""")
+lv2_files = [ 'lv2_plugin_ui.cc' ]
+
+if env['LV2']:
+       extra_sources += lv2_files
+       gtkardour.Append (CCFLAGS="-DHAVE_LV2")
+       gtkardour.Merge ([libraries['slv2']])
 
-if env['CMT']:
-    extra_sources += cmt_files
-    gtkardour.Append (CCFLAGS="-DWITH_CMT")
 
 if gtkardour['GTKOSX']:
-   extra_sources += gtkosx_files
-   gtkardour.Append (CCFLAGS="-DTOP_MENUBAR -DGTKOSX")
+       extra_sources += gtkosx_files
+       gtkardour.Append (CCFLAGS="-DTOP_MENUBAR -DGTKOSX")
+       gtkardour.Append (LINKFLAGS=" -framework AppKit -framework CoreAudioKit")
+
+       if gtkardour['AUDIOUNITS']:
+               extra_sources += audiounit_files
+               gtkardour.Append(CCFLAGS='-DHAVE_AUDIOUNITS')
+               gtkardour.Merge([libraries['appleutility']])
+
 else:
    extra_sources += x11_files
        
-if gtkardour['AUDIOUNITS']:
-    extra_sources += audiounit_files
-    gtkardour.Append(CCFLAGS='-DHAVE_AUDIOUNITS')
-    gtkardour.Append(LINKFLAGS='-framework Carbon')
-    gtkardour.Merge([libraries['appleutility']])
  
 if env['FFT_ANALYSIS']:
        extra_sources += fft_analysis_files
 
+if env['FREESOUND']:
+       extra_sources += freesound_files
+
 intl_files += extra_sources
 
 gtkardour.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
@@ -304,6 +332,7 @@ executable = 'ardour-' + ardour_version
 ardour = gtkardour.Program(target = executable, source = gtkardour_files + extra_sources)
 ardourlib = gtkardour.SharedLibrary(target = 'ardourgtk', source = gtkardour_files + extra_sources)
 
+evest = gtkmmtests.Program(target = 'evtest', source = evtest_files)
 mtest = gtkardour.Program(target = 'mtest', source = mtest_files)
 itest = gtkardour.Program(target = 'itest', source = itest_files)
 rcu = gtkardour.Program(target = 'rcu', source = rcu_files)
@@ -311,81 +340,73 @@ tt = gtkmmtests.Program(target = 'tt', source = tt_files)
 
 my_font_dict = { }
 
-if gtkardour['DIST_TARGET'] == 'panther' or gtkardour['DIST_TARGET'] == 'tiger':
+if gtkardour['IS_OSX']:
        #
        # OS X font rendering is different even with X11
        #
-       my_font_dict['%FONT_TINY%'] = 'Lucida Grande 7'
-       my_font_dict['%FONT_SMALLERER%'] = 'Lucida Grande 8'
-       my_font_dict['%FONT_SMALLER%'] = 'Lucida Grande 9'
-       my_font_dict['%FONT_SMALL%'] = 'Lucida Grande 10'
-       my_font_dict['%FONT_NORMAL%'] = 'Lucida Grande 11'
-       my_font_dict['%FONT_BIG%'] = 'Lucida Grande 12'
-       my_font_dict['%FONT_BIGGER%'] = 'Lucida Grande 14'
-       my_font_dict['%FONT_LARGE%'] = 'Lucida Grande 18'
-       my_font_dict['%FONT_LARGER%'] = 'Lucida Grande 28'
-       my_font_dict['%FONT_HUGER%'] = 'Lucida Grande 36'
-       my_font_dict['%FONT_MASSIVE%'] = 'Lucida Grande 60'
-       my_font_dict['%FONT_BOLD_TINY%'] = 'Lucida Grande bold 7'
-       my_font_dict['%FONT_BOLD_SMALLER%'] = 'Lucida Grande bold 9'
-       my_font_dict['%FONT_BOLD_SMALL%'] = 'Lucida Grande bold 10'
-       my_font_dict['%FONT_BOLD_NORMAL%'] = 'Lucida Grande bold 11'
-       my_font_dict['%FONT_BOLD_BIG%'] = 'Lucida Grande bold 13'
-       my_font_dict['%FONT_BOLD_BIGGER%'] = 'Lucida Grande bold 14'
-       my_font_dict['%FONT_BOLD_LARGE%'] = 'Lucida Grande bold 20'
-       my_font_dict['%FONT_BOLD_LARGER%'] = 'Lucida Grande bold 25'
-       my_font_dict['%FONT_BOLD_HUGER%'] = 'Lucida Grande bold 36'
-       my_font_dict['%FONT_BOLD_MASSIVE%'] = 'Lucida Grande bold 60'
-       my_font_dict['%FONT_ITALIC_TINY%'] = 'Lucida Grande italic 7'
-       my_font_dict['%FONT_ITALIC_SMALLER%'] = 'Lucida Grande italic 9'
-       my_font_dict['%FONT_ITALIC_SMALL%'] = 'Lucida Grande italic 10'
-       my_font_dict['%FONT_ITALIC_NORMAL%'] = 'Lucida Grande italic 11'
-       my_font_dict['%FONT_ITALIC_BIG%'] = 'Lucida Grande italic 15'
-       my_font_dict['%FONT_ITALIC_BIGGER%'] = 'Lucida Grande italic 16'
-       my_font_dict['%FONT_ITALIC_LARGE%'] = 'Lucida Grande italic 20'
-       my_font_dict['%FONT_ITALIC_LARGER%'] = 'Lucida Grande italic 28'
-       my_font_dict['%FONT_ITALIC_HUGER%'] = 'Lucida Grande italic 36'
-       my_font_dict['%FONT_ITALIC_MASSIVE%'] = 'Lucida Grande italic 60'
+
+       font_sizes = {
+               'TINY' : '7',
+               'SMALLER' : '9',
+               'SMALL' : '10',
+               'NORMAL' : '11',
+               'BIG' : '12',
+               'BIGGER' : '14',
+               'LARGE' : '18',
+               'LARGER' : '28',
+               'HUGER' : '36',
+               'MASSIVE' : '60'
+               }
+       basefont = "Lucida Grande"
+
 else:
        #
        # Linux/X11 font rendering
        #
-       my_font_dict['%FONT_TINY%'] = 'sans 4'
-       my_font_dict['%FONT_SMALLERER%'] = 'sans 6'
-       my_font_dict['%FONT_SMALLER%'] = 'sans 6'
-       my_font_dict['%FONT_SMALL%'] = 'sans 7'
-       my_font_dict['%FONT_NORMAL%'] = 'sans 8'
-       my_font_dict['%FONT_BIG%'] = 'sans 12'
-       my_font_dict['%FONT_BIGGER%'] = 'sans 14'
-       my_font_dict['%FONT_LARGE%'] = 'sans 18'
-       my_font_dict['%FONT_LARGER%'] = 'sans 24'
-       my_font_dict['%FONT_HUGER%'] = 'sans 34'
-       my_font_dict['%FONT_MASSIVE%'] = 'sans 60'
-       my_font_dict['%FONT_BOLD_TINY%'] = 'sans bold 4'
-       my_font_dict['%FONT_BOLD_SMALLER%'] = 'sans bold 6'
-       my_font_dict['%FONT_BOLD_SMALL%'] = 'sans bold 7'
-       my_font_dict['%FONT_BOLD_NORMAL%'] = 'sans bold 8'
-       my_font_dict['%FONT_BOLD_BIG%'] = 'sans bold 12'
-       my_font_dict['%FONT_BOLD_BIGGER%'] = 'sans bold 14'
-       my_font_dict['%FONT_BOLD_LARGE%'] = 'sans bold 18'
-       my_font_dict['%FONT_BOLD_LARGER%'] = 'sans bold 24'
-       my_font_dict['%FONT_BOLD_HUGE%'] = 'sans bold 25'
-       my_font_dict['%FONT_BOLD_HUGER%'] = 'sans bold 34'
-       my_font_dict['%FONT_BOLD_MASSIVE%'] = 'sans bold 60'
-       my_font_dict['%FONT_ITALIC_TINY%'] = 'sans italic 4'
-       my_font_dict['%FONT_ITALIC_SMALLER%'] = 'sans italic 6'
-       my_font_dict['%FONT_ITALIC_SMALL%'] = 'sans italic 7'
-       my_font_dict['%FONT_ITALIC_NORMAL%'] = 'sans italic 8'
-       my_font_dict['%FONT_ITALIC_BIG%'] = 'sans italic 12'
-       my_font_dict['%FONT_ITALIC_BIGGER%'] = 'sans italic 14'
-       my_font_dict['%FONT_ITALIC_LARGE%'] = 'sans italic 18'
-       my_font_dict['%FONT_ITALIC_LARGER%'] = 'sans italic 24'
-       my_font_dict['%FONT_ITALIC_HUGE%'] = 'sans italic 25'
-       my_font_dict['%FONT_ITALIC_HUGER%'] = 'sans italic 34'
-       my_font_dict['%FONT_ITALIC_MASSIVE%'] = 'sans italic 60'
-
-ardour_dark_theme = env.SubstInFile ('ardour2_ui_dark.rc', 'ardour2_ui_dark.rc.in', SUBST_DICT = my_font_dict)
-ardour_light_theme = env.SubstInFile ('ardour2_ui_light.rc', 'ardour2_ui_light.rc.in', SUBST_DICT = my_font_dict)
+       
+       if gtkardour['OLDFONTS']:
+               font_sizes = {
+                       'TINY' : '4',
+                       'SMALLER' : '6',
+                       'SMALL' : '7',
+                       'NORMAL' : '8',
+                       'BIG' : '12',
+                       'BIGGER' : '14',
+                       'LARGE' : '18',
+                       'LARGER' : '24',
+                       'HUGER' : '34',
+                       'MASSIVE' : '60'
+                       }
+       else:
+               font_sizes = {
+                       'TINY' : '6',
+                       'SMALLER' : '8',
+                       'SMALL' : '9',
+                       'NORMAL' : '10',
+                       'BIG' : '14',
+                       'BIGGER' : '16',
+                       'LARGE' : '18',
+                       'LARGER' : '24',
+                       'HUGER' : '34',
+                       'MASSIVE' : '60'
+                       }
+
+       basefont = "sans"
+
+for style in ['', 'BOLD', 'ITALIC']:
+       for sizename,points in font_sizes.iteritems():
+               if (len (style)):
+                       key = "_".join (['FONT',style,sizename])
+                       fontstyle = " ".join ([basefont,style.lower(),points])
+               else:
+                       key = "_".join (['FONT',sizename])
+                       fontstyle = " ".join ([basefont,points])
+
+               key = '%' + key + '%'
+               my_font_dict[key] = fontstyle
+
+ardour_dark_theme = env.SubstInFile ('ardour3_ui_dark.rc', 'ardour3_ui_dark.rc.in', SUBST_DICT = my_font_dict)
+ardour_light_theme = env.SubstInFile ('ardour3_ui_light.rc', 'ardour3_ui_light.rc.in', SUBST_DICT = my_font_dict)
 
 my_subst_dict = { }
 
@@ -393,7 +414,35 @@ 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);
+keybindings_dict = { }
+
+if gtkardour['GTKOSX']:
+       #
+       # Command(Meta), Alt(Mod1), Ctrl, Shift
+       # **** as of february 4th 2008, OUR VERSION OF *****
+       # Gtk/Quartz maps:
+       #  NSCommand (aka "Command" aka "Apple" aka "Cauliflower") -> Meta
+       #  NSAlternate (aka "Option")  -> Mod1
+       #
+       keybindings_dict['%PRIMARY%'] = 'Meta'
+       keybindings_dict['%SECONDARY%'] = 'Mod1'
+       keybindings_dict['%TERTIARY%'] = 'Shift'
+       keybindings_dict['%LEVEL4%'] = 'Ctrl'
+       keybindings_dict['%WINDOW%'] = 'Mod1'
+else:
+       #
+       # Ctrl, Alt, Shift, Mod4(Super/Windows/Hyper)
+       #
+       keybindings_dict['%PRIMARY%'] = 'Ctrl'
+       keybindings_dict['%SECONDARY%'] = 'Alt'
+       keybindings_dict['%TERTIARY%'] = 'Shift'
+       keybindings_dict['%LEVEL4%'] = env['WINDOWS_KEY']
+       keybindings_dict['%WINDOW%'] = 'Alt'
+
+for b in [ 'SAE-de',  'SAE-us', 'mnemonic-us', 'ergonomic-us' ]:
+       target_file = b + '.bindings'
+       src_file = target_file + '.in'
+       Default (env.SubstInFile (target_file, src_file, SUBST_DICT = keybindings_dict))
 
 my_subst_dict['%INSTALL_PREFIX%'] = final_prefix
 my_subst_dict['%LIBDIR%'] = env['LIBDIR']
@@ -405,7 +454,6 @@ 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)
 Default(ardour_dark_theme)
@@ -414,7 +462,7 @@ Default(ardour_light_theme)
 if env['VST']:
        Default(ardourlib)
        # the library - into the library dir
-       env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), ardourlib))
+       env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), ardourlib))
 else:
 
        if env['VERSIONED']:
@@ -425,27 +473,68 @@ else:
         #install
 
        # the executable - into the library dir
-       env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), ardour))
+       env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), ardour))
        # the script - into the bin dir
-       env.Alias('install', env.InstallAs(os.path.join(install_prefix, 'bin')+'/ardour2', ardoursh))
+       env.Alias('install', env.InstallAs(os.path.join(install_prefix, 'bin')+'/ardour3', ardoursh))
 
 if env['NLS']:
        i18n (gtkardour, gtkardour_files+skipped_files+fft_analysis_files, env)
     
 # configuration files
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), ardour_dark_theme))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), ardour_light_theme))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.menus'))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour-sae.menus'))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.bindings'))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour2_ui_default.conf'))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), ardour_dark_theme))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), ardour_light_theme))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour3_ui_default.conf'))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour.menus'))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour-sae.menus'))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ergonomic-us.bindings'))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'mnemonic-us.bindings'))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'SAE-de.bindings'))
 # 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', 'ardour3'), 'splash.png'))
+env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour3', 'pixmaps'), pixmap_files))
+env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour3', 'icons'), icon_files))
 env.Alias ('version', gtkardour.VersionBuild(['version.cc','version.h'], []))
-               
+env.Alias ('version', gtkardour.VersionBuild(['version.cc','version.h'], []))
+
+# This will install icons and MIME type as per freedesktop.org specs. #
+if env['FREEDESKTOP']:
+       desktop_icon_install_prefix = install_prefix + '/share/icons/hicolor'
+       # Install the desktop icons to the default locations #
+       env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '16x16', 'apps', 'ardour2.png'), 'icons/ardour_icon_16px.png'))
+       env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '22x22', 'apps', 'ardour2.png'), 'icons/ardour_icon_22px.png'))
+       env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '32x32', 'apps', 'ardour2.png'), 'icons/ardour_icon_32px.png'))
+       env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '48x48', 'apps', 'ardour2.png'), 'icons/ardour_icon_48px.png'))
+       # Install the mime type xml file and its icon #
+        env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'mime', 'packages'), 'ardour2.xml'))
+       env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '16x16', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_16px.png'))
+       env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '22x22', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_22px.png'))
+       env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '32x32', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_32px.png'))
+       env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '48x48', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_48px.png'))
+       env.Alias('install', env.Command (os.path.join(install_prefix, 'share', 'mime'), [], 'update-mime-database $TARGET'))
+       # Update the icon cache #
+       env.Alias('install', env.Command (desktop_icon_install_prefix, [], 'touch --no-create $TARGET'))
+       env.Alias('install', env.Command (desktop_icon_install_prefix, [], 'gtk-update-icon-cache $TARGET'))
+       # Make the ardour2.desktop file and install it #
+       env.Alias('install', env.Command ('ardour2.desktop', 'ardour2.desktop.in', 'cat $SOURCES  > $TARGET'))
+       env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'applications'), 'ardour2.desktop'))
+       env.Alias('install', env.Command (os.path.join(install_prefix, 'share', 'applications'), [], 'update-desktop-database $TARGET'))
+       # uninstall target.. needed to run  update-mime-database and update-desktop-database after removal. #`
+       remove_desktop_files = env.Command ('another_frobnicatory_decoy', [],
+                             [ Delete (install_prefix + '/share/mime/packages/ardour2.xml'),
+                              Delete (install_prefix + '/share/applications/ardour2.desktop'),
+                              Delete (desktop_icon_install_prefix + '/16x16/apps/ardour2.png'),
+                              Delete (desktop_icon_install_prefix + '/22x22/apps/ardour2.png'),
+                              Delete (desktop_icon_install_prefix + '/32x32/apps/ardour2.png'),
+                              Delete (desktop_icon_install_prefix + '/48x48/apps/ardour2.png'),
+                              Delete (desktop_icon_install_prefix + '/16x16/mimetypes/application-x-ardour2.png'),
+                              Delete (desktop_icon_install_prefix + '/22x22/mimetypes/application-x-ardour2.png'),
+                              Delete (desktop_icon_install_prefix + '/32x32/mimetypes/application-x-ardour2.png'),
+                              Delete (desktop_icon_install_prefix + '/48x48/mimetypes/application-x-ardour2.png'),
+                               Action ('update-mime-database ' + install_prefix + '/share/mime'),
+                               Action ('gtk-update-icon-cache ' + desktop_icon_install_prefix),
+                               Action ('update-desktop-database ' + install_prefix + '/share/applications')])
+       env.Alias('uninstall', remove_desktop_files)
+
 #dist
 env.Alias ('tarball', env.Distribute (env['DISTTREE'],
                                       [ 'SConscript',
@@ -453,11 +542,16 @@ env.Alias ('tarball', env.Distribute (env['DISTTREE'],
                                        'ardour.sh.in',
                                        'ardev_common.sh.in',
                                        'ardev', 'ardbg',
-                                        'ardour2_ui_dark.rc', 'ardour2_ui_light.rc', 'splash.png',
-                                        'ardour.menus',
-                                        'ardour-sae.menus',
-                                       'ardour.bindings.in', 'ardour2_ui_default.conf',
-                                       'editor_xpms'
+                                        'ardour3_ui_dark.rc.in', 'ardour3_ui_light.rc.in', 'splash.png',
+                                        'ardour.menus', 'ardour-sae.menus', 
+                                       'mnemonic-us.bindings.in', 
+                                       'ergonomic-us.bindings.in', 
+                                       'SAE-us.bindings.in', 
+                                       'SAE-de.bindings.in', 
+                                       'ardour3_ui_default.conf',
+                                       'editor_xpms',
+                                       'ardour2.xml',
+                                       'ardour2.desktop.in'
                                         ] +
                                       gtkardour_files +
                                      vst_files +
@@ -468,6 +562,7 @@ env.Alias ('tarball', env.Distribute (env['DISTTREE'],
                                      gtkosx_files +
                                      x11_files +
                                      fft_analysis_files +
+                                     freesound_files +
                                      glob.glob('po/*.po') + glob.glob('*.h')))
 
 # generate a prototype full-featured ardour_ui.rc file