From d220f477ed9d505d2b9d5934b043ad862a30bdb4 Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Mon, 24 Jan 2022 22:43:22 +0100 Subject: [PATCH] wscript: drop unused "mandatory variables" 'top' and 'out' in libs Variables by these names are only used from the local wscript and when running "waf configure", which already for other reasons only can run at the top-level. These variables are thus not mandatory and not used. --- gtk2_ardour/wscript | 3 --- headless/wscript | 4 ---- libs/ardour/wscript | 3 --- libs/ardouralsautil/wscript | 4 ---- libs/audiographer/wscript | 4 ---- libs/auscan/wscript | 4 ---- libs/backends/alsa/wscript | 4 ---- libs/backends/coreaudio/wscript | 4 ---- libs/backends/dummy/wscript | 4 ---- libs/backends/jack/wscript | 4 ---- libs/backends/portaudio/wscript | 4 ---- libs/backends/pulseaudio/wscript | 4 ---- libs/backends/wscript | 4 ---- libs/canvas/wscript | 4 ---- libs/clearlooks-newer/wscript | 3 --- libs/ctrl-interface/control_protocol/wscript | 4 ---- libs/evoral/wscript | 4 ---- libs/fluidsynth/wscript | 4 ---- libs/fst/wscript | 4 ---- libs/gtkmm2ext/wscript | 3 --- libs/hidapi/wscript | 4 ---- libs/libltc/wscript | 4 ---- libs/lua/wscript | 4 ---- libs/midi++2/wscript | 4 ---- libs/panners/1in2out/wscript | 4 ---- libs/panners/2in2out/wscript | 4 ---- libs/panners/stereobalance/wscript | 4 ---- libs/panners/vbap/wscript | 4 ---- libs/panners/wscript | 4 ---- libs/pbd/wscript | 4 ---- libs/plugins/a-comp.lv2/wscript | 4 ---- libs/plugins/a-delay.lv2/wscript | 4 ---- libs/plugins/a-eq.lv2/wscript | 4 ---- libs/plugins/a-exp.lv2/wscript | 4 ---- libs/plugins/a-fluidsynth.lv2/wscript | 4 ---- libs/plugins/a-reverb.lv2/wscript | 4 ---- libs/plugins/reasonablesynth.lv2/wscript | 4 ---- libs/ptformat/wscript | 4 ---- libs/qm-dsp/wscript | 4 ---- libs/surfaces/cc121/wscript | 4 ---- libs/surfaces/contourdesign/wscript | 4 ---- libs/surfaces/faderport/wscript | 4 ---- libs/surfaces/faderport8/wscript | 4 ---- libs/surfaces/frontier/wscript | 4 ---- libs/surfaces/generic_midi/wscript | 4 ---- libs/surfaces/launch_control_xl/wscript | 4 ---- libs/surfaces/mackie/wscript | 4 ---- libs/surfaces/maschine2/wscript | 4 ---- libs/surfaces/osc/wscript | 4 ---- libs/surfaces/push2/wscript | 4 ---- libs/surfaces/tranzport/wscript | 4 ---- libs/surfaces/us2400/wscript | 4 ---- libs/surfaces/websockets/wscript | 4 ---- libs/surfaces/wiimote/wscript | 4 ---- libs/surfaces/wscript | 4 ---- libs/temporal/wscript | 4 ---- libs/vamp-plugins/wscript | 4 ---- libs/vamp-pyin/wscript | 4 ---- libs/vfork/wscript | 4 ---- libs/waveview/wscript | 4 ---- libs/widgets/wscript | 4 ---- libs/zita-convolver/wscript | 4 ---- libs/zita-resampler/wscript | 4 ---- luasession/wscript | 3 --- session_utils/wscript | 4 ---- share/export/wscript | 3 --- share/mcp/wscript | 3 --- share/media/wscript | 3 --- share/midi_maps/wscript | 3 --- share/osc/wscript | 3 --- share/patchfiles/wscript | 3 --- share/plugin_metadata/wscript | 3 --- share/scripts/wscript | 3 --- tools/bb/wscript | 4 ---- tools/gccabicheck/wscript | 4 ---- tools/sanity_check/wscript | 4 ---- 76 files changed, 291 deletions(-) diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index c5624f3936..b9f5b0e498 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -8,9 +8,6 @@ import re import subprocess import glob -# Mandatory variables -out = 'build' - @TaskGen.extension('.m') def m_hook(self, node): """Alias .m files to be compiled the same as .c files, gcc will do the right thing.""" diff --git a/headless/wscript b/headless/wscript index 5ec47e7441..0c6ac9443b 100644 --- a/headless/wscript +++ b/headless/wscript @@ -3,10 +3,6 @@ from waflib.extras import autowaf as autowaf import os import sys -# Mandatory variables -top = '.' -out = 'build' - hardour_sources = [ 'load_session.cc', 'misc.cc', diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 5f084c3f72..209e5a12ed 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -9,9 +9,6 @@ CURRENT_SESSION_FILE_VERSION = 7002 I18N_PACKAGE = 'ardour' -# Mandatory variables -out = 'build' - path_prefix = 'libs/ardour/' libardour_sources = [ diff --git a/libs/ardouralsautil/wscript b/libs/ardouralsautil/wscript index ea7ad64b35..901c04af0b 100644 --- a/libs/ardouralsautil/wscript +++ b/libs/ardouralsautil/wscript @@ -5,10 +5,6 @@ import os import sys import re -# Mandatory variables -top = '.' -out = 'build' - path_prefix = 'libs/ardouralsautil/' def options(opt): diff --git a/libs/audiographer/wscript b/libs/audiographer/wscript index 3c63e7fff0..9a872691b4 100644 --- a/libs/audiographer/wscript +++ b/libs/audiographer/wscript @@ -13,10 +13,6 @@ AUDIOGRAPHER_VERSION = '0.0.0' # 0.0.0 = 0,0,0 AUDIOGRAPHER_LIB_VERSION = '0.0.0' -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/auscan/wscript b/libs/auscan/wscript index 75ab3ef35b..2a7864527e 100644 --- a/libs/auscan/wscript +++ b/libs/auscan/wscript @@ -2,10 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Mandatory variables -top = '.' -out = 'build' - # needed for code used from libardour I18N_PACKAGE = 'ardour' diff --git a/libs/backends/alsa/wscript b/libs/backends/alsa/wscript index 8a3fb81154..4f8203c418 100644 --- a/libs/backends/alsa/wscript +++ b/libs/backends/alsa/wscript @@ -4,10 +4,6 @@ import os I18N_PACKAGE = 'alsa-backend' -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/backends/coreaudio/wscript b/libs/backends/coreaudio/wscript index 55437f7a4b..2abafd8519 100644 --- a/libs/backends/coreaudio/wscript +++ b/libs/backends/coreaudio/wscript @@ -5,10 +5,6 @@ import os I18N_PACKAGE = 'coreaudio-backend' -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/backends/dummy/wscript b/libs/backends/dummy/wscript index 7ebb95c14d..402eb544e0 100644 --- a/libs/backends/dummy/wscript +++ b/libs/backends/dummy/wscript @@ -4,10 +4,6 @@ import os I18N_PACKAGE = 'dummy-backend' -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/backends/jack/wscript b/libs/backends/jack/wscript index 7d31b0d619..d523125d8d 100644 --- a/libs/backends/jack/wscript +++ b/libs/backends/jack/wscript @@ -7,10 +7,6 @@ import re I18N_PACKAGE = 'jack-backend' -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/backends/portaudio/wscript b/libs/backends/portaudio/wscript index cfb88c23f2..d4181e1129 100644 --- a/libs/backends/portaudio/wscript +++ b/libs/backends/portaudio/wscript @@ -4,10 +4,6 @@ import os I18N_PACKAGE = 'portaudio-backend' -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/backends/pulseaudio/wscript b/libs/backends/pulseaudio/wscript index 3deb08ef59..4512e7c2cf 100644 --- a/libs/backends/pulseaudio/wscript +++ b/libs/backends/pulseaudio/wscript @@ -4,10 +4,6 @@ import os I18N_PACKAGE = 'pulse-backend' -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/backends/wscript b/libs/backends/wscript index 1822550875..67ca2b01b8 100644 --- a/libs/backends/wscript +++ b/libs/backends/wscript @@ -1,10 +1,6 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/canvas/wscript b/libs/canvas/wscript index b705fcd8fd..1c671ab0c3 100644 --- a/libs/canvas/wscript +++ b/libs/canvas/wscript @@ -16,10 +16,6 @@ CANVAS_LIB_VERSION = '0.0.0' I18N_PACKAGE = 'libcanvas' -# Mandatory variables -top = '.' -out = 'build' - path_prefix = 'libs/canvas/' canvas_sources = [ diff --git a/libs/clearlooks-newer/wscript b/libs/clearlooks-newer/wscript index 93fda4daf1..4de0b39d35 100644 --- a/libs/clearlooks-newer/wscript +++ b/libs/clearlooks-newer/wscript @@ -3,9 +3,6 @@ from waflib.extras import autowaf as autowaf import os import sys -top = '.' -out = 'build' - path_prefix = 'libs/clearlooks-newer' def options(opt): diff --git a/libs/ctrl-interface/control_protocol/wscript b/libs/ctrl-interface/control_protocol/wscript index 9c2283f10f..078ff2b926 100644 --- a/libs/ctrl-interface/control_protocol/wscript +++ b/libs/ctrl-interface/control_protocol/wscript @@ -1,10 +1,6 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -# Mandatory variables -top = '.' -out = 'build' - controlcp_sources = [ 'basic_ui.cc', 'control_protocol.cc', diff --git a/libs/evoral/wscript b/libs/evoral/wscript index 7792d3d8ab..4a3f3cf260 100644 --- a/libs/evoral/wscript +++ b/libs/evoral/wscript @@ -16,10 +16,6 @@ EVORAL_LIB_VERSION = '0.0.0' APPNAME = 'evoral' -# Mandatory variables -top = '.' -out = 'build' - def options(opt): opt.load('compiler_c') opt.load('compiler_cxx') diff --git a/libs/fluidsynth/wscript b/libs/fluidsynth/wscript index 498166531d..3b49e98162 100644 --- a/libs/fluidsynth/wscript +++ b/libs/fluidsynth/wscript @@ -9,10 +9,6 @@ LIBFLUIDSYNTH_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO) I18N_PACKAGE = 'libfluidsynth' -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/fst/wscript b/libs/fst/wscript index d74b83a0d0..8717fafcd5 100644 --- a/libs/fst/wscript +++ b/libs/fst/wscript @@ -4,10 +4,6 @@ import os import sys import re -# Mandatory variables -top = '.' -out = 'build' - # needed for code used from libardour I18N_PACKAGE = 'ardour' diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript index 46fb15c5a5..3d306ecbb1 100644 --- a/libs/gtkmm2ext/wscript +++ b/libs/gtkmm2ext/wscript @@ -47,9 +47,6 @@ gtkmm2ext_sources = [ 'window_title.cc' ] -# Mandatory variables -out = 'build' - path_prefix = 'libs/gtkmm2ext/' def options(opt): diff --git a/libs/hidapi/wscript b/libs/hidapi/wscript index 60089c769a..422ae2340b 100644 --- a/libs/hidapi/wscript +++ b/libs/hidapi/wscript @@ -5,10 +5,6 @@ import sys HIDAPI_VERSION = '0.8.0' -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/libltc/wscript b/libs/libltc/wscript index 7a4b60ceff..18cf080080 100644 --- a/libs/libltc/wscript +++ b/libs/libltc/wscript @@ -15,10 +15,6 @@ LIBLTC_LIB_VERSION = '1.1.1' I18N_PACKAGE = 'libltc' -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/lua/wscript b/libs/lua/wscript index 6e54739b6f..8817e69337 100644 --- a/libs/lua/wscript +++ b/libs/lua/wscript @@ -3,10 +3,6 @@ from waflib.extras import autowaf as autowaf I18N_PACKAGE = 'liblua' -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript index 8f661b9161..d317b3c566 100644 --- a/libs/midi++2/wscript +++ b/libs/midi++2/wscript @@ -13,10 +13,6 @@ LIBMIDIPP_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO) # micro increment <=> no interface changes LIBMIDIPP_LIB_VERSION = '4.1.0' -# Mandatory variables -top = '.' -out = 'build' - path_prefix = 'libs/midi++2/' libmidi_sources = [ diff --git a/libs/panners/1in2out/wscript b/libs/panners/1in2out/wscript index 262dc7613e..2d7e0238ce 100644 --- a/libs/panners/1in2out/wscript +++ b/libs/panners/1in2out/wscript @@ -2,10 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/panners/2in2out/wscript b/libs/panners/2in2out/wscript index f09e4369c1..5fe9a7ea7d 100644 --- a/libs/panners/2in2out/wscript +++ b/libs/panners/2in2out/wscript @@ -2,10 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/panners/stereobalance/wscript b/libs/panners/stereobalance/wscript index 7cc81e9ca0..e9e7360c71 100644 --- a/libs/panners/stereobalance/wscript +++ b/libs/panners/stereobalance/wscript @@ -2,10 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/panners/vbap/wscript b/libs/panners/vbap/wscript index f590a015ca..bba071c580 100644 --- a/libs/panners/vbap/wscript +++ b/libs/panners/vbap/wscript @@ -2,10 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/panners/wscript b/libs/panners/wscript index a25e777bba..53869f41ac 100644 --- a/libs/panners/wscript +++ b/libs/panners/wscript @@ -1,10 +1,6 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/pbd/wscript b/libs/pbd/wscript index f3955eaad2..0464e1f8b7 100644 --- a/libs/pbd/wscript +++ b/libs/pbd/wscript @@ -19,10 +19,6 @@ LIBPBD_MAJOR_VERSION = '4' I18N_PACKAGE = 'libpbd4' -# Mandatory variables -top = '.' -out = 'build' - path_prefix = 'libs/pbd/' libpbd_sources = [ diff --git a/libs/plugins/a-comp.lv2/wscript b/libs/plugins/a-comp.lv2/wscript index 29a50d5fb5..5ca3c6fc61 100644 --- a/libs/plugins/a-comp.lv2/wscript +++ b/libs/plugins/a-comp.lv2/wscript @@ -3,10 +3,6 @@ import re import waflib.extras.autowaf as autowaf import waflib.Utils as Utils -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/plugins/a-delay.lv2/wscript b/libs/plugins/a-delay.lv2/wscript index 9def1bba5a..5e9d66c4de 100644 --- a/libs/plugins/a-delay.lv2/wscript +++ b/libs/plugins/a-delay.lv2/wscript @@ -3,10 +3,6 @@ import re import waflib.extras.autowaf as autowaf import waflib.Utils as Utils -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/plugins/a-eq.lv2/wscript b/libs/plugins/a-eq.lv2/wscript index a88d38dcce..c39e046276 100644 --- a/libs/plugins/a-eq.lv2/wscript +++ b/libs/plugins/a-eq.lv2/wscript @@ -3,10 +3,6 @@ import re import waflib.extras.autowaf as autowaf import waflib.Utils as Utils -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/plugins/a-exp.lv2/wscript b/libs/plugins/a-exp.lv2/wscript index e0393b0930..5ab34ae575 100644 --- a/libs/plugins/a-exp.lv2/wscript +++ b/libs/plugins/a-exp.lv2/wscript @@ -3,10 +3,6 @@ import re import waflib.extras.autowaf as autowaf import waflib.Utils as Utils -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/plugins/a-fluidsynth.lv2/wscript b/libs/plugins/a-fluidsynth.lv2/wscript index 40e39517e5..10038e7fef 100644 --- a/libs/plugins/a-fluidsynth.lv2/wscript +++ b/libs/plugins/a-fluidsynth.lv2/wscript @@ -3,10 +3,6 @@ import re import waflib.extras.autowaf as autowaf import waflib.Utils as Utils -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/plugins/a-reverb.lv2/wscript b/libs/plugins/a-reverb.lv2/wscript index ba757da88e..cf955726b2 100644 --- a/libs/plugins/a-reverb.lv2/wscript +++ b/libs/plugins/a-reverb.lv2/wscript @@ -3,10 +3,6 @@ import re import waflib.extras.autowaf as autowaf import waflib.Utils as Utils -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/plugins/reasonablesynth.lv2/wscript b/libs/plugins/reasonablesynth.lv2/wscript index 5ecda413c8..8a27dcb11c 100644 --- a/libs/plugins/reasonablesynth.lv2/wscript +++ b/libs/plugins/reasonablesynth.lv2/wscript @@ -3,10 +3,6 @@ import re import waflib.extras.autowaf as autowaf import waflib.Utils as Utils -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/ptformat/wscript b/libs/ptformat/wscript index b71a237aec..d34a4e27df 100644 --- a/libs/ptformat/wscript +++ b/libs/ptformat/wscript @@ -12,10 +12,6 @@ LIBPTFORMAT_LIB_VERSION = '0.0.0' I18N_PACKAGE = 'libptformat' -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/qm-dsp/wscript b/libs/qm-dsp/wscript index 6faf79af10..8440f36069 100644 --- a/libs/qm-dsp/wscript +++ b/libs/qm-dsp/wscript @@ -10,10 +10,6 @@ QM_DSP_VERSION = '1.7.1' # micro increment <=> no interface changes QM_DSP_LIB_VERSION = '1.7.1' -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/surfaces/cc121/wscript b/libs/surfaces/cc121/wscript index 6b6574c919..4412dd36c5 100644 --- a/libs/surfaces/cc121/wscript +++ b/libs/surfaces/cc121/wscript @@ -2,10 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/surfaces/contourdesign/wscript b/libs/surfaces/contourdesign/wscript index c582ac2e02..309dade419 100644 --- a/libs/surfaces/contourdesign/wscript +++ b/libs/surfaces/contourdesign/wscript @@ -2,10 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/surfaces/faderport/wscript b/libs/surfaces/faderport/wscript index a38ee983b2..b614ae56db 100644 --- a/libs/surfaces/faderport/wscript +++ b/libs/surfaces/faderport/wscript @@ -2,10 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/surfaces/faderport8/wscript b/libs/surfaces/faderport8/wscript index e04bf1f939..affafe1a0f 100644 --- a/libs/surfaces/faderport8/wscript +++ b/libs/surfaces/faderport8/wscript @@ -2,10 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Mandatory variables -top = '.' -out = 'build' - fp8_16_sources = [ 'faderport8.cc', 'fp8_controls.cc', diff --git a/libs/surfaces/frontier/wscript b/libs/surfaces/frontier/wscript index 111e723d2d..7909e2b705 100644 --- a/libs/surfaces/frontier/wscript +++ b/libs/surfaces/frontier/wscript @@ -2,10 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/surfaces/generic_midi/wscript b/libs/surfaces/generic_midi/wscript index 034ec1d496..28edcd0a9b 100644 --- a/libs/surfaces/generic_midi/wscript +++ b/libs/surfaces/generic_midi/wscript @@ -2,10 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/surfaces/launch_control_xl/wscript b/libs/surfaces/launch_control_xl/wscript index 4ac93a0757..36297506bd 100644 --- a/libs/surfaces/launch_control_xl/wscript +++ b/libs/surfaces/launch_control_xl/wscript @@ -2,10 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/surfaces/mackie/wscript b/libs/surfaces/mackie/wscript index 283974dc4e..2400cf740c 100644 --- a/libs/surfaces/mackie/wscript +++ b/libs/surfaces/mackie/wscript @@ -2,10 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Mandatory variables -top = '.' -out = 'build' - mackie_sources = [ 'button.cc', 'controls.cc', diff --git a/libs/surfaces/maschine2/wscript b/libs/surfaces/maschine2/wscript index 34f4e6d702..14c009d275 100644 --- a/libs/surfaces/maschine2/wscript +++ b/libs/surfaces/maschine2/wscript @@ -2,10 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript index c1d3348f71..d0effec434 100644 --- a/libs/surfaces/osc/wscript +++ b/libs/surfaces/osc/wscript @@ -2,10 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/surfaces/push2/wscript b/libs/surfaces/push2/wscript index 26a5f10a49..3f40fb4381 100644 --- a/libs/surfaces/push2/wscript +++ b/libs/surfaces/push2/wscript @@ -2,10 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/surfaces/tranzport/wscript b/libs/surfaces/tranzport/wscript index 3f94a6d794..57a5404f1c 100644 --- a/libs/surfaces/tranzport/wscript +++ b/libs/surfaces/tranzport/wscript @@ -2,10 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/surfaces/us2400/wscript b/libs/surfaces/us2400/wscript index df72af180a..6c7ba693ac 100644 --- a/libs/surfaces/us2400/wscript +++ b/libs/surfaces/us2400/wscript @@ -2,10 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/surfaces/websockets/wscript b/libs/surfaces/websockets/wscript index a9b839b07c..7c23e63579 100644 --- a/libs/surfaces/websockets/wscript +++ b/libs/surfaces/websockets/wscript @@ -2,10 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/surfaces/wiimote/wscript b/libs/surfaces/wiimote/wscript index 48abca02cb..3d12b7e6fd 100644 --- a/libs/surfaces/wiimote/wscript +++ b/libs/surfaces/wiimote/wscript @@ -2,10 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript index 75c4d7c55d..c51390284f 100644 --- a/libs/surfaces/wscript +++ b/libs/surfaces/wscript @@ -11,10 +11,6 @@ LIBSURFACES_VERSION = '4.1.0' # micro increment <=> no interface changes LIBSURFACES_LIB_VERSION = '4.1.0' -# Mandatory variables -top = '.' -out = 'build' - children = [ 'faderport', 'faderport8', diff --git a/libs/temporal/wscript b/libs/temporal/wscript index 821fccec85..7037e3b7f5 100644 --- a/libs/temporal/wscript +++ b/libs/temporal/wscript @@ -2,10 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Mandatory variables -top = '.' -out = 'build' - # Version of this package (even if built as a child) MAJOR = '0' MINOR = '0' diff --git a/libs/vamp-plugins/wscript b/libs/vamp-plugins/wscript index 7232eaae66..f77e2ff8d1 100644 --- a/libs/vamp-plugins/wscript +++ b/libs/vamp-plugins/wscript @@ -2,10 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/vamp-pyin/wscript b/libs/vamp-pyin/wscript index 019267e4c2..aa9b4f8c98 100644 --- a/libs/vamp-pyin/wscript +++ b/libs/vamp-pyin/wscript @@ -8,10 +8,6 @@ import os # micro increment <=> no interface changes VAMP_PYIN_LIB_VERSION = '0.0.0' -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/vfork/wscript b/libs/vfork/wscript index 0d71723dc8..67ee1b1514 100644 --- a/libs/vfork/wscript +++ b/libs/vfork/wscript @@ -2,10 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/waveview/wscript b/libs/waveview/wscript index 7cf2303050..fa1a0ed4d8 100644 --- a/libs/waveview/wscript +++ b/libs/waveview/wscript @@ -15,10 +15,6 @@ WAVEVIEW_LIB_VERSION = '0.0.0' I18N_PACKAGE = 'libwaveview' -# Mandatory variables -top = '.' -out = 'build' - waveview_sources = [ 'debug.cc', 'wave_view.cc', diff --git a/libs/widgets/wscript b/libs/widgets/wscript index 5ac5bbac92..c6e0130bb2 100644 --- a/libs/widgets/wscript +++ b/libs/widgets/wscript @@ -15,10 +15,6 @@ WIDGETS_LIB_VERSION = '0.0.0' I18N_PACKAGE = 'libwidgets' -# Mandatory variables -top = '.' -out = 'build' - widgets_sources = [ 'ardour_ctrl_base.cc', 'ardour_button.cc', diff --git a/libs/zita-convolver/wscript b/libs/zita-convolver/wscript index 3046ae04ad..22e16b6467 100644 --- a/libs/zita-convolver/wscript +++ b/libs/zita-convolver/wscript @@ -15,10 +15,6 @@ ZCONVOLVER_LIB_VERSION = '4.0.0' I18N_PACKAGE = 'libzita-convolver' -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/libs/zita-resampler/wscript b/libs/zita-resampler/wscript index 980f0a241d..eb2e8f50a7 100644 --- a/libs/zita-resampler/wscript +++ b/libs/zita-resampler/wscript @@ -15,10 +15,6 @@ ZRESAMPLER_LIB_VERSION = '1.6.0' I18N_PACKAGE = 'libzita-resampler' -# Mandatory variables -top = '.' -out = 'build' - zresampler_sources = [ 'resampler.cc', 'resampler-table.cc', diff --git a/luasession/wscript b/luasession/wscript index 422539468d..19fc3d94ee 100644 --- a/luasession/wscript +++ b/luasession/wscript @@ -4,9 +4,6 @@ import waflib.Utils as Utils import os import sys -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/session_utils/wscript b/session_utils/wscript index d63e9f07ae..19bc103e1a 100644 --- a/session_utils/wscript +++ b/session_utils/wscript @@ -4,10 +4,6 @@ import waflib.Utils as Utils import os import sys -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/share/export/wscript b/share/export/wscript index c7dab5a23d..ab614755d3 100644 --- a/share/export/wscript +++ b/share/export/wscript @@ -2,9 +2,6 @@ import os -top = '.' -out = 'build' - def configure(conf): pass diff --git a/share/mcp/wscript b/share/mcp/wscript index eed71a1b10..f104b13e45 100644 --- a/share/mcp/wscript +++ b/share/mcp/wscript @@ -2,9 +2,6 @@ import os -top = '.' -out = 'build' - def configure(conf): pass diff --git a/share/media/wscript b/share/media/wscript index df2dbd07a9..f3cd949475 100644 --- a/share/media/wscript +++ b/share/media/wscript @@ -2,9 +2,6 @@ import os -top = '.' -out = 'build' - def configure(conf): pass diff --git a/share/midi_maps/wscript b/share/midi_maps/wscript index 76f6d65e5b..5624631993 100644 --- a/share/midi_maps/wscript +++ b/share/midi_maps/wscript @@ -2,9 +2,6 @@ import os -top = '.' -out = 'build' - def configure(conf): pass diff --git a/share/osc/wscript b/share/osc/wscript index 2da25b787a..6c6257142a 100644 --- a/share/osc/wscript +++ b/share/osc/wscript @@ -2,9 +2,6 @@ import os -top = '.' -out = 'build' - def configure(conf): pass diff --git a/share/patchfiles/wscript b/share/patchfiles/wscript index a75175272e..173005f004 100644 --- a/share/patchfiles/wscript +++ b/share/patchfiles/wscript @@ -2,9 +2,6 @@ import os -top = '.' -out = 'build' - def configure(conf): pass diff --git a/share/plugin_metadata/wscript b/share/plugin_metadata/wscript index 04e2a14971..9b254e709a 100644 --- a/share/plugin_metadata/wscript +++ b/share/plugin_metadata/wscript @@ -2,9 +2,6 @@ import os -top = '.' -out = 'build' - def configure(conf): pass diff --git a/share/scripts/wscript b/share/scripts/wscript index 40cb43f489..62962bd405 100644 --- a/share/scripts/wscript +++ b/share/scripts/wscript @@ -2,9 +2,6 @@ import os -top = '.' -out = 'build' - def configure(conf): pass diff --git a/tools/bb/wscript b/tools/bb/wscript index b64ead9baa..2cd093a879 100644 --- a/tools/bb/wscript +++ b/tools/bb/wscript @@ -2,10 +2,6 @@ import waflib.Utils as Utils import os -# Mandatory variables -top = '.' -out = 'build' - def options(ctx): pass diff --git a/tools/gccabicheck/wscript b/tools/gccabicheck/wscript index 4183cbe0b7..088fc834c3 100644 --- a/tools/gccabicheck/wscript +++ b/tools/gccabicheck/wscript @@ -3,10 +3,6 @@ from waflib.extras import autowaf as autowaf import re import sys -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt) diff --git a/tools/sanity_check/wscript b/tools/sanity_check/wscript index 9e50f6fc3d..35d761384e 100644 --- a/tools/sanity_check/wscript +++ b/tools/sanity_check/wscript @@ -1,10 +1,6 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -# Mandatory variables -top = '.' -out = 'build' - def options(opt): autowaf.set_options(opt)