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

28 files changed, 971 insertions, 996 deletions

diff --git a/libs/appleutility/wscript b/libs/appleutility/wscript
index 2d164a025a..50e7e0200f 100644
--- a/libs/appleutility/wscript
+++ b/libs/appleutility/wscript
@@ -21,24 +21,24 @@ libappleutility_sources = [
 ]
 
 def set_options(opt):
-        autowaf.set_options(opt)
-        
+    autowaf.set_options(opt)
+
 def configure(conf):
-        autowaf.configure(conf)
-        
+    autowaf.configure(conf)
+
 def build(bld):
-        obj                = bld.new_task_gen('cxx', 'shlib')
-        obj.uselib         = 'AUDIOUNITS OSX'
-        obj.source         = libappleutility_sources
-        obj.export_incdirs = ['.']
-        obj.includes       = ['.']
-        obj.name           = 'libappleutility'
-        obj.target         = 'appleutility'
-        obj.install_path   = os.path.join(bld.env['LIBDIR'], 'appleutility')
+    obj                = bld.new_task_gen('cxx', 'shlib')
+    obj.uselib         = 'AUDIOUNITS OSX'
+    obj.source         = libappleutility_sources
+    obj.export_incdirs = ['.']
+    obj.includes       = ['.']
+    obj.name           = 'libappleutility'
+    obj.target         = 'appleutility'
+    obj.install_path   = os.path.join(bld.env['LIBDIR'], 'appleutility')
 
 
 def shutdown():
-        autowaf.shutdown()
+    autowaf.shutdown()
 
 def i18n(bld):
-        pass
+    pass
diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 10aae55915..f2729d4594 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -215,182 +215,182 @@ libardour_sources = [
 ]
 
 def flac_supported():
-        cmd = subprocess.Popen ("sndfile-info testfile.flac", 
-        			stdout = subprocess.PIPE,
-        			stderr = subprocess.STDOUT, shell = True)
-        out = cmd.communicate()[0].decode('utf-8');
-        return re.search ('unknown format', out) == None
+    cmd = subprocess.Popen ("sndfile-info testfile.flac",
+                            stdout = subprocess.PIPE,
+                            stderr = subprocess.STDOUT, shell = True)
+    out = cmd.communicate()[0].decode('utf-8');
+    return re.search ('unknown format', out) == None
 
 def ogg_supported():
-        cmd = subprocess.Popen ("sndfile-info testfile.ogg", 
-        			stdout = subprocess.PIPE,
-        			stderr = subprocess.STDOUT, shell = True)
-        out = cmd.communicate()[0].decode('utf-8');
-        return re.search ('unknown format', out) == None
+    cmd = subprocess.Popen ("sndfile-info testfile.ogg",
+                            stdout = subprocess.PIPE,
+                            stderr = subprocess.STDOUT, shell = True)
+    out = cmd.communicate()[0].decode('utf-8');
+    return re.search ('unknown format', out) == None
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.build_version_files(path_prefix+'ardour/version.h', path_prefix+'version.cc',
-        		'libardour3', MAJOR, MINOR, MICRO)
-        autowaf.configure(conf)
-        conf.check_tool('compiler_cxx gas')
-        autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', atleast_version='0.3.2')
-        autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.118.2')
-        autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
-        autowaf.check_pkg(conf, 'lrdf', uselib_store='LRDF', atleast_version='0.4.0')
-        autowaf.check_pkg(conf, 'samplerate', uselib_store='SAMPLERATE', atleast_version='0.1.0')
-        autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')
-        autowaf.check_pkg(conf, 'slv2', uselib_store='SLV2', atleast_version='0.6.4', mandatory=False)
-        autowaf.check_pkg(conf, 'slv2', uselib_store='NEW_SLV2', atleast_version='0.7.0', mandatory=False)
-        autowaf.check_pkg(conf, 'suil', uselib_store='SUIL', atleast_version='0.1.0', mandatory=False)
-        autowaf.check_pkg(conf, 'rasqal', uselib_store='RASQAL', atleast_version='0.9.14', mandatory=False)
-        autowaf.check_pkg(conf, 'soundtouch-1.0', uselib_store='SOUNDTOUCH', mandatory=False)
-        autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False)
-        autowaf.check_pkg(conf, 'ogg', uselib_store='OGG', atleast_version='1.1.2')
-        autowaf.check_pkg(conf, 'flac', uselib_store='FLAC', atleast_version='1.2.1')
-        autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL', atleast_version='7.0.0')
-
-        # we don't try to detect this, since its part of our source tree
-
-        conf.define('HAVE_RUBBERBAND', 1) # controls whether we think we have it
-        conf.define('USE_RUBBERBAND', 1)  # controls whether we actually use it
-
-        conf.define('CURRENT_SESSION_FILE_VERSION', CURRENT_SESSION_FILE_VERSION)
-
-        conf.check(header_name='sys/vfs.h', define_name='HAVE_SYS_VFS_H')
-        conf.check(header_name='wordexp.h', define_name='HAVE_WORDEXP')
-
-        conf.check(header_name='jack/session.h', uselib = [ 'JACK' ], define_name='HAVE_JACK_SESSION')
-
-        conf.check(header_name='unistd.h', define_name='HAVE_UNISTD')
-        
-        conf.check_cc(fragment = "#include <jack/jack.h>\nvoid callback (int code, const char* reason, void* arg) { return; }\nint main(int argc, char **argv) { jack_client_t* c; jack_on_info_shutdown (c, callback, (void*) 0); return 0; }\n",
-                      uselib= [ 'JACK' ],
-        	      msg = 'Checking for jack_on_info_shutdown',
-                      define_name = 'HAVE_JACK_ON_INFO_SHUTDOWN',
-        	      okmsg = 'present')
-
-        missing_jack_message = 'missing - a version of JACK that supports jack_port_set_latency_range() is required to compile Ardour3\nCurrently this means using JACK version 0.120.1 from http://www.jackaudio.org/download\n'
-
-        conf.check_cc(fragment = "#include <jack/jack.h>\nint main(int argc, char **argv) { jack_port_t* p; jack_latency_range_t r; jack_port_set_latency_range (p, JackCaptureLatency, &r); return 0; }\n",
-                      uselib = [ 'JACK' ],
-        	      msg = 'Checking for new JACK latency API',
-        	      okmsg = 'present',
-                      mandatory = True,
-                      errmsg = missing_jack_message)
-
-        conf.check_cc(fragment = '#include <jack/jack.h>\nint main(int argc, char **argv) { jack_port_type_get_buffer_size ((jack_client_t*)0, ""); }\n',
-                      uselib = [ 'JACK' ],
-        	      msg = 'Checking for new jack_port_type_get_buffer_size',
-                      okmsg = 'present',
-                      mandatory = True,
-        	      errmsg = missing_jack_message)
-        
-        if flac_supported():
-        	conf.define ('HAVE_FLAC', 1)
-        if ogg_supported():
-        	conf.define ('HAVE_OGG', 1)
-
-        conf.write_config_header('libardour-config.h')
-
-        # Boost headers
-        autowaf.check_header(conf, 'boost/shared_ptr.hpp')
-        autowaf.check_header(conf, 'boost/weak_ptr.hpp')
-        autowaf.check_header(conf, 'boost/scoped_ptr.hpp')
-        autowaf.check_header(conf, 'boost/ptr_container/ptr_list.hpp')
+    autowaf.build_version_files(path_prefix+'ardour/version.h', path_prefix+'version.cc',
+                    'libardour3', MAJOR, MINOR, MICRO)
+    autowaf.configure(conf)
+    conf.check_tool('compiler_cxx gas')
+    autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', atleast_version='0.3.2')
+    autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.118.2')
+    autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
+    autowaf.check_pkg(conf, 'lrdf', uselib_store='LRDF', atleast_version='0.4.0')
+    autowaf.check_pkg(conf, 'samplerate', uselib_store='SAMPLERATE', atleast_version='0.1.0')
+    autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')
+    autowaf.check_pkg(conf, 'slv2', uselib_store='SLV2', atleast_version='0.6.4', mandatory=False)
+    autowaf.check_pkg(conf, 'slv2', uselib_store='NEW_SLV2', atleast_version='0.7.0', mandatory=False)
+    autowaf.check_pkg(conf, 'suil', uselib_store='SUIL', atleast_version='0.1.0', mandatory=False)
+    autowaf.check_pkg(conf, 'rasqal', uselib_store='RASQAL', atleast_version='0.9.14', mandatory=False)
+    autowaf.check_pkg(conf, 'soundtouch-1.0', uselib_store='SOUNDTOUCH', mandatory=False)
+    autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False)
+    autowaf.check_pkg(conf, 'ogg', uselib_store='OGG', atleast_version='1.1.2')
+    autowaf.check_pkg(conf, 'flac', uselib_store='FLAC', atleast_version='1.2.1')
+    autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL', atleast_version='7.0.0')
+
+    # we don't try to detect this, since its part of our source tree
+
+    conf.define('HAVE_RUBBERBAND', 1) # controls whether we think we have it
+    conf.define('USE_RUBBERBAND', 1)  # controls whether we actually use it
+
+    conf.define('CURRENT_SESSION_FILE_VERSION', CURRENT_SESSION_FILE_VERSION)
+
+    conf.check(header_name='sys/vfs.h', define_name='HAVE_SYS_VFS_H')
+    conf.check(header_name='wordexp.h', define_name='HAVE_WORDEXP')
+
+    conf.check(header_name='jack/session.h', uselib = [ 'JACK' ], define_name='HAVE_JACK_SESSION')
+
+    conf.check(header_name='unistd.h', define_name='HAVE_UNISTD')
+
+    conf.check_cc(fragment = "#include <jack/jack.h>\nvoid callback (int code, const char* reason, void* arg) { return; }\nint main(int argc, char **argv) { jack_client_t* c; jack_on_info_shutdown (c, callback, (void*) 0); return 0; }\n",
+                  uselib= [ 'JACK' ],
+                  msg = 'Checking for jack_on_info_shutdown',
+                  define_name = 'HAVE_JACK_ON_INFO_SHUTDOWN',
+                  okmsg = 'present')
+
+    missing_jack_message = 'missing - a version of JACK that supports jack_port_set_latency_range() is required to compile Ardour3\nCurrently this means using JACK version 0.120.1 from http://www.jackaudio.org/download\n'
+
+    conf.check_cc(fragment = "#include <jack/jack.h>\nint main(int argc, char **argv) { jack_port_t* p; jack_latency_range_t r; jack_port_set_latency_range (p, JackCaptureLatency, &r); return 0; }\n",
+                  uselib = [ 'JACK' ],
+                  msg = 'Checking for new JACK latency API',
+                  okmsg = 'present',
+                  mandatory = True,
+                  errmsg = missing_jack_message)
+
+    conf.check_cc(fragment = '#include <jack/jack.h>\nint main(int argc, char **argv) { jack_port_type_get_buffer_size ((jack_client_t*)0, ""); }\n',
+                  uselib = [ 'JACK' ],
+                  msg = 'Checking for new jack_port_type_get_buffer_size',
+                  okmsg = 'present',
+                  mandatory = True,
+                  errmsg = missing_jack_message)
+
+    if flac_supported():
+        conf.define ('HAVE_FLAC', 1)
+    if ogg_supported():
+        conf.define ('HAVE_OGG', 1)
+
+    conf.write_config_header('libardour-config.h')
+
+    # Boost headers
+    autowaf.check_header(conf, 'boost/shared_ptr.hpp')
+    autowaf.check_header(conf, 'boost/weak_ptr.hpp')
+    autowaf.check_header(conf, 'boost/scoped_ptr.hpp')
+    autowaf.check_header(conf, 'boost/ptr_container/ptr_list.hpp')
 
 
 def build(bld):
-        # Library
-        obj              = bld.new_task_gen('cxx', 'shlib')
-        obj.source       = libardour_sources
-        obj.export_incdirs = ['.']
-        obj.includes     = ['.', '../surfaces/control_protocol', '..']
-        obj.name         = 'libardour'
-        obj.target       = 'ardour'
-        obj.uselib       = 'GLIBMM GTHREAD AUBIO SIGCPP XML UUID JACK SNDFILE SAMPLERATE LRDF AUDIOUNIT OSX BOOST CURL DL'
-        obj.uselib_local = 'libpbd libmidipp libevoral libvamphost libvampplugin libtaglib librubberband libaudiographer'
-        obj.vnum         = LIBARDOUR_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-        obj.cxxflags     = ['-DPACKAGE="libardour3"']
-        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     += ['-DVAMP_DIR="' + os.path.join(
-        		os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"']
-        obj.cxxflags     += ['-DPROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"']
-
-        #obj.source += ' st_stretch.cc st_pitch.cc '
-        #obj.uselib += ' SOUNDTOUCH '
-        #obj.add_objects = 'default/libs/surfaces/control_protocol/smpte_1.o'
-        
-        if bld.env['HAVE_SLV2']:
-        	obj.source += [ 'lv2_plugin.cc', 'lv2_event_buffer.cc', 'uri_map.cc', 'rdff.c' ]
-        	obj.uselib += ' SLV2 ' + ' RASQAL '
-        	if bld.env['HAVE_SUIL']:
-        		obj.uselib += ' SUIL '
-        	
-        if bld.env['VST_SUPPORT']:
-        	obj.source += [ 'vst_plugin.cc', 'session_vst.cc' ]
-        	obj.includes += [ '../fst' ]
-        	obj.cxxflags += [ '-DVST_SUPPORT' ]
-
-        if bld.env['COREAUDIO']:
-        	obj.source += [ 'coreaudiosource.cc', 'caimportable.cc' ]
-        	obj.uselib_local += ' libappleutility'	
-        	obj.source += [ 'audio_unit.cc' ]
+    # Library
+    obj              = bld.new_task_gen('cxx', 'shlib')
+    obj.source       = libardour_sources
+    obj.export_incdirs = ['.']
+    obj.includes     = ['.', '../surfaces/control_protocol', '..']
+    obj.name         = 'libardour'
+    obj.target       = 'ardour'
+    obj.uselib       = 'GLIBMM GTHREAD AUBIO SIGCPP XML UUID JACK SNDFILE SAMPLERATE LRDF AUDIOUNIT OSX BOOST CURL DL'
+    obj.uselib_local = 'libpbd libmidipp libevoral libvamphost libvampplugin libtaglib librubberband libaudiographer'
+    obj.vnum         = LIBARDOUR_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    obj.cxxflags     = ['-DPACKAGE="libardour3"']
+    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     += ['-DVAMP_DIR="' + os.path.join(
+                    os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"']
+    obj.cxxflags     += ['-DPROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"']
+
+    #obj.source += ' st_stretch.cc st_pitch.cc '
+    #obj.uselib += ' SOUNDTOUCH '
+    #obj.add_objects = 'default/libs/surfaces/control_protocol/smpte_1.o'
+
+    if bld.env['HAVE_SLV2']:
+        obj.source += [ 'lv2_plugin.cc', 'lv2_event_buffer.cc', 'uri_map.cc', 'rdff.c' ]
+        obj.uselib += ' SLV2 ' + ' RASQAL '
+        if bld.env['HAVE_SUIL']:
+            obj.uselib += ' SUIL '
+
+    if bld.env['VST_SUPPORT']:
+        obj.source += [ 'vst_plugin.cc', 'session_vst.cc' ]
+        obj.includes += [ '../fst' ]
+        obj.cxxflags += [ '-DVST_SUPPORT' ]
+
+    if bld.env['COREAUDIO']:
+        obj.source += [ 'coreaudiosource.cc', 'caimportable.cc' ]
+        obj.uselib_local += ' libappleutility'
+        obj.source += [ 'audio_unit.cc' ]
+
+    if bld.env['FPU_OPTIMIZATION']:
+        if bld.env['build_target'] == 'i386' or bld.env['build_target'] == 'i686':
+            obj.source += [ 'sse_functions_xmm.cc', 'sse_functions.s' ]
+        elif bld.env['build_target'] == 'x86_64':
+            obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit.s' ]
+
+    # 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)
 
+    if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:
+        # Unit tests
+        testobj              = bld.new_task_gen('cxx', 'program')
+        testobj.source       = '''
+                test/bbt_test.cpp
+                test/interpolation_test.cpp
+                test/midi_clock_slave_test.cpp
+                test/resampled_source.cc
+                test/mantis_3356.cc
+                test/testrunner.cpp
+        '''.split()
+        testobj.includes     = obj.includes + ['test', '../pbd']
+        testobj.uselib       = 'CPPUNIT SIGCPP JACK GLIBMM GTHREAD SAMPLERATE XML LRDF COREAUDIO'
+        testobj.uselib_local = 'libpbd libmidipp libardour'
+        testobj.name         = 'libardour-tests'
+        testobj.target       = 'run-tests'
+        testobj.install_path = ''
+        testobj.cxxflags     = ['-DPACKAGE="libardour3test"']
+        testobj.cxxflags     += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"']
+        testobj.cxxflags     += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"']
+        testobj.cxxflags     += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"']
+        testobj.cxxflags     += ['-DLOCALEDIR="' + os.path.join(
+                        os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
+        testobj.cxxflags     += ['-DVAMP_DIR="' + os.path.join(
+                        os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"']
         if bld.env['FPU_OPTIMIZATION']:
-        	if bld.env['build_target'] == 'i386' or bld.env['build_target'] == 'i686':
-                        obj.source += [ 'sse_functions_xmm.cc', 'sse_functions.s' ]
-        	elif bld.env['build_target'] == 'x86_64':
-                        obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit.s' ]
-
-        # 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)
-
-        if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:
-        	# Unit tests
-        	testobj              = bld.new_task_gen('cxx', 'program')
-        	testobj.source       = '''
-        		test/bbt_test.cpp
-        		test/interpolation_test.cpp
-        		test/midi_clock_slave_test.cpp
-        		test/resampled_source.cc
-        		test/mantis_3356.cc
-        		test/testrunner.cpp
-        	'''.split()
-        	testobj.includes     = obj.includes + ['test', '../pbd']
-        	testobj.uselib       = 'CPPUNIT SIGCPP JACK GLIBMM GTHREAD SAMPLERATE XML LRDF COREAUDIO'
-        	testobj.uselib_local = 'libpbd libmidipp libardour'
-        	testobj.name         = 'libardour-tests'
-        	testobj.target       = 'run-tests'
-        	testobj.install_path = ''
-        	testobj.cxxflags     = ['-DPACKAGE="libardour3test"']
-        	testobj.cxxflags     += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"']
-        	testobj.cxxflags     += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"']
-        	testobj.cxxflags     += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"']
-        	testobj.cxxflags     += ['-DLOCALEDIR="' + os.path.join(
-        			os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
-        	testobj.cxxflags     += ['-DVAMP_DIR="' + os.path.join(
-        			os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"']
-        	if bld.env['FPU_OPTIMIZATION']:
-        		testobj.source += [ 'sse_functions_xmm.cc' ]
-        		if bld.env['build_target'] == 'i386' or bld.env['build_target'] == 'i686':
-        			testobj.source += [ 'sse_functions.s' ]
-        		elif bld.env['build_target'] == 'x86_64':
-        			testobj.source += [ 'sse_functions_64bit.s' ]
+            testobj.source += [ 'sse_functions_xmm.cc' ]
+            if bld.env['build_target'] == 'i386' or bld.env['build_target'] == 'i686':
+                testobj.source += [ 'sse_functions.s' ]
+            elif bld.env['build_target'] == 'x86_64':
+                testobj.source += [ 'sse_functions_64bit.s' ]
 
 def shutdown():
-        autowaf.shutdown()
+    autowaf.shutdown()
 
 def i18n(bld):
-        autowaf.build_i18n (bld, '..', 'libs/ardour', APPNAME, libardour_sources)
+    autowaf.build_i18n (bld, '..', 'libs/ardour', APPNAME, libardour_sources)
diff --git a/libs/audiographer/wscript b/libs/audiographer/wscript
index 856f8be119..31103b3095 100644
--- a/libs/audiographer/wscript
+++ b/libs/audiographer/wscript
@@ -23,97 +23,96 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
-        
-        conf.check_tool('compiler_cxx')
-        
-        autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False)
-        autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0', mandatory=False)
-        autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.2', mandatory=False)
-        autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.14.0', mandatory=False)
-        autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', atleast_version='2.14.0', mandatory=False)
-        autowaf.check_pkg(conf, 'samplerate', uselib_store='SAMPLERATE', atleast_version='0.1.7', mandatory=False)
-        autowaf.check_pkg(conf, 'sndfile', uselib_store='SNDFILE', atleast_version='1.0.18', mandatory=False)
-        
-        # Boost headers
-        autowaf.check_header(conf, 'boost/shared_ptr.hpp')
-        autowaf.check_header(conf, 'boost/format.hpp')
+    autowaf.configure(conf)
+
+    conf.check_tool('compiler_cxx')
+
+    autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False)
+    autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0', mandatory=False)
+    autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.2', mandatory=False)
+    autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.14.0', mandatory=False)
+    autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', atleast_version='2.14.0', mandatory=False)
+    autowaf.check_pkg(conf, 'samplerate', uselib_store='SAMPLERATE', atleast_version='0.1.7', mandatory=False)
+    autowaf.check_pkg(conf, 'sndfile', uselib_store='SNDFILE', atleast_version='1.0.18', mandatory=False)
+
+    # Boost headers
+    autowaf.check_header(conf, 'boost/shared_ptr.hpp')
+    autowaf.check_header(conf, 'boost/format.hpp')
 
 def build(bld):
 
-        # Headers
-        #bld.install_files('${INCLUDEDIR}/audiographer', 'audiographer/*.h')
-        #bld.install_files('${INCLUDEDIR}/audiographer/general', 'audiographer/general/*.h')
-        #bld.install_files('${INCLUDEDIR}/audiographer/sndfile', 'audiographer/sndfile/*.h')
-        #bld.install_files('${INCLUDEDIR}/audiographer/utils', 'audiographer/utils/*.h')
-        
-        #bld.env['BUILD_TESTS'] = True
-        bld.env['HAVE_ALL_GTHREAD'] = bld.env['HAVE_GLIB'] and bld.env['HAVE_GLIBMM'] and bld.env['HAVE_GTHREAD']
-
-        audiographer = bld.new_task_gen('cxx', 'shlib')
-        audiographer.source = '''
-        	private/gdither/gdither.cc
-        	src/general/sample_format_converter.cc
-        	src/routines.cc
-        	src/debug_utils.cc
-        	src/general/broadcast_info.cc
+    # Headers
+    #bld.install_files('${INCLUDEDIR}/audiographer', 'audiographer/*.h')
+    #bld.install_files('${INCLUDEDIR}/audiographer/general', 'audiographer/general/*.h')
+    #bld.install_files('${INCLUDEDIR}/audiographer/sndfile', 'audiographer/sndfile/*.h')
+    #bld.install_files('${INCLUDEDIR}/audiographer/utils', 'audiographer/utils/*.h')
+
+    #bld.env['BUILD_TESTS'] = True
+    bld.env['HAVE_ALL_GTHREAD'] = bld.env['HAVE_GLIB'] and bld.env['HAVE_GLIBMM'] and bld.env['HAVE_GTHREAD']
+
+    audiographer = bld.new_task_gen('cxx', 'shlib')
+    audiographer.source = '''
+            private/gdither/gdither.cc
+            src/general/sample_format_converter.cc
+            src/routines.cc
+            src/debug_utils.cc
+            src/general/broadcast_info.cc
+    '''
+
+    if bld.env['HAVE_SAMPLERATE']:
+        audiographer.source += '''
+                src/general/sr_converter.cc
         '''
-        
+
+    audiographer.name           = 'libaudiographer'
+    audiographer.target         = 'audiographer'
+    audiographer.export_incdirs = ['.', './src']
+    audiographer.includes       = ['.', './src']
+    audiographer.uselib         = 'GLIB GLIBMM GTHREAD SAMPLERATE SNDFILE'
+    audiographer.uselib_local   = 'libpbd'
+    audiographer.vnum           = AUDIOGRAPHER_LIB_VERSION
+    audiographer.install_path   = os.path.join(bld.env['LIBDIR'], 'ardour3')
+
+
+    if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:
+        # Unit tests
+        obj              = bld.new_task_gen('cxx', 'program')
+        obj.source       = '''
+                tests/test_runner.cc
+                tests/type_utils_test.cc
+                tests/utils/identity_vertex_test.cc
+                tests/general/interleaver_test.cc
+                tests/general/deinterleaver_test.cc
+                tests/general/interleaver_deinterleaver_test.cc
+                tests/general/chunker_test.cc
+                tests/general/sample_format_converter_test.cc
+                tests/general/peak_reader_test.cc
+                tests/general/normalizer_test.cc
+                tests/general/silence_trimmer_test.cc
+        '''
+
+        if bld.env['HAVE_ALL_GTHREAD']:
+            obj.source += '''
+                    tests/general/threader_test.cc
+            '''
+
+        if bld.env['HAVE_SNDFILE']:
+            obj.source += '''
+                    tests/sndfile/tmp_file_test.cc
+            '''
+
         if bld.env['HAVE_SAMPLERATE']:
-        	audiographer.source += '''
-        		src/general/sr_converter.cc
-        	'''
-        
-        audiographer.name           = 'libaudiographer'
-        audiographer.target         = 'audiographer'
-        audiographer.export_incdirs = ['.', './src']
-        audiographer.includes       = ['.', './src']
-        audiographer.uselib         = 'GLIB GLIBMM GTHREAD SAMPLERATE SNDFILE'
-        audiographer.uselib_local   = 'libpbd'
-        audiographer.vnum           = AUDIOGRAPHER_LIB_VERSION
-        audiographer.install_path   = os.path.join(bld.env['LIBDIR'], 'ardour3')
-        
-
-        if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:
-        	# Unit tests
-        	obj              = bld.new_task_gen('cxx', 'program')
-        	obj.source       = '''
-        		tests/test_runner.cc
-        		tests/type_utils_test.cc
-        		tests/utils/identity_vertex_test.cc
-        		tests/general/interleaver_test.cc
-        		tests/general/deinterleaver_test.cc
-        		tests/general/interleaver_deinterleaver_test.cc
-        		tests/general/chunker_test.cc
-        		tests/general/sample_format_converter_test.cc
-        		tests/general/peak_reader_test.cc
-        		tests/general/normalizer_test.cc
-        		tests/general/silence_trimmer_test.cc
-        	'''
-        	
-        	if bld.env['HAVE_ALL_GTHREAD']:
-        		obj.source += '''
-        			tests/general/threader_test.cc
-        		'''
-        	
-        	if bld.env['HAVE_SNDFILE']:
-        		obj.source += '''
-        			tests/sndfile/tmp_file_test.cc
-        		'''
-
-        	if bld.env['HAVE_SAMPLERATE']:
-        		obj.source += '''
-        			tests/general/sr_converter_test.cc
-        		'''
-        	
-        	obj.uselib_local = 'libaudiographer'
-        	obj.uselib       = 'CPPUNIT GLIBMM'
-        	obj.target       = 'run-tests'
-        	obj.install_path = ''
+            obj.source += '''
+                    tests/general/sr_converter_test.cc
+            '''
 
-def shutdown():
-        autowaf.shutdown()
+        obj.uselib_local = 'libaudiographer'
+        obj.uselib       = 'CPPUNIT GLIBMM'
+        obj.target       = 'run-tests'
+        obj.install_path = ''
 
+def shutdown():
+    autowaf.shutdown()
diff --git a/libs/clearlooks-newer/wscript b/libs/clearlooks-newer/wscript
index b33d216032..b3ba10c5e2 100644
--- a/libs/clearlooks-newer/wscript
+++ b/libs/clearlooks-newer/wscript
@@ -45,4 +45,3 @@ def build(bld):
 
 def shutdown():
     autowaf.shutdown()
-    
diff --git a/libs/evoral/wscript b/libs/evoral/wscript
index a0c99029a5..6042db22cd 100644
--- a/libs/evoral/wscript
+++ b/libs/evoral/wscript
@@ -23,112 +23,111 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
-        opt.add_option('--test', action='store_true', default=False, dest='build_tests',
-        		help="Build unit tests")
+    autowaf.set_options(opt)
+    opt.add_option('--test', action='store_true', default=False, dest='build_tests',
+                    help="Build unit tests")
 
 def configure(conf):
-        autowaf.configure(conf)
-        #autowaf.display_header('Evoral Configuration')
-
-        conf.check_tool('compiler_cxx')
-        autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False)
-        autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.2')
-        autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.14.0')
-        autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', atleast_version='2.14.0')
-
-        # Boost headers
-        autowaf.check_header(conf, 'boost/shared_ptr.hpp')
-        autowaf.check_header(conf, 'boost/weak_ptr.hpp')
-        
-        conf.env['BUILD_TESTS'] = Options.options.build_tests
-        
-        #autowaf.display_msg(conf, "Unit tests", str(conf.env['BUILD_TESTS']))
-        #print
+    autowaf.configure(conf)
+    #autowaf.display_header('Evoral Configuration')
 
-def build(bld):
-        # Headers
-        #bld.install_files('${INCLUDEDIR}/evoral', 'evoral/*.h')
-        #bld.install_files('${INCLUDEDIR}/evoral', 'evoral/*.hpp')
-
-        # Pkgconfig file
-        #autowaf.build_pc(bld, 'EVORAL', EVORAL_VERSION, 'GLIBMM GTHREAD')
-
-        libsmf = bld.new_task_gen('cc', 'shlib')
-        libsmf.source = '''
-        	src/libsmf/smf.c
-        	src/libsmf/smf_decode.c
-        	src/libsmf/smf_load.c
-        	src/libsmf/smf_save.c
-        	src/libsmf/smf_tempo.c
-        '''
-        libsmf.export_incdirs = ['./src/libsmf']
-        libsmf.defines      = 'SMF_VERSION="1.2"'
-        libsmf.includes     = ['./src']
-        libsmf.name         = 'libsmf'
-        libsmf.target       = 'smf'
-        libsmf.uselib       = 'GLIB'
-        libsmf.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-
-        lib_source = '''
-        	src/Control.cpp
-        	src/ControlList.cpp
-        	src/ControlSet.cpp
-        	src/Curve.cpp
-        	src/Event.cpp
-        	src/midi_util.cpp
-        	src/MIDIEvent.cpp
-        	src/Note.cpp
-        	src/SMF.cpp
-        	src/Sequence.cpp
-                src/debug.cpp
-        '''
+    conf.check_tool('compiler_cxx')
+    autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False)
+    autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.2')
+    autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.14.0')
+    autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', atleast_version='2.14.0')
+
+    # Boost headers
+    autowaf.check_header(conf, 'boost/shared_ptr.hpp')
+    autowaf.check_header(conf, 'boost/weak_ptr.hpp')
+
+    conf.env['BUILD_TESTS'] = Options.options.build_tests
 
-        # Library
-        obj = bld.new_task_gen('cxx', 'shlib')
+    #autowaf.display_msg(conf, "Unit tests", str(conf.env['BUILD_TESTS']))
+    #print
+
+def build(bld):
+    # Headers
+    #bld.install_files('${INCLUDEDIR}/evoral', 'evoral/*.h')
+    #bld.install_files('${INCLUDEDIR}/evoral', 'evoral/*.hpp')
+
+    # Pkgconfig file
+    #autowaf.build_pc(bld, 'EVORAL', EVORAL_VERSION, 'GLIBMM GTHREAD')
+
+    libsmf = bld.new_task_gen('cc', 'shlib')
+    libsmf.source = '''
+            src/libsmf/smf.c
+            src/libsmf/smf_decode.c
+            src/libsmf/smf_load.c
+            src/libsmf/smf_save.c
+            src/libsmf/smf_tempo.c
+    '''
+    libsmf.export_incdirs = ['./src/libsmf']
+    libsmf.defines      = 'SMF_VERSION="1.2"'
+    libsmf.includes     = ['./src']
+    libsmf.name         = 'libsmf'
+    libsmf.target       = 'smf'
+    libsmf.uselib       = 'GLIB'
+    libsmf.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+
+    lib_source = '''
+            src/Control.cpp
+            src/ControlList.cpp
+            src/ControlSet.cpp
+            src/Curve.cpp
+            src/Event.cpp
+            src/midi_util.cpp
+            src/MIDIEvent.cpp
+            src/Note.cpp
+            src/SMF.cpp
+            src/Sequence.cpp
+            src/debug.cpp
+    '''
+
+    # Library
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source         = lib_source
+    obj.export_incdirs = ['.']
+    obj.includes       = ['.', './src']
+    obj.name           = 'libevoral'
+    obj.target         = 'evoral'
+    obj.uselib         = 'GLIBMM GTHREAD SMF'
+    obj.uselib_local   = 'libsmf libpbd'
+    obj.vnum           = EVORAL_LIB_VERSION
+    obj.install_path   = os.path.join(bld.env['LIBDIR'], 'ardour3')
+
+    if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:
+        # Static library (for unit test code coverage)
+        obj = bld.new_task_gen('cxx', 'staticlib')
+        obj.source       = lib_source
         obj.source         = lib_source
         obj.export_incdirs = ['.']
         obj.includes       = ['.', './src']
-        obj.name           = 'libevoral'
-        obj.target         = 'evoral'
+        obj.name           = 'libevoral_static'
+        obj.target         = 'evoral_static'
         obj.uselib         = 'GLIBMM GTHREAD SMF'
         obj.uselib_local   = 'libsmf libpbd'
         obj.vnum           = EVORAL_LIB_VERSION
-        obj.install_path   = os.path.join(bld.env['LIBDIR'], 'ardour3')
-
-        if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:
-        	# Static library (for unit test code coverage)
-        	obj = bld.new_task_gen('cxx', 'staticlib')
-        	obj.source       = lib_source
-        	obj.source         = lib_source
-        	obj.export_incdirs = ['.']
-        	obj.includes       = ['.', './src']
-        	obj.name           = 'libevoral_static'
-        	obj.target         = 'evoral_static'
-        	obj.uselib         = 'GLIBMM GTHREAD SMF'
-        	obj.uselib_local   = 'libsmf libpbd'
-        	obj.vnum           = EVORAL_LIB_VERSION
-        	obj.install_path   = ''
-        	obj.ccflags        = [ '-fprofile-arcs',  '-ftest-coverage' ]
-        	obj.cxxflags       = [ '-fprofile-arcs',  '-ftest-coverage' ]
-
-        	# Unit tests
-        	obj              = bld.new_task_gen('cxx', 'program')
-        	obj.source       = '''
-        		test/SequenceTest.cpp
-        		test/SMFTest.cpp
-        		test/testrunner.cpp
-        	'''
-        	obj.includes     = ['.', './src']
-        	obj.uselib_local = 'libevoral_static'
-        	obj.uselib       = 'CPPUNIT SNDFILE'
-        	obj.libs         = 'gcov'
-        	obj.target       = 'run-tests'
-        	obj.name         = 'libevoral-tests'
-        	obj.install_path = ''
-        	obj.ccflags      = [ '-fprofile-arcs',  '-ftest-coverage' ]
-        	obj.cxxflags     = [ '-fprofile-arcs',  '-ftest-coverage' ]
+        obj.install_path   = ''
+        obj.ccflags        = [ '-fprofile-arcs',  '-ftest-coverage' ]
+        obj.cxxflags       = [ '-fprofile-arcs',  '-ftest-coverage' ]
+
+        # Unit tests
+        obj              = bld.new_task_gen('cxx', 'program')
+        obj.source       = '''
+                test/SequenceTest.cpp
+                test/SMFTest.cpp
+                test/testrunner.cpp
+        '''
+        obj.includes     = ['.', './src']
+        obj.uselib_local = 'libevoral_static'
+        obj.uselib       = 'CPPUNIT SNDFILE'
+        obj.libs         = 'gcov'
+        obj.target       = 'run-tests'
+        obj.name         = 'libevoral-tests'
+        obj.install_path = ''
+        obj.ccflags      = [ '-fprofile-arcs',  '-ftest-coverage' ]
+        obj.cxxflags     = [ '-fprofile-arcs',  '-ftest-coverage' ]
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/gnomecanvas/wscript b/libs/gnomecanvas/wscript
index 96dbce8630..e3085065dc 100644
--- a/libs/gnomecanvas/wscript
+++ b/libs/gnomecanvas/wscript
@@ -42,26 +42,25 @@ libgnomecanvas_sources = [
         ]
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
-        conf.check_tool('compiler_cc')
-        autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK', atleast_version='2.18')
-        autowaf.check_pkg(conf, 'libart-2.0', uselib_store='LIBART', atleast_version='2.3')
+    autowaf.configure(conf)
+    conf.check_tool('compiler_cc')
+    autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK', atleast_version='2.18')
+    autowaf.check_pkg(conf, 'libart-2.0', uselib_store='LIBART', atleast_version='2.3')
 
 def build(bld):
-        # Library
-        obj              = bld.new_task_gen('cc', 'shlib')
-        obj.source       = libgnomecanvas_sources
-        obj.export_incdirs = ['.']
-        obj.includes     = ['.']
-        obj.name         = 'libgnomecanvas-2'
-        obj.target       = 'gnomecanvas-2'
-        obj.uselib       = 'GLIB GTK LIBART'
-        obj.vnum         = LIBGNOMECANVAS_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    # Library
+    obj              = bld.new_task_gen('cc', 'shlib')
+    obj.source       = libgnomecanvas_sources
+    obj.export_incdirs = ['.']
+    obj.includes     = ['.']
+    obj.name         = 'libgnomecanvas-2'
+    obj.target       = 'gnomecanvas-2'
+    obj.uselib       = 'GLIB GTK LIBART'
+    obj.vnum         = LIBGNOMECANVAS_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index c310683677..37e4d32e3c 100644
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -64,37 +64,36 @@ blddir = 'build'
 path_prefix = 'libs/gtkmm2ext/'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.build_version_files(path_prefix+'gtkmm2ext/version.h', path_prefix+'version.cc',
-        		'libgtkmm2ext', MAJOR, MINOR, MICRO)
-        autowaf.configure(conf)
-        conf.check_tool('compiler_cxx')
-        autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.8')
-        autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK', atleast_version='2.12.1')
+    autowaf.build_version_files(path_prefix+'gtkmm2ext/version.h', path_prefix+'version.cc',
+                    'libgtkmm2ext', MAJOR, MINOR, MICRO)
+    autowaf.configure(conf)
+    conf.check_tool('compiler_cxx')
+    autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.8')
+    autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK', atleast_version='2.12.1')
 
 
 def build(bld):
-        obj = bld.new_task_gen(features = 'cc cxx cshlib')
-        obj.source = gtkmm2ext_sources
-        obj.export_incdirs = ['.']
-        obj.includes     = ['.']
-        obj.name         = 'libgtkmm2ext'
-        obj.target       = 'gtkmm2ext'
-        obj.uselib       = 'GTKMM GTK GTKOSX OSX GDK'
-        obj.uselib_local = 'libpbd'
-        obj.vnum         = GTKMM2EXT_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-        obj.cxxflags     = [
-        		'-DPACKAGE="libgtkmm2ext"',
-        		'-DLOCALEDIR="' + os.path.join(
-        			os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '"']
-        if bld.env['GTKOSX']:
-        	obj.source += ['gtkapplication_quartz.mm']
-        else:
-                obj.source += ['gtkapplication_x11.c']
+    obj = bld.new_task_gen(features = 'cc cxx cshlib')
+    obj.source = gtkmm2ext_sources
+    obj.export_incdirs = ['.']
+    obj.includes     = ['.']
+    obj.name         = 'libgtkmm2ext'
+    obj.target       = 'gtkmm2ext'
+    obj.uselib       = 'GTKMM GTK GTKOSX OSX GDK'
+    obj.uselib_local = 'libpbd'
+    obj.vnum         = GTKMM2EXT_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    obj.cxxflags     = [
+                    '-DPACKAGE="libgtkmm2ext"',
+                    '-DLOCALEDIR="' + os.path.join(
+                            os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '"']
+    if bld.env['GTKOSX']:
+        obj.source += ['gtkapplication_quartz.mm']
+    else:
+        obj.source += ['gtkapplication_x11.c']
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript
index 14da1afccb..f236d0a8cd 100644
--- a/libs/midi++2/wscript
+++ b/libs/midi++2/wscript
@@ -26,46 +26,45 @@ blddir = 'build'
 path_prefix = 'libs/midi++2/'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.build_version_files(path_prefix+'midi++/version.h', path_prefix+'version.cc',
-        		'midipp', MAJOR, MINOR, MICRO)
-        autowaf.configure(conf)
-        conf.check_tool('compiler_cxx')
-        autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.118.2')
-        autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
-        autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')
+    autowaf.build_version_files(path_prefix+'midi++/version.h', path_prefix+'version.cc',
+                    'midipp', MAJOR, MINOR, MICRO)
+    autowaf.configure(conf)
+    conf.check_tool('compiler_cxx')
+    autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.118.2')
+    autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
+    autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')
 
-        # Boost headers
-        autowaf.check_header(conf, 'boost/shared_ptr.hpp')
-        autowaf.check_header(conf, 'boost/weak_ptr.hpp')
+    # Boost headers
+    autowaf.check_header(conf, 'boost/shared_ptr.hpp')
+    autowaf.check_header(conf, 'boost/weak_ptr.hpp')
 
 def build(bld):
-        # Library
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = '''
-        	midi.cc
-        	channel.cc
-        	manager.cc
-        	parser.cc
-        	port.cc
-        	midnam_patch.cc
-        	mmc.cc
-        	mtc.cc
-        	version.cc
-        '''
-        # everybody loves JACK
-        obj.cxxflags = [ '-DWITH_JACK_MIDI' ]
-        obj.export_incdirs = ['.']
-        obj.includes     = ['.', '../surfaces/control_protocol']
-        obj.name         = 'libmidipp'
-        obj.target       = 'midipp'
-        obj.uselib       = 'GLIBMM SIGCPP XML JACK OSX'
-        obj.uselib_local = 'libpbd libevoral libtimecode'
-        obj.vnum         = LIBMIDIPP_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    # Library
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = '''
+            midi.cc
+            channel.cc
+            manager.cc
+            parser.cc
+            port.cc
+            midnam_patch.cc
+            mmc.cc
+            mtc.cc
+            version.cc
+    '''
+    # everybody loves JACK
+    obj.cxxflags = [ '-DWITH_JACK_MIDI' ]
+    obj.export_incdirs = ['.']
+    obj.includes     = ['.', '../surfaces/control_protocol']
+    obj.name         = 'libmidipp'
+    obj.target       = 'midipp'
+    obj.uselib       = 'GLIBMM SIGCPP XML JACK OSX'
+    obj.uselib_local = 'libpbd libevoral libtimecode'
+    obj.vnum         = LIBMIDIPP_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/panners/1in2out/wscript b/libs/panners/1in2out/wscript
index 14af0d6781..2238124dc7 100644
--- a/libs/panners/1in2out/wscript
+++ b/libs/panners/1in2out/wscript
@@ -13,23 +13,22 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
+    autowaf.configure(conf)
 
 def build(bld):
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = [ 'panner_1in2out.cc' ]
-        obj.export_incdirs = ['.']
-        obj.cxxflags     = '-DPACKAGE="libardour_pan1in2out"'
-        obj.includes     = ['.']
-        obj.name         = 'libardour_pan1in2out'
-        obj.target       = 'pan1in2out'
-        obj.uselib_local = 'libardour libardour_cp libpbd'
-        obj.vnum         = LIBARDOUR_PAN1IN2OUT_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'panners')
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = [ 'panner_1in2out.cc' ]
+    obj.export_incdirs = ['.']
+    obj.cxxflags     = '-DPACKAGE="libardour_pan1in2out"'
+    obj.includes     = ['.']
+    obj.name         = 'libardour_pan1in2out'
+    obj.target       = 'pan1in2out'
+    obj.uselib_local = 'libardour libardour_cp libpbd'
+    obj.vnum         = LIBARDOUR_PAN1IN2OUT_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'panners')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/panners/2in2out/wscript b/libs/panners/2in2out/wscript
index 060796c045..2891dfd6f7 100644
--- a/libs/panners/2in2out/wscript
+++ b/libs/panners/2in2out/wscript
@@ -13,23 +13,22 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
+    autowaf.configure(conf)
 
 def build(bld):
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = [ 'panner_2in2out.cc' ]
-        obj.export_incdirs = ['.']
-        obj.cxxflags     = '-DPACKAGE="libardour_pan2in2out"'
-        obj.includes     = ['.']
-        obj.name         = 'libardour_pan2in2out'
-        obj.target       = 'pan2in2out'
-        obj.uselib_local = 'libardour libardour_cp libpbd'
-        obj.vnum         = LIBARDOUR_PAN2IN2OUT_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'panners')
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = [ 'panner_2in2out.cc' ]
+    obj.export_incdirs = ['.']
+    obj.cxxflags     = '-DPACKAGE="libardour_pan2in2out"'
+    obj.includes     = ['.']
+    obj.name         = 'libardour_pan2in2out'
+    obj.target       = 'pan2in2out'
+    obj.uselib_local = 'libardour libardour_cp libpbd'
+    obj.vnum         = LIBARDOUR_PAN2IN2OUT_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'panners')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/panners/vbap/wscript b/libs/panners/vbap/wscript
index 47fbcbb8b1..bd311272b5 100644
--- a/libs/panners/vbap/wscript
+++ b/libs/panners/vbap/wscript
@@ -13,23 +13,22 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
+    autowaf.configure(conf)
 
 def build(bld):
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = [ 'vbap_speakers.cc', 'vbap.cc'  ]
-        obj.export_incdirs = ['.']
-        obj.cxxflags     = '-DPACKAGE="libardour_panvbap"'
-        obj.includes     = ['.']
-        obj.name         = 'libardour_panvbap'
-        obj.target       = 'panvbap'
-        obj.uselib_local = 'libardour libardour_cp libpbd'
-        obj.vnum         = LIBARDOUR_PANVBAP_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'panners')
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = [ 'vbap_speakers.cc', 'vbap.cc'  ]
+    obj.export_incdirs = ['.']
+    obj.cxxflags     = '-DPACKAGE="libardour_panvbap"'
+    obj.includes     = ['.']
+    obj.name         = 'libardour_panvbap'
+    obj.target       = 'panvbap'
+    obj.uselib_local = 'libardour libardour_cp libpbd'
+    obj.vnum         = LIBARDOUR_PANVBAP_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'panners')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/panners/wscript b/libs/panners/wscript
index 02e741b8e0..3c1a013732 100644
--- a/libs/panners/wscript
+++ b/libs/panners/wscript
@@ -9,19 +9,19 @@ blddir = 'build'
 panners = [ '2in2out', '1in2out', 'vbap' ]
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def sub_config_and_use(conf, name, has_objects = True):
-        conf.sub_config(name)
-        autowaf.set_local_lib(conf, name, has_objects)
+    conf.sub_config(name)
+    autowaf.set_local_lib(conf, name, has_objects)
 
 def configure(conf):
-        autowaf.set_recursive()
-        autowaf.configure(conf)
+    autowaf.set_recursive()
+    autowaf.configure(conf)
 
-        for i in panners:
-        	sub_config_and_use(conf, i)
+    for i in panners:
+        sub_config_and_use(conf, i)
 
 def build(bld):
-        for i in panners:
-            bld.add_subdirs(i)
+    for i in panners:
+        bld.add_subdirs(i)
diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index 9a35a22e1e..66b63c999e 100644
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -27,121 +27,120 @@ blddir = 'build'
 path_prefix = 'libs/pbd/'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.build_version_files(path_prefix+'pbd/version.h', path_prefix+'version.cc',
-        		'libpbd', MAJOR, MINOR, MICRO)
-        autowaf.configure(conf)
-        conf.check_tool('compiler_cxx')
-        autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
-        autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')
-        if sys.platform != 'darwin':
-                autowaf.check_pkg(conf, 'uuid', uselib_store='UUID')
-
-        conf.check(function_name='getmntent', header_name='mntent.h', define_name='HAVE_GETMNTENT')
-        conf.check(header_name='execinfo.h', define_name='HAVE_EXECINFO')
-        conf.check(header_name='unistd.h', define_name='HAVE_UNISTD')
-        if conf.check_cc(function_name='posix_memalign', header_name='stdlib.h', ccflags='-D_XOPEN_SOURCE=600') == False:
-        	conf.define ('NO_POSIX_MEMALIGN',1)
-
-        conf.write_config_header('libpbd-config.h')
-
-        # Boost headers
-        autowaf.check_header(conf, 'boost/shared_ptr.hpp')
-        autowaf.check_header(conf, 'boost/weak_ptr.hpp')
-        # autowaf.check_header(conf, 'boost/uuid/uuid.hpp')
+    autowaf.build_version_files(path_prefix+'pbd/version.h', path_prefix+'version.cc',
+                    'libpbd', MAJOR, MINOR, MICRO)
+    autowaf.configure(conf)
+    conf.check_tool('compiler_cxx')
+    autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
+    autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')
+    if sys.platform != 'darwin':
+        autowaf.check_pkg(conf, 'uuid', uselib_store='UUID')
+
+    conf.check(function_name='getmntent', header_name='mntent.h', define_name='HAVE_GETMNTENT')
+    conf.check(header_name='execinfo.h', define_name='HAVE_EXECINFO')
+    conf.check(header_name='unistd.h', define_name='HAVE_UNISTD')
+    if conf.check_cc(function_name='posix_memalign', header_name='stdlib.h', ccflags='-D_XOPEN_SOURCE=600') == False:
+        conf.define ('NO_POSIX_MEMALIGN',1)
+
+    conf.write_config_header('libpbd-config.h')
+
+    # Boost headers
+    autowaf.check_header(conf, 'boost/shared_ptr.hpp')
+    autowaf.check_header(conf, 'boost/weak_ptr.hpp')
+    # autowaf.check_header(conf, 'boost/uuid/uuid.hpp')
 
 def build(bld):
-        # Library
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = '''
-        	basename.cc
-        	base_ui.cc
-                boost_debug.cc
-                cartesian.cc
-        	command.cc
-        	convert.cc
-        	controllable.cc
-        	controllable_descriptor.cc
-                clear_dir.cc
-                crossthread.cc
-                cpus.cc
-                debug.cc
-        	enumwriter.cc
-                event_loop.cc
-        	dmalloc.cc
-                enums.cc
-                epa.cc
-        	error.cc
-        	filesystem.cc
-        	filesystem_paths.cc
-        	file_manager.cc
-        	file_utils.cc
-        	fpu.cc
-        	id.cc
-                locale_guard.cc
-                malign.cc
-        	mountpoint.cc
-                openuri.cc
-        	pathscanner.cc
-        	pool.cc
-                property_list.cc
-        	pthread_utils.cc
-        	receiver.cc
-        	search_path.cc
-        	semutils.cc
-        	shortpath.cc
-        	signals.cc
-                sndfile_manager.cc
-        	stacktrace.cc
-        	stateful_diff_command.cc
-        	stateful.cc
-        	strreplace.cc
-        	strsplit.cc
-        	textreceiver.cc
-        	transmitter.cc
-        	undo.cc
-        	uuid.cc
-        	version.cc
-        	whitespace.cc
-        	xml++.cc
-        '''
-
-        if bld.env['DEBUG_RT_ALLOC']:
-        	obj.source += 'debug_rt_alloc.c'
-
-        obj.export_incdirs = ['.']
-        obj.includes     = ['.']
-        obj.name         = 'libpbd'
-        obj.target       = 'pbd'
-        obj.uselib       = 'GLIBMM SIGCPP XML UUID SNDFILE'
-        if sys.platform == 'darwin':
-        	TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc']
-        	obj.source += 'cocoa_open_uri.mm'
-        	obj.uselib += ' OSX'
-        obj.vnum         = LIBPBD_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-        obj.cxxflags     = ['-DPACKAGE="libpbd"']
-
-        if bld.env['build_target'] == 'x86_64':
-        	obj.cxxflags += [ '-DUSE_X86_64_ASM' ]
-
-        if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:
-        	# Unit tests
-        	testobj              = bld.new_task_gen('cxx', 'program')
-        	testobj.source       = '''
-                        test/testrunner.cc
-        		test/xpath.cc
-                        test/scalar_properties.cc
-        		test/signals_test.cc
-        	'''.split()
-        	testobj.target       = 'run-tests'
-        	testobj.includes     = obj.includes + ['test', '../pbd']
-        	testobj.uselib       = 'CPPUNIT XML SNDFILE'
-        	testobj.uselib_local = 'libpbd'
+    # Library
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = '''
+            basename.cc
+            base_ui.cc
+            boost_debug.cc
+            cartesian.cc
+            command.cc
+            convert.cc
+            controllable.cc
+            controllable_descriptor.cc
+            clear_dir.cc
+            crossthread.cc
+            cpus.cc
+            debug.cc
+            enumwriter.cc
+            event_loop.cc
+            dmalloc.cc
+            enums.cc
+            epa.cc
+            error.cc
+            filesystem.cc
+            filesystem_paths.cc
+            file_manager.cc
+            file_utils.cc
+            fpu.cc
+            id.cc
+            locale_guard.cc
+            malign.cc
+            mountpoint.cc
+            openuri.cc
+            pathscanner.cc
+            pool.cc
+            property_list.cc
+            pthread_utils.cc
+            receiver.cc
+            search_path.cc
+            semutils.cc
+            shortpath.cc
+            signals.cc
+            sndfile_manager.cc
+            stacktrace.cc
+            stateful_diff_command.cc
+            stateful.cc
+            strreplace.cc
+            strsplit.cc
+            textreceiver.cc
+            transmitter.cc
+            undo.cc
+            uuid.cc
+            version.cc
+            whitespace.cc
+            xml++.cc
+    '''
+
+    if bld.env['DEBUG_RT_ALLOC']:
+        obj.source += 'debug_rt_alloc.c'
+
+    obj.export_incdirs = ['.']
+    obj.includes     = ['.']
+    obj.name         = 'libpbd'
+    obj.target       = 'pbd'
+    obj.uselib       = 'GLIBMM SIGCPP XML UUID SNDFILE'
+    if sys.platform == 'darwin':
+        TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc']
+        obj.source += 'cocoa_open_uri.mm'
+        obj.uselib += ' OSX'
+    obj.vnum         = LIBPBD_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    obj.cxxflags     = ['-DPACKAGE="libpbd"']
+
+    if bld.env['build_target'] == 'x86_64':
+        obj.cxxflags += [ '-DUSE_X86_64_ASM' ]
+
+    if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:
+        # Unit tests
+        testobj              = bld.new_task_gen('cxx', 'program')
+        testobj.source       = '''
+                test/testrunner.cc
+                test/xpath.cc
+                test/scalar_properties.cc
+                test/signals_test.cc
+        '''.split()
+        testobj.target       = 'run-tests'
+        testobj.includes     = obj.includes + ['test', '../pbd']
+        testobj.uselib       = 'CPPUNIT XML SNDFILE'
+        testobj.uselib_local = 'libpbd'
 
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/qm-dsp/wscript b/libs/qm-dsp/wscript
index 232f010235..a77822abac 100644
--- a/libs/qm-dsp/wscript
+++ b/libs/qm-dsp/wscript
@@ -20,40 +20,39 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
-        conf.check_tool('compiler_cxx')
+    autowaf.configure(conf)
+    conf.check_tool('compiler_cxx')
 
 def build(bld):
-        # Host Library
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = '''
-        	dsp/onsets/DetectionFunction.cpp
-        	dsp/onsets/PeakPicking.cpp
-        	dsp/phasevocoder/PhaseVocoder.cpp
-        	dsp/rateconversion/Decimator.cpp
-        	dsp/rhythm/BeatSpectrum.cpp
-        	dsp/signalconditioning/DFProcess.cpp
-        	dsp/signalconditioning/Filter.cpp
-        	dsp/signalconditioning/FiltFilt.cpp
-        	dsp/signalconditioning/Framer.cpp
-        	dsp/transforms/FFT.cpp
-        	dsp/wavelet/Wavelet.cpp
-        	maths/Correlation.cpp
-        	maths/CosineDistance.cpp
-        	maths/KLDivergence.cpp
-        	maths/MathUtilities.cpp
-        	base/Pitch.cpp
-        '''
-        obj.export_incdirs = ['.']
-        obj.includes     = ['.']
-        obj.name         = 'libqmdsp'
-        obj.target       = 'qmdsp'
-        obj.vnum         = QM_DSP_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    # Host Library
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = '''
+            dsp/onsets/DetectionFunction.cpp
+            dsp/onsets/PeakPicking.cpp
+            dsp/phasevocoder/PhaseVocoder.cpp
+            dsp/rateconversion/Decimator.cpp
+            dsp/rhythm/BeatSpectrum.cpp
+            dsp/signalconditioning/DFProcess.cpp
+            dsp/signalconditioning/Filter.cpp
+            dsp/signalconditioning/FiltFilt.cpp
+            dsp/signalconditioning/Framer.cpp
+            dsp/transforms/FFT.cpp
+            dsp/wavelet/Wavelet.cpp
+            maths/Correlation.cpp
+            maths/CosineDistance.cpp
+            maths/KLDivergence.cpp
+            maths/MathUtilities.cpp
+            base/Pitch.cpp
+    '''
+    obj.export_incdirs = ['.']
+    obj.includes     = ['.']
+    obj.name         = 'libqmdsp'
+    obj.target       = 'qmdsp'
+    obj.vnum         = QM_DSP_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/rubberband/wscript b/libs/rubberband/wscript
index 60dc57dcfd..011a858aca 100644
--- a/libs/rubberband/wscript
+++ b/libs/rubberband/wscript
@@ -21,30 +21,29 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
-        conf.check_tool('compiler_cxx')
+    autowaf.configure(conf)
+    conf.check_tool('compiler_cxx')
 
 def build(bld):
-        # Library
-        obj = bld.new_task_gen('cxx', 'shlib')
-        prefix = 'libs/rubberband/'
-        sources = glob.glob(prefix + 'src/*.cpp')
-        obj.source = [ ]
-        for i in sources:
-        	obj.source += [ i.replace(prefix, '') ]
-        obj.export_incdirs = ['.']
-        obj.includes     = ['.', 'rubberband']
-        obj.name         = 'librubberband'
-        obj.target       = 'rubberband'
-        obj.uselib       = 'FFTW3 FFTW3F SAMPLERATE SNDFILE'
-        obj.uselib_local = 'libvamphost'
-        obj.vnum         = LIBRUBBERBAND_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-        obj.cxxflags     = '-DPACKAGE="librubberband"'
+    # Library
+    obj = bld.new_task_gen('cxx', 'shlib')
+    prefix = 'libs/rubberband/'
+    sources = glob.glob(prefix + 'src/*.cpp')
+    obj.source = [ ]
+    for i in sources:
+        obj.source += [ i.replace(prefix, '') ]
+    obj.export_incdirs = ['.']
+    obj.includes     = ['.', 'rubberband']
+    obj.name         = 'librubberband'
+    obj.target       = 'rubberband'
+    obj.uselib       = 'FFTW3 FFTW3F SAMPLERATE SNDFILE'
+    obj.uselib_local = 'libvamphost'
+    obj.vnum         = LIBRUBBERBAND_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    obj.cxxflags     = '-DPACKAGE="librubberband"'
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/surfaces/control_protocol/wscript b/libs/surfaces/control_protocol/wscript
index 6dc2e55447..a4afd68539 100644
--- a/libs/surfaces/control_protocol/wscript
+++ b/libs/surfaces/control_protocol/wscript
@@ -14,26 +14,25 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
+    autowaf.configure(conf)
 
 def build(bld):
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = '''
-        	basic_ui.cc
-        	control_protocol.cc
-        '''
-        obj.export_incdirs = ['.', './control_protocol' ]
-        obj.cxxflags     = '-DPACKAGE="ardour_cp"'
-        obj.includes     = ['.', './control_protocol']
-        obj.name         = 'libardour_cp'
-        obj.target       = 'ardourcp'
-        obj.uselib_local = 'libardour libtimecode'
-        obj.vnum         = LIBARDOUR_CP_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = '''
+            basic_ui.cc
+            control_protocol.cc
+    '''
+    obj.export_incdirs = ['.', './control_protocol' ]
+    obj.cxxflags     = '-DPACKAGE="ardour_cp"'
+    obj.includes     = ['.', './control_protocol']
+    obj.name         = 'libardour_cp'
+    obj.target       = 'ardourcp'
+    obj.uselib_local = 'libardour libtimecode'
+    obj.vnum         = LIBARDOUR_CP_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/surfaces/frontier/wscript b/libs/surfaces/frontier/wscript
index 6c383aa072..cd388b8bff 100644
--- a/libs/surfaces/frontier/wscript
+++ b/libs/surfaces/frontier/wscript
@@ -20,28 +20,27 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
+    autowaf.configure(conf)
 
 def build(bld):
-        # Generic MIDI
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = '''
-        	generic_midi_control_protocol.cc
-        	interface.cc
-        	midicontrollable.cc
-        '''
-        obj.export_incdirs = ['./generic_midi']
-        obj.cxxflags     = '-DPACKAGE="ardour_genericmidi"'
-        obj.includes     = ['.', './generic_midi']
-        obj.name         = 'libgeneric_midi'
-        obj.target       = 'generic_midi'
-        obj.uselib_local = 'libardour libsurfaces'
-        obj.vnum         = LIBSURFACES_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
+    # Generic MIDI
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = '''
+            generic_midi_control_protocol.cc
+            interface.cc
+            midicontrollable.cc
+    '''
+    obj.export_incdirs = ['./generic_midi']
+    obj.cxxflags     = '-DPACKAGE="ardour_genericmidi"'
+    obj.includes     = ['.', './generic_midi']
+    obj.name         = 'libgeneric_midi'
+    obj.target       = 'generic_midi'
+    obj.uselib_local = 'libardour libsurfaces'
+    obj.vnum         = LIBSURFACES_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/surfaces/generic_midi/wscript b/libs/surfaces/generic_midi/wscript
index 4cc97edb52..9111df5982 100644
--- a/libs/surfaces/generic_midi/wscript
+++ b/libs/surfaces/generic_midi/wscript
@@ -13,32 +13,31 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
+    autowaf.configure(conf)
 
 def build(bld):
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = '''
-        	generic_midi_control_protocol.cc
-                gmcp_gui.cc
-        	interface.cc
-        	midiinvokable.cc
-        	midicontrollable.cc
-        	midifunction.cc
-                midiaction.cc
-        '''
-        obj.export_incdirs = ['.']
-        obj.cxxflags     = '-DPACKAGE="ardour_genericmidi"'
-        obj.includes     = ['.', './generic_midi']
-        obj.name         = 'libardour_generic_midi'
-        obj.target       = 'ardour_generic_midi'
-        obj.uselib       = 'GTKMM GTK GDK'
-        obj.uselib_local = 'libardour libardour_cp libgtkmm2ext libpbd'
-        obj.vnum         = LIBARDOUR_GENERIC_MIDI_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = '''
+            generic_midi_control_protocol.cc
+            gmcp_gui.cc
+            interface.cc
+            midiinvokable.cc
+            midicontrollable.cc
+            midifunction.cc
+            midiaction.cc
+    '''
+    obj.export_incdirs = ['.']
+    obj.cxxflags     = '-DPACKAGE="ardour_genericmidi"'
+    obj.includes     = ['.', './generic_midi']
+    obj.name         = 'libardour_generic_midi'
+    obj.target       = 'ardour_generic_midi'
+    obj.uselib       = 'GTKMM GTK GDK'
+    obj.uselib_local = 'libardour libardour_cp libgtkmm2ext libpbd'
+    obj.vnum         = LIBARDOUR_GENERIC_MIDI_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/surfaces/mackie/wscript b/libs/surfaces/mackie/wscript
index 3935b22546..437865ec9c 100644
--- a/libs/surfaces/mackie/wscript
+++ b/libs/surfaces/mackie/wscript
@@ -13,42 +13,41 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
+    autowaf.configure(conf)
 
 def build(bld):
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = '''
-        	bcf_surface.cc
-        	bcf_surface_generated.cc
-        	controls.cc
-        	dummy_port.cc
-        	interface.cc
-        	mackie_button_handler.cc
-        	mackie_control_protocol.cc
-        	mackie_control_protocol_poll.cc
-        	mackie_jog_wheel.cc
-        	mackie_midi_builder.cc
-        	mackie_port.cc
-        	mackie_surface.cc
-        	mackie_surface_generated.cc
-        	midi_byte_array.cc
-        	route_signal.cc
-        	surface.cc
-        	surface_port.cc
-        	types.cc
-        '''
-        obj.export_incdirs = ['./mackie']
-        obj.cxxflags     = '-DPACKAGE="ardour_mackie"'
-        obj.includes     = ['.', './mackie']
-        obj.name         = 'libardour_mcp'
-        obj.target       = 'ardour_mcp'
-        obj.uselib_local = 'libardour libardour_cp'
-        obj.vnum         = LIBARDOUR_MCP_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = '''
+            bcf_surface.cc
+            bcf_surface_generated.cc
+            controls.cc
+            dummy_port.cc
+            interface.cc
+            mackie_button_handler.cc
+            mackie_control_protocol.cc
+            mackie_control_protocol_poll.cc
+            mackie_jog_wheel.cc
+            mackie_midi_builder.cc
+            mackie_port.cc
+            mackie_surface.cc
+            mackie_surface_generated.cc
+            midi_byte_array.cc
+            route_signal.cc
+            surface.cc
+            surface_port.cc
+            types.cc
+    '''
+    obj.export_incdirs = ['./mackie']
+    obj.cxxflags     = '-DPACKAGE="ardour_mackie"'
+    obj.includes     = ['.', './mackie']
+    obj.name         = 'libardour_mcp'
+    obj.target       = 'ardour_mcp'
+    obj.uselib_local = 'libardour libardour_cp'
+    obj.vnum         = LIBARDOUR_MCP_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript
index a49020e528..4d62bda7bc 100644
--- a/libs/surfaces/osc/wscript
+++ b/libs/surfaces/osc/wscript
@@ -13,30 +13,29 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
-        autowaf.check_pkg(conf, 'liblo', uselib_store='LO', linkflags='-llo')
+    autowaf.configure(conf)
+    autowaf.check_pkg(conf, 'liblo', uselib_store='LO', linkflags='-llo')
 
 def build(bld):
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = '''
-        	osc.cc
-        	osc_controllable.cc
-        	osc_route_observer.cc
-        	interface.cc
-        '''
-        obj.export_incdirs = ['.']
-        obj.cxxflags     = '-DPACKAGE="ardour_cp"'
-        obj.includes     = ['.', './osc']
-        obj.name         = 'libardour_osc'
-        obj.target       = 'ardour_osc'
-        obj.uselib       = ' LO '
-        obj.uselib_local = 'libardour libardour_cp libpbd'
-        obj.vnum         = LIBARDOUR_OSC_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = '''
+            osc.cc
+            osc_controllable.cc
+            osc_route_observer.cc
+            interface.cc
+    '''
+    obj.export_incdirs = ['.']
+    obj.cxxflags     = '-DPACKAGE="ardour_cp"'
+    obj.includes     = ['.', './osc']
+    obj.name         = 'libardour_osc'
+    obj.target       = 'ardour_osc'
+    obj.uselib       = ' LO '
+    obj.uselib_local = 'libardour libardour_cp libpbd'
+    obj.vnum         = LIBARDOUR_OSC_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/surfaces/powermate/wscript b/libs/surfaces/powermate/wscript
index 5f670737bf..6f263fc9a0 100644
--- a/libs/surfaces/powermate/wscript
+++ b/libs/surfaces/powermate/wscript
@@ -13,26 +13,25 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
+    autowaf.configure(conf)
 
 def build(bld):
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = '''
-        	interface.cc
-        	powermate.cc
-        '''
-        obj.export_incdirs = ['.']
-        obj.cxxflags     = '-DPACKAGE="ardour_powermate"'
-        obj.includes     = ['.' ]
-        obj.name         = 'libpowermate'
-        obj.target       = 'powermate'
-        obj.uselib_local = 'libardour libardour_cp'
-        obj.vnum         = LIBARDOUR_POWERMATE_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = '''
+            interface.cc
+            powermate.cc
+    '''
+    obj.export_incdirs = ['.']
+    obj.cxxflags     = '-DPACKAGE="ardour_powermate"'
+    obj.includes     = ['.' ]
+    obj.name         = 'libpowermate'
+    obj.target       = 'powermate'
+    obj.uselib_local = 'libardour libardour_cp'
+    obj.vnum         = LIBARDOUR_POWERMATE_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/surfaces/tranzport/wscript b/libs/surfaces/tranzport/wscript
index f2c4ccc0fc..7a7d5d2a05 100644
--- a/libs/surfaces/tranzport/wscript
+++ b/libs/surfaces/tranzport/wscript
@@ -13,40 +13,39 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
+    autowaf.configure(conf)
 
 def build(bld):
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = '''
-        	button_events.cc
-        	buttons.cc
-        	general.cc
-        	init.cc
-        	interface.cc
-        	io.cc
-        	io_usb.cc
-        	lcd.cc
-        	lights.cc
-        	mode.cc
-        	panner.cc
-        	screen.cc
-        	show.cc
-        	state.cc
-        	wheel.cc
-        	wheel_modes.cc
-        '''
-        obj.export_incdirs = ['./tranzport']
-        obj.cxxflags     = '-DPACKAGE="ardour_tranzport"'
-        obj.includes     = ['.', './tranzport']
-        obj.name         = 'libardour_tranzport'
-        obj.target       = 'ardour_tranzport'
-        obj.uselib_local = 'libardour libardour_cp'
-        obj.vnum         = LIBARDOUR_TRANZPORT_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = '''
+            button_events.cc
+            buttons.cc
+            general.cc
+            init.cc
+            interface.cc
+            io.cc
+            io_usb.cc
+            lcd.cc
+            lights.cc
+            mode.cc
+            panner.cc
+            screen.cc
+            show.cc
+            state.cc
+            wheel.cc
+            wheel_modes.cc
+    '''
+    obj.export_incdirs = ['./tranzport']
+    obj.cxxflags     = '-DPACKAGE="ardour_tranzport"'
+    obj.includes     = ['.', './tranzport']
+    obj.name         = 'libardour_tranzport'
+    obj.target       = 'ardour_tranzport'
+    obj.uselib_local = 'libardour libardour_cp'
+    obj.vnum         = LIBARDOUR_TRANZPORT_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/surfaces/wiimote/wscript b/libs/surfaces/wiimote/wscript
index 8923df7015..3c4650ca9b 100644
--- a/libs/surfaces/wiimote/wscript
+++ b/libs/surfaces/wiimote/wscript
@@ -13,26 +13,25 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
+    autowaf.configure(conf)
 
 def build(bld):
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = '''
-        	wiimote.cc
-        	interface.cc
-        '''
-        obj.export_incdirs = ['./wiimote']
-        obj.cxxflags     = '-DPACKAGE="ardour_wiimote"'
-        obj.includes     = ['.', './wiimote']
-        obj.name         = 'libwiimote'
-        obj.target       = 'wiimote'
-        obj.uselib_local = 'libardour libardour_cp'
-        obj.vnum         = LIBARDOUR_WIIMOTE_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = '''
+            wiimote.cc
+            interface.cc
+    '''
+    obj.export_incdirs = ['./wiimote']
+    obj.cxxflags     = '-DPACKAGE="ardour_wiimote"'
+    obj.includes     = ['.', './wiimote']
+    obj.name         = 'libwiimote'
+    obj.target       = 'wiimote'
+    obj.uselib_local = 'libardour libardour_cp'
+    obj.vnum         = LIBARDOUR_WIIMOTE_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript
index 9bac418696..1b9d5c7091 100644
--- a/libs/surfaces/wscript
+++ b/libs/surfaces/wscript
@@ -31,47 +31,46 @@ children = [
 ]
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def sub_config_and_use(conf, name, has_objects = True):
-        conf.sub_config(name)
-        autowaf.set_local_lib(conf, name, has_objects)
+    conf.sub_config(name)
+    autowaf.set_local_lib(conf, name, has_objects)
 
 def configure(conf):
-        autowaf.set_recursive()
-        autowaf.configure(conf)
+    autowaf.set_recursive()
+    autowaf.configure(conf)
 
-        for i in children:
-        	sub_config_and_use(conf, i)
+    for i in children:
+        sub_config_and_use(conf, i)
 
-        conf.check_cc (lib='libusb', header_name='libusb.h', function_name='usb_interrupt_write', define_name='BUILD_TRANZPORT')
-        conf.check_cc (header_name='linux/input.h', define_name='BUILD_POWERMATE')
-        conf.check_cc (lib='lo', header_name='lo/lo.h', function_name='lo_server_new', define_name='BUILD_OSC')
-        
-        if Options.options.wiimote:
-        	conf.check_cc (header_name='cwiid.h',define_name='HAVE_CWIID_H')
-        	if not conf.env['HAVE_CWIID_H']:
-        		print('WIIMOTE configured but you are missing libcwiid!')
-        		sys.exit(1)
-        	conf.check_cc (header_name='bluetooth/bluetooth.h',define_name='HAVE_BLUETOOTH_H')
-        	if not conf.env['HAVE_BLUETOOTH_H']:
-        		print('WIIMOTE configured but you are missing the libbluetooth headers needed to compile wiimote support!')
-        		sys.exit(1)
-        	conf.define ('BUILD_WIIMOTE', 1)
+    conf.check_cc (lib='libusb', header_name='libusb.h', function_name='usb_interrupt_write', define_name='BUILD_TRANZPORT')
+    conf.check_cc (header_name='linux/input.h', define_name='BUILD_POWERMATE')
+    conf.check_cc (lib='lo', header_name='lo/lo.h', function_name='lo_server_new', define_name='BUILD_OSC')
+
+    if Options.options.wiimote:
+        conf.check_cc (header_name='cwiid.h',define_name='HAVE_CWIID_H')
+        if not conf.env['HAVE_CWIID_H']:
+            print('WIIMOTE configured but you are missing libcwiid!')
+            sys.exit(1)
+        conf.check_cc (header_name='bluetooth/bluetooth.h',define_name='HAVE_BLUETOOTH_H')
+        if not conf.env['HAVE_BLUETOOTH_H']:
+            print('WIIMOTE configured but you are missing the libbluetooth headers needed to compile wiimote support!')
+            sys.exit(1)
+        conf.define ('BUILD_WIIMOTE', 1)
 
 def build(bld):
-        bld.add_subdirs('control_protocol')
-        bld.add_subdirs('generic_midi')
-        bld.add_subdirs('mackie')
-        if bld.env['BUILD_OSC']:
-        	bld.add_subdirs('osc')
-        if bld.env['BUILD_POWERMATE']:
-        	bld.add_subdirs('powermate')
-        if bld.env['BUILD_WIIMOTE']:
-        	bld.add_subdirs('wiimote')
-        if bld.env['BUILD_TRANZPORT']:
-        	bld.add_subdirs('tranzport')
+    bld.add_subdirs('control_protocol')
+    bld.add_subdirs('generic_midi')
+    bld.add_subdirs('mackie')
+    if bld.env['BUILD_OSC']:
+        bld.add_subdirs('osc')
+    if bld.env['BUILD_POWERMATE']:
+        bld.add_subdirs('powermate')
+    if bld.env['BUILD_WIIMOTE']:
+        bld.add_subdirs('wiimote')
+    if bld.env['BUILD_TRANZPORT']:
+        bld.add_subdirs('tranzport')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/taglib/wscript b/libs/taglib/wscript
index 0732dc24ff..b7276d01c5 100644
--- a/libs/taglib/wscript
+++ b/libs/taglib/wscript
@@ -23,57 +23,56 @@ blddir = 'build'
 path_prefix = 'libs/taglib/'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
-        conf.check_tool('compiler_cxx')
+    autowaf.configure(conf)
+    conf.check_tool('compiler_cxx')
 
 def build(bld):
-        # Library
-        obj = bld.new_task_gen('cxx', 'shlib')
-        sources = glob.glob(path_prefix + 'taglib/*.cpp')
-        sources += glob.glob(path_prefix + 'taglib/flac/*.cpp')
-        sources += glob.glob(path_prefix + 'taglib/mpc/*.cpp')
-        sources += glob.glob(path_prefix + 'taglib/mpeg/*.cpp')
-        sources += glob.glob(path_prefix + 'taglib/mpeg/id3v1/*.cpp')
-        sources += glob.glob(path_prefix + 'taglib/mpeg/id3v2/*.cpp')
-        sources += glob.glob(path_prefix + 'taglib/mpeg/id3v2/frames/*.cpp')
-        sources += glob.glob(path_prefix + 'taglib/ogg/*.cpp')
-        sources += glob.glob(path_prefix + 'taglib/ogg/vorbis/*.cpp')
-        sources += glob.glob(path_prefix + 'taglib/ogg/speex/*.cpp')
-        sources += glob.glob(path_prefix + 'taglib/ogg/flac/*.cpp')
-        sources += glob.glob(path_prefix + 'taglib/trueaudio/*.cpp')
-        sources += glob.glob(path_prefix + 'taglib/wavpack/*.cpp')
-        sources += glob.glob(path_prefix + 'taglib/ape/*.cpp')
-        sources += glob.glob(path_prefix + 'taglib/toolkit/*.cpp')
-        obj.source = []
-        for i in sources:
-        	obj.source += [ i.replace(path_prefix, '') ]
+    # Library
+    obj = bld.new_task_gen('cxx', 'shlib')
+    sources = glob.glob(path_prefix + 'taglib/*.cpp')
+    sources += glob.glob(path_prefix + 'taglib/flac/*.cpp')
+    sources += glob.glob(path_prefix + 'taglib/mpc/*.cpp')
+    sources += glob.glob(path_prefix + 'taglib/mpeg/*.cpp')
+    sources += glob.glob(path_prefix + 'taglib/mpeg/id3v1/*.cpp')
+    sources += glob.glob(path_prefix + 'taglib/mpeg/id3v2/*.cpp')
+    sources += glob.glob(path_prefix + 'taglib/mpeg/id3v2/frames/*.cpp')
+    sources += glob.glob(path_prefix + 'taglib/ogg/*.cpp')
+    sources += glob.glob(path_prefix + 'taglib/ogg/vorbis/*.cpp')
+    sources += glob.glob(path_prefix + 'taglib/ogg/speex/*.cpp')
+    sources += glob.glob(path_prefix + 'taglib/ogg/flac/*.cpp')
+    sources += glob.glob(path_prefix + 'taglib/trueaudio/*.cpp')
+    sources += glob.glob(path_prefix + 'taglib/wavpack/*.cpp')
+    sources += glob.glob(path_prefix + 'taglib/ape/*.cpp')
+    sources += glob.glob(path_prefix + 'taglib/toolkit/*.cpp')
+    obj.source = []
+    for i in sources:
+        obj.source += [ i.replace(path_prefix, '') ]
 
-        include_dirs = '''
-        	taglib
-        	taglib/toolkit
-        	taglib/flac
-        	taglib/ape
-        	taglib/mpc
-        	taglib/mpeg
-        	taglib/mpeg/id3v1
-        	taglib/mpeg/id3v2
-        	taglib/wavpack
-        	taglib/trueaudio
-        	taglib/ogg
-        	taglib/ogg/vorbis
-        	taglib/ogg/speex
-        	taglib/ogg/flac
-        '''.split()
-        obj.export_incdirs = ['.', 'taglib', 'taglib/toolkit']
-        obj.includes     = include_dirs
-        obj.name         = 'libtaglib'
-        obj.target       = 'taglib'
-        obj.vnum         = LIBTAGLIB_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    include_dirs = '''
+            taglib
+            taglib/toolkit
+            taglib/flac
+            taglib/ape
+            taglib/mpc
+            taglib/mpeg
+            taglib/mpeg/id3v1
+            taglib/mpeg/id3v2
+            taglib/wavpack
+            taglib/trueaudio
+            taglib/ogg
+            taglib/ogg/vorbis
+            taglib/ogg/speex
+            taglib/ogg/flac
+    '''.split()
+    obj.export_incdirs = ['.', 'taglib', 'taglib/toolkit']
+    obj.includes     = include_dirs
+    obj.name         = 'libtaglib'
+    obj.target       = 'taglib'
+    obj.vnum         = LIBTAGLIB_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/timecode/wscript b/libs/timecode/wscript
index 4e5b12fc6e..be84a4b940 100644
--- a/libs/timecode/wscript
+++ b/libs/timecode/wscript
@@ -23,24 +23,23 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
+    autowaf.configure(conf)
 
-        conf.check_tool('compiler_cxx')
+    conf.check_tool('compiler_cxx')
 
 def build(bld):
-        # Library
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source         = [ 'src/time.cc', 'src/bbt_time.cc' ]
-        obj.export_incdirs = ['.']
-        obj.includes       = ['.', './src']
-        obj.name           = 'libtimecode'
-        obj.target         = 'timecode'
-        obj.vnum           = TIMECODE_LIB_VERSION
-        obj.install_path   = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    # Library
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source         = [ 'src/time.cc', 'src/bbt_time.cc' ]
+    obj.export_incdirs = ['.']
+    obj.includes       = ['.', './src']
+    obj.name           = 'libtimecode'
+    obj.target         = 'timecode'
+    obj.vnum           = TIMECODE_LIB_VERSION
+    obj.install_path   = os.path.join(bld.env['LIBDIR'], 'ardour3')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/vamp-plugins/wscript b/libs/vamp-plugins/wscript
index 99de270579..4fde44ea34 100644
--- a/libs/vamp-plugins/wscript
+++ b/libs/vamp-plugins/wscript
@@ -20,38 +20,37 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
-        conf.check_tool('compiler_cxx')
-        autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', mandatory=True)
-        autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', mandatory=False)
-        conf.write_config_header('libvampplugins-config.h')
+    autowaf.configure(conf)
+    conf.check_tool('compiler_cxx')
+    autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', mandatory=True)
+    autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', mandatory=False)
+    conf.write_config_header('libvampplugins-config.h')
 
 def build(bld):
-        # Library
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = '''
-        	plugins.cpp
-        	AmplitudeFollower.cpp
-        	OnsetDetect.cpp
-        	PercussionOnsetDetector.cpp
-        	SpectralCentroid.cpp
-        	ZeroCrossing.cpp
-        '''
-        obj.export_incdirs = ['.']
-        obj.includes     = ['.']
-        obj.name         = 'libardourvampplugins'
-        obj.target       = 'ardourvampplugins'
-        obj.uselib       = 'FFTW3F'
-        obj.uselib_local = 'libvampplugin libqmdsp'
-        if bld.env['HAVE_AUBIO']:
-        	obj.source += ' Onset.cpp '
-        	obj.uselib += ' AUBIO '
-        obj.vnum         = LIBARDOURVAMPPLUGINS_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'vamp')
+    # Library
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = '''
+            plugins.cpp
+            AmplitudeFollower.cpp
+            OnsetDetect.cpp
+            PercussionOnsetDetector.cpp
+            SpectralCentroid.cpp
+            ZeroCrossing.cpp
+    '''
+    obj.export_incdirs = ['.']
+    obj.includes     = ['.']
+    obj.name         = 'libardourvampplugins'
+    obj.target       = 'ardourvampplugins'
+    obj.uselib       = 'FFTW3F'
+    obj.uselib_local = 'libvampplugin libqmdsp'
+    if bld.env['HAVE_AUBIO']:
+        obj.source += ' Onset.cpp '
+        obj.uselib += ' AUBIO '
+    obj.vnum         = LIBARDOURVAMPPLUGINS_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'vamp')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/vamp-sdk/wscript b/libs/vamp-sdk/wscript
index d35e37b47e..7ea25d71b2 100644
--- a/libs/vamp-sdk/wscript
+++ b/libs/vamp-sdk/wscript
@@ -20,49 +20,48 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
-        conf.check_tool('compiler_cxx')
-        autowaf.check_pkg(conf, 'fftw3', uselib_store='FFTW3', mandatory=True)
-        autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', mandatory=True)
-        conf.env.append_value('CXXFLAGS', '-DHAVE_FFTW3')
+    autowaf.configure(conf)
+    conf.check_tool('compiler_cxx')
+    autowaf.check_pkg(conf, 'fftw3', uselib_store='FFTW3', mandatory=True)
+    autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', mandatory=True)
+    conf.env.append_value('CXXFLAGS', '-DHAVE_FFTW3')
 
 def build(bld):
-        # Host Library
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = '''
-        	src/vamp-hostsdk/PluginHostAdapter.cpp
-        	src/vamp-hostsdk/PluginBufferingAdapter.cpp
-        	src/vamp-hostsdk/PluginChannelAdapter.cpp
-        	src/vamp-hostsdk/PluginInputDomainAdapter.cpp
-        	src/vamp-hostsdk/PluginLoader.cpp
-        	src/vamp-hostsdk/PluginWrapper.cpp
-        	src/vamp-hostsdk/RealTime.cpp
-        '''
-        obj.export_incdirs = ['.']
-        obj.includes     = ['.']
-        obj.name         = 'libvamphost'
-        obj.target       = 'vamphost'
-        obj.uselib       = 'FFTW3 FFTW3F'
-        obj.vnum         = LIBVAMP_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    # Host Library
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = '''
+            src/vamp-hostsdk/PluginHostAdapter.cpp
+            src/vamp-hostsdk/PluginBufferingAdapter.cpp
+            src/vamp-hostsdk/PluginChannelAdapter.cpp
+            src/vamp-hostsdk/PluginInputDomainAdapter.cpp
+            src/vamp-hostsdk/PluginLoader.cpp
+            src/vamp-hostsdk/PluginWrapper.cpp
+            src/vamp-hostsdk/RealTime.cpp
+    '''
+    obj.export_incdirs = ['.']
+    obj.includes     = ['.']
+    obj.name         = 'libvamphost'
+    obj.target       = 'vamphost'
+    obj.uselib       = 'FFTW3 FFTW3F'
+    obj.vnum         = LIBVAMP_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
 
-        # Plugin Library
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = '''
-        	src/vamp-sdk/PluginAdapter.cpp
-        	src/vamp-sdk/RealTime.cpp
-        '''
-        obj.export_incdirs = ['.']
-        obj.includes     = ['.']
-        obj.name         = 'libvampplugin'
-        obj.target       = 'vampplugin'
-        obj.uselib       = 'FFTW3 FFTW3F'
-        obj.vnum         = LIBVAMP_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    # Plugin Library
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = '''
+            src/vamp-sdk/PluginAdapter.cpp
+            src/vamp-sdk/RealTime.cpp
+    '''
+    obj.export_incdirs = ['.']
+    obj.includes     = ['.']
+    obj.name         = 'libvampplugin'
+    obj.target       = 'vampplugin'
+    obj.uselib       = 'FFTW3 FFTW3F'
+    obj.vnum         = LIBVAMP_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()