Fix Python whitespace (follow PEP8 guidelines, reformatted by Python Reindent)

git-svn-id: svn://localhost/ardour2/branches/3.0@9409 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 252 insertions, 253 deletions

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index b124a7f0bc..bde630e325 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -230,274 +230,273 @@ gtk2_ardour_sources = [
 ]
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.build_version_files(path_prefix+'version.h', path_prefix+'version.cc',
-        		'gtk2_ardour', MAJOR, MINOR, MICRO)
-        autowaf.configure(conf)
-        conf.check_tool('compiler_cxx')
-
-        if re.search ("linux", sys.platform) != None:
-        	autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA')
-        	#
-        	#	TODO: Insert a sanity check for on OS X
-        	#	to ensure that CoreAudio is present....
-        	#	Really shouldn't these checks be in AutoWaf?
-        	#
-        autowaf.check_pkg(conf, 'flac', uselib_store='FLAC', atleast_version='1.2.1')
-        autowaf.check_pkg(conf, 'gthread', uselib_store='GTHREAD', atleast_version='2.10.1')
-        autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK', atleast_version='2.18')
-        autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.18')
-        autowaf.check_pkg(conf, 'libgnomecanvasmm-2.6', uselib_store='GNOMECANVASMM', atleast_version='2.16')
-        autowaf.check_pkg(conf, 'ogg', uselib_store='OGG', atleast_version='1.1.2')
-
-        conf.check_tool('misc') # subst tool
-
-        conf.write_config_header('gtk2ardour-config.h')
-        
-        # Boost headers
-        autowaf.check_header(conf, 'boost/shared_ptr.hpp')
-        autowaf.check_header(conf, 'boost/weak_ptr.hpp')
+    autowaf.build_version_files(path_prefix+'version.h', path_prefix+'version.cc',
+                    'gtk2_ardour', MAJOR, MINOR, MICRO)
+    autowaf.configure(conf)
+    conf.check_tool('compiler_cxx')
+
+    if re.search ("linux", sys.platform) != None:
+        autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA')
+        #
+        #       TODO: Insert a sanity check for on OS X
+        #       to ensure that CoreAudio is present....
+        #       Really shouldn't these checks be in AutoWaf?
+        #
+    autowaf.check_pkg(conf, 'flac', uselib_store='FLAC', atleast_version='1.2.1')
+    autowaf.check_pkg(conf, 'gthread', uselib_store='GTHREAD', atleast_version='2.10.1')
+    autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK', atleast_version='2.18')
+    autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.18')
+    autowaf.check_pkg(conf, 'libgnomecanvasmm-2.6', uselib_store='GNOMECANVASMM', atleast_version='2.16')
+    autowaf.check_pkg(conf, 'ogg', uselib_store='OGG', atleast_version='1.1.2')
+
+    conf.check_tool('misc') # subst tool
+
+    conf.write_config_header('gtk2ardour-config.h')
+
+    # Boost headers
+    autowaf.check_header(conf, 'boost/shared_ptr.hpp')
+    autowaf.check_header(conf, 'boost/weak_ptr.hpp')
 
 # Add a waf `feature' to allow compilation of things using winegcc
 from TaskGen import feature
 @feature("wine")
 def set_winegcc(self):
-        self.env.LINK_CXX = self.env.LINK_CC = 'wineg++'
-        self.env.CC = 'winegcc'
+    self.env.LINK_CXX = self.env.LINK_CC = 'wineg++'
+    self.env.CC = 'winegcc'
 
 def build_color_scheme(path, prefix):
-        f = open (path, 'r')
-        color_scheme = ''
-        for line in f:
-                if re.search ('^#@color', line):
-                        line.strip() # remove newline
-                        words = line.split()
-                        if len(color_scheme):
-                                color_scheme += ';'
-                        color_scheme += prefix
-                        color_scheme += '_'
-                        color_scheme += words[1]
-                        color_scheme += ':'
-                        color_scheme += words[2]
-        f.close()
-        return color_scheme
-                        
+    f = open (path, 'r')
+    color_scheme = ''
+    for line in f:
+        if re.search ('^#@color', line):
+            line.strip() # remove newline
+            words = line.split()
+            if len(color_scheme):
+                color_scheme += ';'
+            color_scheme += prefix
+            color_scheme += '_'
+            color_scheme += words[1]
+            color_scheme += ':'
+            color_scheme += words[2]
+    f.close()
+    return color_scheme
+
 
 def build(bld):
-        # GTK front-end; if we're using VST we build this as a shared library, otherwise
-        # it's a normal executabale
-        if bld.env['VST_SUPPORT']:
-        	obj = bld.new_task_gen(features = 'cxx cc cshlib')
-        else:
-        	obj = bld.new_task_gen(features = 'cxx cc cprogram')
-
-        obj.includes     = ['.']
-        obj.source       = gtk2_ardour_sources
-        obj.name         = 'gtk2_ardour'
-        if bld.env['VST_SUPPORT']:
-        	obj.target = 'gtk2_ardour'
-        	obj.includes += ['../libs/fst']
-        else:
-        	obj.target = 'ardour-3.0'
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-        obj.uselib       = 'UUID FLAC GLIBMM GTHREAD GTK OGG ALSA CURL DL'
-        obj.uselib       += ' GTKMM GNOMECANVASMM '
-        obj.uselib       += ' AUDIOUNITS OSX GTKOSX '
-        obj.uselib_local = '''libpbd libmidipp libtaglib libardour libardour_cp
-                              libgtkmm2ext libtaglib libgnomecanvas-2'''
-        if sys.platform == 'darwin':
-                obj.uselib_local + ' libappleutility'
-        obj.cflags       = ['-DPACKAGE="gtk2_ardour"']
-        obj.cxxflags     = ['-DPACKAGE="gtk2_ardour"']
-        obj.cxxflags     += ['-DVERSIONSTRING="' + bld.env['VERSION'] + '"']
-        obj.cxxflags     += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"']
-        obj.cxxflags     += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"']
-        obj.cxxflags     += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"']
-        obj.cxxflags     += ['-DLOCALEDIR="' + os.path.join(
-        		os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
-        obj.cxxflags     += ['-DPROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"']
-        obj.cxxflags     += ['-I../libs']
-
-        if bld.env['HAVE_SLV2']:
-        	obj.source += [ 'lv2_plugin_ui.cc' ]
-        	obj.uselib += ' SLV2 '
-
-        if bld.env['FREESOUND']:
-        	obj.source +=  [ 'sfdb_freesound_mootcher.cc' ]
-
-        if bld.env['VST_SUPPORT']:
-        	obj.source += [ 'vst_pluginui.cc' ]
-        	obj.cxxflags += [ '-DVST_SUPPORT' ]
-
-        if bld.env['PHONE_HOME']:
-        	obj.cxxflags += [ '-DPHONE_HOME' ]
-
-        if bld.env['COREAUDIO']:
-        	TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc']
-        	obj.source += [ 'cocoacarbon.mm', 'au_pluginui.mm' ]
-        	obj.uselib_local += ' libappleutility '
-        else:
-        	obj.source += [ 'x11.cc' ]
-
-        if bld.env['VST_SUPPORT']:
-        	# If we require VST support we build a stub main() and the FST library here using
-        	# winegcc, and link it to the GTK front-end library
-        	obj = bld.new_task_gen (features = 'cxx cc cprogram wine')
-        	obj.source = '''
-        		../libs/fst/fst.c
-        		../libs/fst/fstinfofile.c
-        		../libs/fst/vsti.c
-        		../libs/fst/vstwin.c
-        		../vst/winmain.c
-        	'''
-        	obj.includes = '../libs/fst'
-        	obj.target = 'ardour-3.0-vst'
-        	obj.linkflags = ['-mwindows', '-Wl,--export-dynamic', '-lpthread']
-        	obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX']
-        	obj.uselib = 'ALSA'
-        	obj.uselib_local = '''libpbd libmidipp libtaglib libardour libardour_cp libgtkmm2ext libtaglib gtk2_ardour'''
-
-        # Wrappers
-
-        wrapper_subst_dict = {
-        	'INSTALL_PREFIX' : bld.env['PREFIX'],
-        	'LIBDIR'         : os.path.normpath(bld.env['LIBDIRNAME']),
-        	'LIBS'           : 'build/default/libs',
-        	'VERSION'        : '3.0',
-        	'EXECUTABLE'     : 'build/default/gtk2_ardour/ardour-3.0'
+    # GTK front-end; if we're using VST we build this as a shared library, otherwise
+    # it's a normal executabale
+    if bld.env['VST_SUPPORT']:
+        obj = bld.new_task_gen(features = 'cxx cc cshlib')
+    else:
+        obj = bld.new_task_gen(features = 'cxx cc cprogram')
+
+    obj.includes     = ['.']
+    obj.source       = gtk2_ardour_sources
+    obj.name         = 'gtk2_ardour'
+    if bld.env['VST_SUPPORT']:
+        obj.target = 'gtk2_ardour'
+        obj.includes += ['../libs/fst']
+    else:
+        obj.target = 'ardour-3.0'
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    obj.uselib       = 'UUID FLAC GLIBMM GTHREAD GTK OGG ALSA CURL DL'
+    obj.uselib       += ' GTKMM GNOMECANVASMM '
+    obj.uselib       += ' AUDIOUNITS OSX GTKOSX '
+    obj.uselib_local = '''libpbd libmidipp libtaglib libardour libardour_cp
+                          libgtkmm2ext libtaglib libgnomecanvas-2'''
+    if sys.platform == 'darwin':
+        obj.uselib_local + ' libappleutility'
+    obj.cflags       = ['-DPACKAGE="gtk2_ardour"']
+    obj.cxxflags     = ['-DPACKAGE="gtk2_ardour"']
+    obj.cxxflags     += ['-DVERSIONSTRING="' + bld.env['VERSION'] + '"']
+    obj.cxxflags     += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"']
+    obj.cxxflags     += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"']
+    obj.cxxflags     += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"']
+    obj.cxxflags     += ['-DLOCALEDIR="' + os.path.join(
+                    os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
+    obj.cxxflags     += ['-DPROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"']
+    obj.cxxflags     += ['-I../libs']
+
+    if bld.env['HAVE_SLV2']:
+        obj.source += [ 'lv2_plugin_ui.cc' ]
+        obj.uselib += ' SLV2 '
+
+    if bld.env['FREESOUND']:
+        obj.source +=  [ 'sfdb_freesound_mootcher.cc' ]
+
+    if bld.env['VST_SUPPORT']:
+        obj.source += [ 'vst_pluginui.cc' ]
+        obj.cxxflags += [ '-DVST_SUPPORT' ]
+
+    if bld.env['PHONE_HOME']:
+        obj.cxxflags += [ '-DPHONE_HOME' ]
+
+    if bld.env['COREAUDIO']:
+        TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc']
+        obj.source += [ 'cocoacarbon.mm', 'au_pluginui.mm' ]
+        obj.uselib_local += ' libappleutility '
+    else:
+        obj.source += [ 'x11.cc' ]
+
+    if bld.env['VST_SUPPORT']:
+        # If we require VST support we build a stub main() and the FST library here using
+        # winegcc, and link it to the GTK front-end library
+        obj = bld.new_task_gen (features = 'cxx cc cprogram wine')
+        obj.source = '''
+                ../libs/fst/fst.c
+                ../libs/fst/fstinfofile.c
+                ../libs/fst/vsti.c
+                ../libs/fst/vstwin.c
+                ../vst/winmain.c
+        '''
+        obj.includes = '../libs/fst'
+        obj.target = 'ardour-3.0-vst'
+        obj.linkflags = ['-mwindows', '-Wl,--export-dynamic', '-lpthread']
+        obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX']
+        obj.uselib = 'ALSA'
+        obj.uselib_local = '''libpbd libmidipp libtaglib libardour libardour_cp libgtkmm2ext libtaglib gtk2_ardour'''
+
+    # Wrappers
+
+    wrapper_subst_dict = {
+            'INSTALL_PREFIX' : bld.env['PREFIX'],
+            'LIBDIR'         : os.path.normpath(bld.env['LIBDIRNAME']),
+            'LIBS'           : 'build/default/libs',
+            'VERSION'        : '3.0',
+            'EXECUTABLE'     : 'build/default/gtk2_ardour/ardour-3.0'
+    }
+
+    obj              = bld.new_task_gen('subst')
+    obj.source       = 'ardev_common.sh.in'
+    obj.target       = 'ardev_common_waf.sh'
+    obj.chmod        = 0755
+    obj.dict         = wrapper_subst_dict
+
+    obj              = bld.new_task_gen('subst')
+    obj.source       = 'ardour.sh.in'
+    obj.target       = 'ardour3'
+    obj.chmod        = 0755
+    obj.dict         = wrapper_subst_dict
+    obj.install_path = bld.env['BINDIR']
+
+    # Font configuration
+
+    dark_rc_subst_dict = {}
+    light_rc_subst_dict = {}
+    font_sizes      = {}
+    base_font       = ""
+
+    # Set up font sizes
+    if bld.env['IS_OSX']: # OS X fonts
+        basefont = "Lucida Grande"
+        font_sizes = {
+                'TINY' : '7',
+                'SMALLER' : '9',
+                'SMALL' : '10',
+                'NORMAL' : '11',
+                'BIG' : '12',
+                'BIGGER' : '14',
+                'LARGE' : '18',
+                'LARGER' : '28',
+                'HUGER' : '36',
+                'MASSIVE' : '60'
+        }
+    else: # Linux/X11 fonts
+        basefont = '' # unspecified - use system defaults
+        font_sizes = {
+                'TINY' : '6',
+                'SMALLER' : '8',
+                'SMALL' : '9',
+                'NORMAL' : '10',
+                'BIG' : '14',
+                'BIGGER' : '16',
+                'LARGE' : '18',
+                'LARGER' : '24',
+                'HUGER' : '34',
+                'MASSIVE' : '60'
         }
 
-        obj              = bld.new_task_gen('subst')
-        obj.source       = 'ardev_common.sh.in'
-        obj.target       = 'ardev_common_waf.sh'
-        obj.chmod        = 0755
-        obj.dict         = wrapper_subst_dict
-
-        obj              = bld.new_task_gen('subst')
-        obj.source       = 'ardour.sh.in'
-        obj.target       = 'ardour3'
-        obj.chmod        = 0755
-        obj.dict         = wrapper_subst_dict
-        obj.install_path = bld.env['BINDIR']
-
-        # Font configuration
-
-        dark_rc_subst_dict = {}
-        light_rc_subst_dict = {}
-        font_sizes      = {}
-        base_font       = ""
-
-        # Set up font sizes
-        if bld.env['IS_OSX']: # OS X fonts
-        	basefont = "Lucida Grande"
-        	font_sizes = {
-        		'TINY' : '7',
-        		'SMALLER' : '9',
-        		'SMALL' : '10',
-        		'NORMAL' : '11',
-        		'BIG' : '12',
-        		'BIGGER' : '14',
-        		'LARGE' : '18',
-        		'LARGER' : '28',
-        		'HUGER' : '36',
-        		'MASSIVE' : '60'
-        	}
-        else: # Linux/X11 fonts
-        	basefont = '' # unspecified - use system defaults
-        	font_sizes = {
-        		'TINY' : '6',
-        		'SMALLER' : '8',
-        		'SMALL' : '9',
-        		'NORMAL' : '10',
-        		'BIG' : '14',
-        		'BIGGER' : '16',
-        		'LARGE' : '18',
-        		'LARGER' : '24',
-        		'HUGER' : '34',
-        		'MASSIVE' : '60'
-        	}
-
-         # Set up font substitution dictionary
-        for style in ['', 'BOLD', 'ITALIC']:
-        	for sizename,points in iter(font_sizes.items()):
-        		if (len (style)):
-        			key = "_".join (['FONT',style,sizename])
-        			fontstyle = " ".join ([basefont,style.lower(),points])
-        		else:
-        			key = "_".join (['FONT',sizename])
-        			fontstyle = " ".join ([basefont,points])
-        			
-        		dark_rc_subst_dict[key] = fontstyle
-        		light_rc_subst_dict[key] = fontstyle
-
-        # RC files
-        dark_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme ('gtk2_ardour/ardour3_ui_dark.rc.in', 'ARDOUR_DARK')
-        dark_rc_subst_dict['COLPREFIX'] = 'ARDOUR_DARK'
-        light_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme ('gtk2_ardour/ardour3_ui_light.rc.in', 'ARDOUR_LIGHT')
-        light_rc_subst_dict['COLPREFIX'] = 'ARDOUR_LIGHT'
-
-        obj              = bld.new_task_gen('subst')
-        obj.source       = 'ardour3_ui_dark.rc.in'
-        obj.target       = 'ardour3_ui_dark.rc'
-        obj.dict         = dark_rc_subst_dict
+ # Set up font substitution dictionary
+    for style in ['', 'BOLD', 'ITALIC']:
+        for sizename,points in iter(font_sizes.items()):
+            if (len (style)):
+                key = "_".join (['FONT',style,sizename])
+                fontstyle = " ".join ([basefont,style.lower(),points])
+            else:
+                key = "_".join (['FONT',sizename])
+                fontstyle = " ".join ([basefont,points])
+
+            dark_rc_subst_dict[key] = fontstyle
+            light_rc_subst_dict[key] = fontstyle
+
+    # RC files
+    dark_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme ('gtk2_ardour/ardour3_ui_dark.rc.in', 'ARDOUR_DARK')
+    dark_rc_subst_dict['COLPREFIX'] = 'ARDOUR_DARK'
+    light_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme ('gtk2_ardour/ardour3_ui_light.rc.in', 'ARDOUR_LIGHT')
+    light_rc_subst_dict['COLPREFIX'] = 'ARDOUR_LIGHT'
+
+    obj              = bld.new_task_gen('subst')
+    obj.source       = 'ardour3_ui_dark.rc.in'
+    obj.target       = 'ardour3_ui_dark.rc'
+    obj.dict         = dark_rc_subst_dict
+    obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
+
+    obj              = bld.new_task_gen('subst')
+    obj.source       = 'ardour3_ui_light.rc.in'
+    obj.target       = 'ardour3_ui_light.rc'
+    obj.dict         = light_rc_subst_dict
+    obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
+
+    # Menus
+    menus_argv = []
+    if bld.env['GTKOSX']:
+        menus_argv = [ '-E', '-P', '-DGTKOSX' ]
+    else:
+        menus_argv = [ '-E', '-P' ]
+    obj = bld.new_task_gen('command-output')
+    obj.command = 'cpp'
+    obj.command_is_external = True
+    obj.no_inputs = True
+    obj.argv = menus_argv
+    obj.stdin = 'ardour.menus.in'
+    obj.stdout = 'ardour.menus'
+    bld.install_files(os.path.join(bld.env['CONFIGDIR'], 'ardour3'), 'ardour.menus')
+
+    # Keybindings
+
+    # 'SAE-de-keypad', 'SAE-de-nokeypad', 'SAE-us-keypad', 'SAE-us-nokeypad', 'ergonomic-us'
+
+    for b in [ 'mnemonic-us' ] :
+        obj = bld.new_task_gen (
+                target = b + '.bindings',
+                source = b + '.bindings.in',
+                rule = '../tools/fmt-bindings --winkey="%s" --accelmap <${SRC} >${TGT}' % bld.env['WINDOWS_KEY']
+                )
         obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
 
-        obj              = bld.new_task_gen('subst')
-        obj.source       = 'ardour3_ui_light.rc.in'
-        obj.target       = 'ardour3_ui_light.rc'
-        obj.dict         = light_rc_subst_dict
-        obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
+    # not modified at present
+    bld.install_files(os.path.join(bld.env['CONFIGDIR'], 'ardour3'), 'step_editing.bindings')
 
-        # Menus
-        menus_argv = []
-        if bld.env['GTKOSX']:
-        	menus_argv = [ '-E', '-P', '-DGTKOSX' ]
-        else:
-        	menus_argv = [ '-E', '-P' ]
-        obj = bld.new_task_gen('command-output')
-        obj.command = 'cpp'
-        obj.command_is_external = True
-        obj.no_inputs = True
-        obj.argv = menus_argv
-        obj.stdin = 'ardour.menus.in'
-        obj.stdout = 'ardour.menus'
-        bld.install_files(os.path.join(bld.env['CONFIGDIR'], 'ardour3'), 'ardour.menus')
-
-        # Keybindings
-
-        # 'SAE-de-keypad', 'SAE-de-nokeypad', 'SAE-us-keypad', 'SAE-us-nokeypad', 'ergonomic-us'
-
-        for b in [ 'mnemonic-us' ] :
-        	obj = bld.new_task_gen (
-        		target = b + '.bindings',
-        		source = b + '.bindings.in',
-        		rule = '../tools/fmt-bindings --winkey="%s" --accelmap <${SRC} >${TGT}' % bld.env['WINDOWS_KEY']
-        		)
-        	obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
-
-        # not modified at present
-        bld.install_files(os.path.join(bld.env['CONFIGDIR'], 'ardour3'), 'step_editing.bindings')
-
-        # Icons/Images
-        bld.install_files('${DATADIR}/ardour3/icons', 'icons/*.png')
-        bld.install_files('${DATADIR}/ardour3/pixmaps', 'pixmaps/*.xpm')
-        bld.install_files('${DATADIR}/ardour3', 'splash.png')
-
-        # Default UI configuration
-        bld.install_files('${CONFIGDIR}/ardour3', 'ardour3_ui_default.conf')
-        
-        # Default export stuff
-        bld.install_files('${CONFIGDIR}/ardour3/export', 'export/*.format')
-
-        # i18n
-        if bld.env['ENABLE_NLS']:
-        	mo_files = glob.glob (os.path.join (bld.get_curdir(), 'po/*.mo'))
-        	for mo in mo_files:
-        		lang = os.path.basename (mo).replace ('.mo', '')
-        		bld.install_as (os.path.join (bld.env['PREFIX'], 'share', 'locale', lang, 'LC_MESSAGES', APPNAME + '.mo'), mo)
+    # Icons/Images
+    bld.install_files('${DATADIR}/ardour3/icons', 'icons/*.png')
+    bld.install_files('${DATADIR}/ardour3/pixmaps', 'pixmaps/*.xpm')
+    bld.install_files('${DATADIR}/ardour3', 'splash.png')
 
-def i18n(bld):
-        autowaf.build_i18n (bld, srcdir, 'gtk2_ardour', APPNAME, gtk2_ardour_sources)
+    # Default UI configuration
+    bld.install_files('${CONFIGDIR}/ardour3', 'ardour3_ui_default.conf')
 
+    # Default export stuff
+    bld.install_files('${CONFIGDIR}/ardour3/export', 'export/*.format')
+
+    # i18n
+    if bld.env['ENABLE_NLS']:
+        mo_files = glob.glob (os.path.join (bld.get_curdir(), 'po/*.mo'))
+        for mo in mo_files:
+            lang = os.path.basename (mo).replace ('.mo', '')
+            bld.install_as (os.path.join (bld.env['PREFIX'], 'share', 'locale', lang, 'LC_MESSAGES', APPNAME + '.mo'), mo)
+
+def i18n(bld):
+    autowaf.build_i18n (bld, srcdir, 'gtk2_ardour', APPNAME, gtk2_ardour_sources)