summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gtk2_ardour/wscript20
-rw-r--r--headless/wscript2
-rw-r--r--libs/ardour/wscript10
-rw-r--r--libs/backends/jack/wscript6
-rw-r--r--libs/backends/wscript2
-rw-r--r--libs/canvas/wscript8
-rw-r--r--libs/gtkmm2ext/wscript2
-rw-r--r--libs/midi++2/wscript2
-rw-r--r--libs/panners/wscript2
-rw-r--r--libs/pbd/wscript2
-rw-r--r--libs/surfaces/faderport/wscript2
-rw-r--r--libs/surfaces/wscript2
-rw-r--r--templates/wscript4
-rw-r--r--wscript2
14 files changed, 33 insertions, 33 deletions
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 89e19ae3cf..3cf500f040 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -349,7 +349,7 @@ def _doPyp(infileName, deps = False):
inLines = fd.readlines()
if fd != sys.stdin:
fd.close()
-
+
for line in inLines:
bits = re_spaces.split(line)
@@ -511,7 +511,7 @@ def build(bld):
obj.defines += [ 'WINDOWS_VST_SUPPORT' ]
if bld.env['build_target'] != 'mingw':
obj.use += [ 'X11' ]
-
+
if bld.is_defined('LXVST_SUPPORT'):
obj.source += [ 'linux_vst_gui_support.cc', 'lxvst_plugin_ui.cc' ]
obj.defines += [ 'LXVST_SUPPORT' ]
@@ -519,7 +519,7 @@ def build(bld):
if bld.is_defined('WINDOWS_VST_SUPPORT') or bld.is_defined('LXVST_SUPPORT'):
obj.source += [ 'vst_plugin_ui.cc' ]
-
+
if bld.is_defined('PHONE_HOME'):
obj.defines += [ 'PHONE_HOME' ]
@@ -590,9 +590,9 @@ def build(bld):
'HUGER' : '36',
'MASSIVE' : '60',
}
-
+
# There is no acceptable monospace font available on older versions of OS X
- # and no API on those versions to load TTF files that will work with
+ # and no API on those versions to load TTF files that will work with
# GTK/fontconfig/pango.
#
# In addition, the ArdourMono font gets clipped for some reason on OS X
@@ -632,9 +632,9 @@ def build(bld):
else:
key = "_".join (['FONT',sizename])
fontstyle = " ".join ([basefont,points])
-
+
font_subst_dict[key] = fontstyle
-
+
# @FONT_SIZE_XXXX@
for sizename,points in iter(font_sizes.items()):
key = "_".join (['FONT_SIZE',sizename])
@@ -719,7 +719,7 @@ def build(bld):
#
# explicitly state the use of perl here so that it works on windows too
- #
+ #
a_rule = 'perl ../tools/fmt-bindings --platform="%s" --winkey="%s" --accelmap <${SRC} >${TGT}' % (sys.platform, bld.env['WINDOWS_KEY'] )
for b in [ 'mnemonic-us' ] :
obj = bld(
@@ -769,7 +769,7 @@ def i18n(bld):
'Paul Davis')
appdata_i18n_pot(bld)
appdata_i18n_po(bld)
-
+
def i18n_pot(bld):
I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
autowaf.build_i18n_pot(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
@@ -781,7 +781,7 @@ def i18n_po(bld):
autowaf.build_i18n_po(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
'Paul Davis')
appdata_i18n_po(bld)
-
+
def i18n_mo(bld):
I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
autowaf.build_i18n_mo(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
diff --git a/headless/wscript b/headless/wscript
index 85e27879be..31a111bc80 100644
--- a/headless/wscript
+++ b/headless/wscript
@@ -32,7 +32,7 @@ def build(bld):
VERSION = "%s.%s" % (bld.env['MAJOR'], bld.env['MINOR'])
if bld.is_defined('WINDOWS_VST_SUPPORT') and bld.env['build_target'] != 'mingw':
return
-
+
# just the normal executable version of the GTK GUI
obj = bld (features = 'cxx c cxxprogram')
# this program does not do the whole hidden symbols thing
diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 262b10159a..ee84e39b79 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -339,7 +339,7 @@ def build(bld):
sources = list(libardour_sources)
if bld.is_tracks_build():
sources += [ 'engine_state_controller.cc' ]
-
+
# Library
if bld.is_defined ('INTERNAL_SHARED_LIBS'):
obj = bld.shlib(features = 'c cxx cshlib cxxshlib', source=sources)
@@ -424,12 +424,12 @@ def build(bld):
elif bld.env['build_target'] == 'mingw':
# usability of the 64 bit windows assembler depends on the compiler target,
# not the build host, which in turn can only be inferred from the name
- # of the compiler.
+ # of the compiler.
if re.search ('x86_64-w64', str(bld.env['CC'])):
obj.source += [ 'sse_functions_xmm.cc' ]
obj.source += [ 'sse_functions_64bit_win.s', 'sse_avx_functions_64bit_win.s' ]
avx_sources = [ 'sse_functions_avx.cc' ]
-
+
if avx_sources:
# as long as we want to use AVX intrinsics in this file,
# compile it with -mavx flag - append avx flag to the existing
@@ -442,9 +442,9 @@ def build(bld):
includes = [ '.' ],
use = [ 'libtimecode', 'libpbd', 'libevoral', ],
target = 'sse_avx_functions')
-
+
obj.use += ['sse_avx_functions' ]
-
+
# i18n
if bld.is_defined('ENABLE_NLS'):
mo_files = bld.path.ant_glob('po/*.mo')
diff --git a/libs/backends/jack/wscript b/libs/backends/jack/wscript
index a7f1570e05..17b4d160dc 100644
--- a/libs/backends/jack/wscript
+++ b/libs/backends/jack/wscript
@@ -62,7 +62,7 @@ def configure(conf):
def build(bld):
obj = bld(features = 'c cxx cxxshlib')
- obj.source = [
+ obj.source = [
'jack_api.cc',
'jack_connection.cc',
'jack_audiobackend.cc',
@@ -74,7 +74,7 @@ def build(bld):
obj.includes = ['.']
obj.name = 'jack_audiobackend'
obj.target = 'jack_audiobackend'
- obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"',
+ obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"',
'ARDOURBACKEND_DLL_EXPORTS'
]
obj.use = 'libardour libpbd ardouralsautil'
@@ -111,7 +111,7 @@ def build(bld):
#
# device discovery code in the jack backend needs ALSA
# on Linux.
- #
+ #
if re.search ("linux", sys.platform) != None:
obj.uselib += [ 'ALSA' ]
diff --git a/libs/backends/wscript b/libs/backends/wscript
index a504796980..833d831e27 100644
--- a/libs/backends/wscript
+++ b/libs/backends/wscript
@@ -19,7 +19,7 @@ def sub_config_and_use(conf, name, has_objects = True):
def configure(conf):
autowaf.set_recursive()
autowaf.configure(conf)
-
+
backends = conf.env['BACKENDS']
for i in backends:
sub_config_and_use(conf, i)
diff --git a/libs/canvas/wscript b/libs/canvas/wscript
index 67d26ea381..2a4cc0bf3a 100644
--- a/libs/canvas/wscript
+++ b/libs/canvas/wscript
@@ -81,7 +81,7 @@ def build(bld):
obj.cxxflags = [ '-fPIC' ]
obj.cflags = [ '-fPIC' ]
obj.defines = [ ]
-
+
obj.export_includes = ['.']
obj.includes = ['.']
obj.uselib = 'SIGCPP CAIROMM GTKMM BOOST'
@@ -91,7 +91,7 @@ def build(bld):
obj.vnum = CANVAS_LIB_VERSION
obj.install_path = bld.env['LIBDIR']
obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
-
+
if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:
manual_tests = '''
@@ -114,7 +114,7 @@ def build(bld):
manual_testobj.name = 'libcanvas-manual-test-%s' % name
manual_testobj.target = target
manual_testobj.install_path = ''
-
+
unit_testobj = bld.new_task_gen('cxx', 'program')
unit_testobj.source = '''
test/group.cc
@@ -139,7 +139,7 @@ def build(bld):
unit_testobj.cxxflags += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"']
unit_testobj.cxxflags += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"']
unit_testobj.cxxflags += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"']
-
+
benchmarks = '''
benchmark/items_at_point.cc
benchmark/render_parts.cc
diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index 1832d6a03e..89614bd63f 100644
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -124,7 +124,7 @@ def build(bld):
lang = os.path.basename(mo.srcpath()).replace('.mo', '')
bld.install_as (os.path.join(os.path.normpath(bld.env['LOCALEDIR']), lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'),
mo)
-
+
def i18n(bld):
autowaf.build_i18n(bld, top, 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources,
'Paul Davis')
diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript
index 9592e31a9a..10a37466e1 100644
--- a/libs/midi++2/wscript
+++ b/libs/midi++2/wscript
@@ -74,7 +74,7 @@ def build(bld):
obj.vnum = LIBMIDIPP_LIB_VERSION
obj.install_path = bld.env['LIBDIR']
- if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
+ if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
# Unit tests
obj = bld(features = 'cxx cxxprogram')
obj.source = '''
diff --git a/libs/panners/wscript b/libs/panners/wscript
index feedfa3074..3ee237f2f6 100644
--- a/libs/panners/wscript
+++ b/libs/panners/wscript
@@ -9,7 +9,7 @@ out = 'build'
def options(opt):
-
+
autowaf.set_options(opt)
def sub_config_and_use(conf, name, has_objects = True):
diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index c79b25732b..654d404634 100644
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -176,6 +176,6 @@ def build(bld):
testobj.defines = [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
if sys.platform != 'darwin' and bld.env['build_target'] != 'mingw':
testobj.linkflags = ['-lrt']
-
+
def shutdown():
autowaf.shutdown()
diff --git a/libs/surfaces/faderport/wscript b/libs/surfaces/faderport/wscript
index 4928c10c99..a0c3a2e160 100644
--- a/libs/surfaces/faderport/wscript
+++ b/libs/surfaces/faderport/wscript
@@ -18,7 +18,7 @@ def build(bld):
faderport.cc
gui.cc
faderport_interface.cc
- operations.cc
+ operations.cc
'''
obj.export_includes = ['.']
obj.defines = [ 'PACKAGE="ardour_faderport"' ]
diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript
index 5ab05cfb23..bc72446f69 100644
--- a/libs/surfaces/wscript
+++ b/libs/surfaces/wscript
@@ -38,7 +38,7 @@ def configure(conf):
autowaf.set_recursive()
autowaf.configure(conf)
-
+
#autowaf.check_pkg(conf, 'libusb-1.0', uselib_store='USB', mandatory=False)
#if Options.options.tranzport and conf.is_defined('HAVE_USB'):
# conf.define('BUILD_TRANZPORT', 1)
diff --git a/templates/wscript b/templates/wscript
index 3ea6c4a1e5..ab7e8d0768 100644
--- a/templates/wscript
+++ b/templates/wscript
@@ -8,9 +8,9 @@
# the user's hardware configuration. This makes any pre-existing
# templates potentially wrong/useless/annoying for anyone who
# uses a different hardware input configuration than was used
-# to create the templates.
+# to create the templates.
#
-# Templates should be created by the user, not by us.
+# Templates should be created by the user, not by us.
#
# I modified the code below, but have not tested it. For now
# this directory will be removed from the top level wscript's
diff --git a/wscript b/wscript
index f3fcafc188..cefe9998d9 100644
--- a/wscript
+++ b/wscript
@@ -936,7 +936,7 @@ int main () { int x = SFC_RF64_AUTO_DOWNGRADE; return 0; }
if have_rf64_riff_support:
conf.env.append_value('CXXFLAGS', "-DHAVE_RF64_RIFF")
conf.env.append_value('CFLAGS', "-DHAVE_RF64_RIFF")
-
+
if Options.options.dist_target == 'mingw':
Options.options.fpu_optimization = True
conf.env.append_value('CFLAGS', '-DPLATFORM_WINDOWS')