From 88cecdfaef15682c6f8ca7236de686a15330f01e Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Tue, 25 Jan 2022 17:43:36 +0100 Subject: [PATCH] wscript: drop repeated autowaf.set_options - it is enough to set at top level --- gtk2_ardour/wscript | 2 +- headless/wscript | 3 +-- libs/appleutility/wscript | 2 +- libs/ardour/wscript | 2 +- libs/ardouralsautil/wscript | 2 +- libs/audiographer/wscript | 2 +- libs/auscan/wscript | 3 +-- libs/backends/alsa/wscript | 3 +-- libs/backends/coreaudio/wscript | 3 +-- libs/backends/dummy/wscript | 3 +-- libs/backends/jack/wscript | 2 +- libs/backends/portaudio/wscript | 2 +- libs/backends/pulseaudio/wscript | 3 +-- libs/backends/wscript | 2 +- libs/canvas/wscript | 2 +- libs/clearlooks-newer/wscript | 2 +- libs/ctrl-interface/control_protocol/wscript | 2 +- libs/ctrl-interface/midi_surface/wscript | 2 +- libs/ctrl-interface/wscript | 2 +- libs/evoral/wscript | 1 - libs/fluidsynth/wscript | 2 +- libs/fst/wscript | 3 +-- libs/gtkmm2ext/wscript | 2 +- libs/hidapi/wscript | 2 +- libs/libltc/wscript | 2 +- libs/lua/wscript | 2 +- libs/midi++2/wscript | 1 - libs/panners/1in2out/wscript | 2 +- libs/panners/2in2out/wscript | 2 +- libs/panners/stereobalance/wscript | 2 +- libs/panners/vbap/wscript | 2 +- libs/panners/wscript | 3 +-- libs/pbd/wscript | 1 - libs/plugins/a-comp.lv2/wscript | 2 +- libs/plugins/a-delay.lv2/wscript | 2 +- libs/plugins/a-eq.lv2/wscript | 2 +- libs/plugins/a-exp.lv2/wscript | 2 +- libs/plugins/a-fluidsynth.lv2/wscript | 2 +- libs/plugins/a-reverb.lv2/wscript | 2 +- libs/plugins/reasonablesynth.lv2/wscript | 2 +- libs/ptformat/wscript | 2 +- libs/qm-dsp/wscript | 2 +- libs/surfaces/cc121/wscript | 2 +- libs/surfaces/console1/wscript | 2 +- libs/surfaces/contourdesign/wscript | 2 +- libs/surfaces/faderport/wscript | 2 +- libs/surfaces/faderport8/wscript | 2 +- libs/surfaces/frontier/wscript | 2 +- libs/surfaces/generic_midi/wscript | 2 +- libs/surfaces/launch_control_xl/wscript | 2 +- libs/surfaces/launchpad_pro/wscript | 2 +- libs/surfaces/mackie/wscript | 2 +- libs/surfaces/maschine2/wscript | 2 +- libs/surfaces/osc/wscript | 2 +- libs/surfaces/push2/wscript | 2 +- libs/surfaces/tranzport/wscript | 2 +- libs/surfaces/us2400/wscript | 2 +- libs/surfaces/websockets/wscript | 2 +- libs/surfaces/wiimote/wscript | 2 +- libs/surfaces/wscript | 2 +- libs/temporal/wscript | 2 +- libs/vamp-plugins/wscript | 2 +- libs/vamp-pyin/wscript | 2 +- libs/vfork/wscript | 3 +-- libs/waveview/wscript | 2 +- libs/widgets/wscript | 2 +- libs/zita-convolver/wscript | 2 +- libs/zita-resampler/wscript | 2 +- luasession/wscript | 3 +-- session_utils/wscript | 2 +- tools/gccabicheck/wscript | 3 +-- tools/sanity_check/wscript | 3 +-- 72 files changed, 69 insertions(+), 84 deletions(-) diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 0c97d33542..fed019a5e4 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -431,7 +431,7 @@ def enoify (major, minor): return "\\\"\\\"" def options(opt): - autowaf.set_options(opt) + pass def configure(conf): conf.load('misc') diff --git a/headless/wscript b/headless/wscript index 0c6ac9443b..8fce49f78b 100644 --- a/headless/wscript +++ b/headless/wscript @@ -1,5 +1,4 @@ #!/usr/bin/env python -from waflib.extras import autowaf as autowaf import os import sys @@ -9,7 +8,7 @@ hardour_sources = [ ] def options(opt): - autowaf.set_options(opt) + pass def configure(conf): conf.load('misc') diff --git a/libs/appleutility/wscript b/libs/appleutility/wscript index 8301c7155e..e67875e13b 100644 --- a/libs/appleutility/wscript +++ b/libs/appleutility/wscript @@ -22,7 +22,7 @@ libappleutility_sources = [ ] def options(opt): - autowaf.set_options(opt) + pass def configure(conf): if conf.env['build_target'] in ['panther', 'tiger', 'leopard'] or (Options.options.ppc and conf.env['build_target'] == 'snowleopard'): diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 9326d0a979..240c07f4ad 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -277,7 +277,7 @@ libardour_sources = [ ] def options(opt): - autowaf.set_options(opt) + pass def configure(conf): conf.load('gas') diff --git a/libs/ardouralsautil/wscript b/libs/ardouralsautil/wscript index b682d3473c..bbf4840261 100644 --- a/libs/ardouralsautil/wscript +++ b/libs/ardouralsautil/wscript @@ -6,7 +6,7 @@ import sys import re def options(opt): - autowaf.set_options(opt) + pass def configure(conf): if re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw': diff --git a/libs/audiographer/wscript b/libs/audiographer/wscript index 9a872691b4..83e497d806 100644 --- a/libs/audiographer/wscript +++ b/libs/audiographer/wscript @@ -14,7 +14,7 @@ AUDIOGRAPHER_VERSION = '0.0.0' AUDIOGRAPHER_LIB_VERSION = '0.0.0' def options(opt): - autowaf.set_options(opt) + pass def configure(conf): diff --git a/libs/auscan/wscript b/libs/auscan/wscript index 2a7864527e..0e2bc35687 100644 --- a/libs/auscan/wscript +++ b/libs/auscan/wscript @@ -1,12 +1,11 @@ #!/usr/bin/env python -from waflib.extras import autowaf as autowaf import os # needed for code used from libardour I18N_PACKAGE = 'ardour' def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/backends/alsa/wscript b/libs/backends/alsa/wscript index 4f8203c418..7019e70084 100644 --- a/libs/backends/alsa/wscript +++ b/libs/backends/alsa/wscript @@ -1,11 +1,10 @@ #!/usr/bin/env python -from waflib.extras import autowaf as autowaf import os I18N_PACKAGE = 'alsa-backend' def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/backends/coreaudio/wscript b/libs/backends/coreaudio/wscript index 2abafd8519..2e3bc26e05 100644 --- a/libs/backends/coreaudio/wscript +++ b/libs/backends/coreaudio/wscript @@ -1,12 +1,11 @@ #!/usr/bin/env python -from waflib.extras import autowaf as autowaf from waflib import Options import os I18N_PACKAGE = 'coreaudio-backend' def options(opt): - autowaf.set_options(opt) + pass def configure(conf): if Options.options.ppc: diff --git a/libs/backends/dummy/wscript b/libs/backends/dummy/wscript index 402eb544e0..7ef23d9343 100644 --- a/libs/backends/dummy/wscript +++ b/libs/backends/dummy/wscript @@ -1,11 +1,10 @@ #!/usr/bin/env python -from waflib.extras import autowaf as autowaf import os I18N_PACKAGE = 'dummy-backend' def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/backends/jack/wscript b/libs/backends/jack/wscript index d523125d8d..dcbe85a583 100644 --- a/libs/backends/jack/wscript +++ b/libs/backends/jack/wscript @@ -8,7 +8,7 @@ import re I18N_PACKAGE = 'jack-backend' def options(opt): - autowaf.set_options(opt) + pass def configure(conf): autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.121.0') diff --git a/libs/backends/portaudio/wscript b/libs/backends/portaudio/wscript index d4181e1129..6c004ee803 100644 --- a/libs/backends/portaudio/wscript +++ b/libs/backends/portaudio/wscript @@ -5,7 +5,7 @@ import os I18N_PACKAGE = 'portaudio-backend' def options(opt): - autowaf.set_options(opt) + pass def configure(conf): autowaf.check_pkg(conf, 'portaudio-2.0', uselib_store='PORTAUDIO', atleast_version='19') diff --git a/libs/backends/pulseaudio/wscript b/libs/backends/pulseaudio/wscript index 4512e7c2cf..ec0e1a91c4 100644 --- a/libs/backends/pulseaudio/wscript +++ b/libs/backends/pulseaudio/wscript @@ -1,11 +1,10 @@ #!/usr/bin/env python -from waflib.extras import autowaf as autowaf import os I18N_PACKAGE = 'pulse-backend' def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/backends/wscript b/libs/backends/wscript index 67ca2b01b8..2bf8c397ed 100644 --- a/libs/backends/wscript +++ b/libs/backends/wscript @@ -2,7 +2,7 @@ from waflib.extras import autowaf as autowaf def options(opt): - autowaf.set_options(opt) + pass def sub_config_and_use(conf, name, has_objects = True): conf.recurse(name) diff --git a/libs/canvas/wscript b/libs/canvas/wscript index 12003adf9e..7eb14322ad 100644 --- a/libs/canvas/wscript +++ b/libs/canvas/wscript @@ -58,7 +58,7 @@ canvas_sources = [ ] def options(opt): - autowaf.set_options(opt) + pass def configure(conf): autowaf.check_pkg(conf, 'cairomm-1.0', uselib_store='CAIROMM', atleast_version='1.8.4') diff --git a/libs/clearlooks-newer/wscript b/libs/clearlooks-newer/wscript index fb3c9bd1e3..ef0596c038 100644 --- a/libs/clearlooks-newer/wscript +++ b/libs/clearlooks-newer/wscript @@ -4,7 +4,7 @@ import os import sys def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/ctrl-interface/control_protocol/wscript b/libs/ctrl-interface/control_protocol/wscript index 078ff2b926..049ae0aada 100644 --- a/libs/ctrl-interface/control_protocol/wscript +++ b/libs/ctrl-interface/control_protocol/wscript @@ -7,7 +7,7 @@ controlcp_sources = [ ] def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/ctrl-interface/midi_surface/wscript b/libs/ctrl-interface/midi_surface/wscript index b7ff5fa8b3..00b3baa514 100644 --- a/libs/ctrl-interface/midi_surface/wscript +++ b/libs/ctrl-interface/midi_surface/wscript @@ -2,7 +2,7 @@ from waflib.extras import autowaf as autowaf def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/ctrl-interface/wscript b/libs/ctrl-interface/wscript index d12bfeb82e..1243058078 100644 --- a/libs/ctrl-interface/wscript +++ b/libs/ctrl-interface/wscript @@ -7,7 +7,7 @@ children = [ ] def options(opt): - autowaf.set_options(opt) + pass def sub_config_and_use(conf, name, has_objects = True): conf.recurse(name) diff --git a/libs/evoral/wscript b/libs/evoral/wscript index 5eede834fa..31f1ddfcb1 100644 --- a/libs/evoral/wscript +++ b/libs/evoral/wscript @@ -17,7 +17,6 @@ EVORAL_LIB_VERSION = '0.0.0' APPNAME = 'evoral' def options(opt): - autowaf.set_options(opt) opt.add_option('--test', action='store_true', default=False, dest='build_tests', help="Build unit tests") opt.add_option('--test-coverage', action='store_true', default=False, dest='test_coverage', diff --git a/libs/fluidsynth/wscript b/libs/fluidsynth/wscript index 3b49e98162..8cee351f46 100644 --- a/libs/fluidsynth/wscript +++ b/libs/fluidsynth/wscript @@ -10,7 +10,7 @@ LIBFLUIDSYNTH_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO) I18N_PACKAGE = 'libfluidsynth' def options(opt): - autowaf.set_options(opt) + pass def configure(conf): if conf.is_defined('USE_EXTERNAL_LIBS'): diff --git a/libs/fst/wscript b/libs/fst/wscript index 8717fafcd5..bad18f06c9 100644 --- a/libs/fst/wscript +++ b/libs/fst/wscript @@ -1,5 +1,4 @@ #!/usr/bin/env python -from waflib.extras import autowaf as autowaf import os import sys import re @@ -8,7 +7,7 @@ import re I18N_PACKAGE = 'ardour' def options(opt): - autowaf.set_options(opt) + pass def configure(conf): conf.load('misc') diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript index 72766d15dd..2854cd4e62 100644 --- a/libs/gtkmm2ext/wscript +++ b/libs/gtkmm2ext/wscript @@ -48,7 +48,7 @@ gtkmm2ext_sources = [ ] def options(opt): - autowaf.set_options(opt) + pass def configure(conf): autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.8') diff --git a/libs/hidapi/wscript b/libs/hidapi/wscript index 422ae2340b..07cf0da898 100644 --- a/libs/hidapi/wscript +++ b/libs/hidapi/wscript @@ -6,7 +6,7 @@ import sys HIDAPI_VERSION = '0.8.0' def options(opt): - autowaf.set_options(opt) + pass def configure(conf): if conf.is_defined('USE_EXTERNAL_LIBS'): diff --git a/libs/libltc/wscript b/libs/libltc/wscript index 18cf080080..f6b6530e72 100644 --- a/libs/libltc/wscript +++ b/libs/libltc/wscript @@ -16,7 +16,7 @@ LIBLTC_LIB_VERSION = '1.1.1' I18N_PACKAGE = 'libltc' def options(opt): - autowaf.set_options(opt) + pass def configure(conf): if conf.is_defined('USE_EXTERNAL_LIBS'): diff --git a/libs/lua/wscript b/libs/lua/wscript index 8817e69337..d3c50e2b17 100644 --- a/libs/lua/wscript +++ b/libs/lua/wscript @@ -4,7 +4,7 @@ from waflib.extras import autowaf as autowaf I18N_PACKAGE = 'liblua' def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript index 0ec3a9eafe..034f9452e7 100644 --- a/libs/midi++2/wscript +++ b/libs/midi++2/wscript @@ -25,7 +25,6 @@ libmidi_sources = [ ] def options(opt): - autowaf.set_options(opt) opt.add_option('--test', action='store_true', default=False, dest='build_tests', help="Build unit tests") diff --git a/libs/panners/1in2out/wscript b/libs/panners/1in2out/wscript index 2d7e0238ce..6b2c32a5cb 100644 --- a/libs/panners/1in2out/wscript +++ b/libs/panners/1in2out/wscript @@ -3,7 +3,7 @@ from waflib.extras import autowaf as autowaf import os def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/panners/2in2out/wscript b/libs/panners/2in2out/wscript index 5fe9a7ea7d..3f4bb5a99d 100644 --- a/libs/panners/2in2out/wscript +++ b/libs/panners/2in2out/wscript @@ -3,7 +3,7 @@ from waflib.extras import autowaf as autowaf import os def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/panners/stereobalance/wscript b/libs/panners/stereobalance/wscript index e9e7360c71..1ae4f6193d 100644 --- a/libs/panners/stereobalance/wscript +++ b/libs/panners/stereobalance/wscript @@ -3,7 +3,7 @@ from waflib.extras import autowaf as autowaf import os def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/panners/vbap/wscript b/libs/panners/vbap/wscript index bba071c580..046e61b59b 100644 --- a/libs/panners/vbap/wscript +++ b/libs/panners/vbap/wscript @@ -3,7 +3,7 @@ from waflib.extras import autowaf as autowaf import os def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/panners/wscript b/libs/panners/wscript index 53869f41ac..77133aeb6e 100644 --- a/libs/panners/wscript +++ b/libs/panners/wscript @@ -2,8 +2,7 @@ from waflib.extras import autowaf as autowaf def options(opt): - - autowaf.set_options(opt) + pass def sub_config_and_use(conf, name, has_objects = True): conf.recurse(name) diff --git a/libs/pbd/wscript b/libs/pbd/wscript index ef194f402d..06b285c79d 100644 --- a/libs/pbd/wscript +++ b/libs/pbd/wscript @@ -87,7 +87,6 @@ libpbd_sources = [ ] def options(opt): - autowaf.set_options(opt) opt.add_option('--ppc', action='store_true', default=False, dest='ppc', help='Compile with -arch ppc (OS X ONLY)') opt.add_option('--dist-target', type='string', default='auto', dest='dist_target', diff --git a/libs/plugins/a-comp.lv2/wscript b/libs/plugins/a-comp.lv2/wscript index 5ca3c6fc61..8eac42589b 100644 --- a/libs/plugins/a-comp.lv2/wscript +++ b/libs/plugins/a-comp.lv2/wscript @@ -4,7 +4,7 @@ import waflib.extras.autowaf as autowaf import waflib.Utils as Utils def options(opt): - autowaf.set_options(opt) + pass def configure(conf): autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', diff --git a/libs/plugins/a-delay.lv2/wscript b/libs/plugins/a-delay.lv2/wscript index 5e9d66c4de..1de15d7b1a 100644 --- a/libs/plugins/a-delay.lv2/wscript +++ b/libs/plugins/a-delay.lv2/wscript @@ -4,7 +4,7 @@ import waflib.extras.autowaf as autowaf import waflib.Utils as Utils def options(opt): - autowaf.set_options(opt) + pass def configure(conf): autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', diff --git a/libs/plugins/a-eq.lv2/wscript b/libs/plugins/a-eq.lv2/wscript index c39e046276..8f02bbd72b 100644 --- a/libs/plugins/a-eq.lv2/wscript +++ b/libs/plugins/a-eq.lv2/wscript @@ -4,7 +4,7 @@ import waflib.extras.autowaf as autowaf import waflib.Utils as Utils def options(opt): - autowaf.set_options(opt) + pass def configure(conf): autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', diff --git a/libs/plugins/a-exp.lv2/wscript b/libs/plugins/a-exp.lv2/wscript index 5ab34ae575..f8fc90043b 100644 --- a/libs/plugins/a-exp.lv2/wscript +++ b/libs/plugins/a-exp.lv2/wscript @@ -4,7 +4,7 @@ import waflib.extras.autowaf as autowaf import waflib.Utils as Utils def options(opt): - autowaf.set_options(opt) + pass def configure(conf): autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', diff --git a/libs/plugins/a-fluidsynth.lv2/wscript b/libs/plugins/a-fluidsynth.lv2/wscript index 10038e7fef..56e8550d0c 100644 --- a/libs/plugins/a-fluidsynth.lv2/wscript +++ b/libs/plugins/a-fluidsynth.lv2/wscript @@ -4,7 +4,7 @@ import waflib.extras.autowaf as autowaf import waflib.Utils as Utils def options(opt): - autowaf.set_options(opt) + pass def configure(conf): autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', diff --git a/libs/plugins/a-reverb.lv2/wscript b/libs/plugins/a-reverb.lv2/wscript index cf955726b2..62689e1f38 100644 --- a/libs/plugins/a-reverb.lv2/wscript +++ b/libs/plugins/a-reverb.lv2/wscript @@ -4,7 +4,7 @@ import waflib.extras.autowaf as autowaf import waflib.Utils as Utils def options(opt): - autowaf.set_options(opt) + pass def configure(conf): autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', diff --git a/libs/plugins/reasonablesynth.lv2/wscript b/libs/plugins/reasonablesynth.lv2/wscript index 8a27dcb11c..b197bb14a4 100644 --- a/libs/plugins/reasonablesynth.lv2/wscript +++ b/libs/plugins/reasonablesynth.lv2/wscript @@ -4,7 +4,7 @@ import waflib.extras.autowaf as autowaf import waflib.Utils as Utils def options(opt): - autowaf.set_options(opt) + pass def configure(conf): autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', diff --git a/libs/ptformat/wscript b/libs/ptformat/wscript index d34a4e27df..377f3f0998 100644 --- a/libs/ptformat/wscript +++ b/libs/ptformat/wscript @@ -13,7 +13,7 @@ LIBPTFORMAT_LIB_VERSION = '0.0.0' I18N_PACKAGE = 'libptformat' def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/qm-dsp/wscript b/libs/qm-dsp/wscript index 93bdfb63ad..536b09c437 100644 --- a/libs/qm-dsp/wscript +++ b/libs/qm-dsp/wscript @@ -11,7 +11,7 @@ QM_DSP_VERSION = '1.7.1' QM_DSP_LIB_VERSION = '1.7.1' def options(opt): - autowaf.set_options(opt) + pass def configure(conf): if conf.is_defined('USE_EXTERNAL_LIBS'): diff --git a/libs/surfaces/cc121/wscript b/libs/surfaces/cc121/wscript index 4412dd36c5..f6f87cd409 100644 --- a/libs/surfaces/cc121/wscript +++ b/libs/surfaces/cc121/wscript @@ -3,7 +3,7 @@ from waflib.extras import autowaf as autowaf import os def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/surfaces/console1/wscript b/libs/surfaces/console1/wscript index 5ac0428ccc..83362f7c72 100644 --- a/libs/surfaces/console1/wscript +++ b/libs/surfaces/console1/wscript @@ -3,7 +3,7 @@ from waflib.extras import autowaf as autowaf import os def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/surfaces/contourdesign/wscript b/libs/surfaces/contourdesign/wscript index 309dade419..2dd5b2a0b1 100644 --- a/libs/surfaces/contourdesign/wscript +++ b/libs/surfaces/contourdesign/wscript @@ -3,7 +3,7 @@ from waflib.extras import autowaf as autowaf import os def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/surfaces/faderport/wscript b/libs/surfaces/faderport/wscript index b614ae56db..2a90782a9e 100644 --- a/libs/surfaces/faderport/wscript +++ b/libs/surfaces/faderport/wscript @@ -3,7 +3,7 @@ from waflib.extras import autowaf as autowaf import os def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/surfaces/faderport8/wscript b/libs/surfaces/faderport8/wscript index affafe1a0f..b77bb15a92 100644 --- a/libs/surfaces/faderport8/wscript +++ b/libs/surfaces/faderport8/wscript @@ -12,7 +12,7 @@ fp8_16_sources = [ ] def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/surfaces/frontier/wscript b/libs/surfaces/frontier/wscript index 7909e2b705..995c08c79e 100644 --- a/libs/surfaces/frontier/wscript +++ b/libs/surfaces/frontier/wscript @@ -3,7 +3,7 @@ from waflib.extras import autowaf as autowaf import os def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/surfaces/generic_midi/wscript b/libs/surfaces/generic_midi/wscript index 28edcd0a9b..c9bd879340 100644 --- a/libs/surfaces/generic_midi/wscript +++ b/libs/surfaces/generic_midi/wscript @@ -3,7 +3,7 @@ from waflib.extras import autowaf as autowaf import os def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/surfaces/launch_control_xl/wscript b/libs/surfaces/launch_control_xl/wscript index 36297506bd..9fe13ee19d 100644 --- a/libs/surfaces/launch_control_xl/wscript +++ b/libs/surfaces/launch_control_xl/wscript @@ -3,7 +3,7 @@ from waflib.extras import autowaf as autowaf import os def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/surfaces/launchpad_pro/wscript b/libs/surfaces/launchpad_pro/wscript index 0ddbe40350..d465920eca 100644 --- a/libs/surfaces/launchpad_pro/wscript +++ b/libs/surfaces/launchpad_pro/wscript @@ -3,7 +3,7 @@ from waflib.extras import autowaf as autowaf import os def options(opt): - autowaf.set_options(opt) + pass def configure(conf): autowaf.check_pkg(conf, 'pangomm-1.4', uselib_store='PANGOMM', atleast_version='1.4', mandatory=True) diff --git a/libs/surfaces/mackie/wscript b/libs/surfaces/mackie/wscript index 2400cf740c..bf387c4893 100644 --- a/libs/surfaces/mackie/wscript +++ b/libs/surfaces/mackie/wscript @@ -25,7 +25,7 @@ mackie_sources = [ ] def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/surfaces/maschine2/wscript b/libs/surfaces/maschine2/wscript index 14c009d275..abef757bc3 100644 --- a/libs/surfaces/maschine2/wscript +++ b/libs/surfaces/maschine2/wscript @@ -3,7 +3,7 @@ from waflib.extras import autowaf as autowaf import os def options(opt): - autowaf.set_options(opt) + pass def configure(conf): autowaf.check_pkg(conf, 'pangomm-1.4', uselib_store='PANGOMM', atleast_version='1.4', mandatory=True) diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript index d0effec434..54010acc7e 100644 --- a/libs/surfaces/osc/wscript +++ b/libs/surfaces/osc/wscript @@ -3,7 +3,7 @@ from waflib.extras import autowaf as autowaf import os def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/surfaces/push2/wscript b/libs/surfaces/push2/wscript index 3f40fb4381..a3c57989ce 100644 --- a/libs/surfaces/push2/wscript +++ b/libs/surfaces/push2/wscript @@ -3,7 +3,7 @@ from waflib.extras import autowaf as autowaf import os def options(opt): - autowaf.set_options(opt) + pass def configure(conf): autowaf.check_pkg(conf, 'pangomm-1.4', uselib_store='PANGOMM', atleast_version='1.4', mandatory=True) diff --git a/libs/surfaces/tranzport/wscript b/libs/surfaces/tranzport/wscript index 57a5404f1c..07206ca46f 100644 --- a/libs/surfaces/tranzport/wscript +++ b/libs/surfaces/tranzport/wscript @@ -3,7 +3,7 @@ from waflib.extras import autowaf as autowaf import os def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/surfaces/us2400/wscript b/libs/surfaces/us2400/wscript index 6c7ba693ac..b467eab114 100644 --- a/libs/surfaces/us2400/wscript +++ b/libs/surfaces/us2400/wscript @@ -3,7 +3,7 @@ from waflib.extras import autowaf as autowaf import os def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/surfaces/websockets/wscript b/libs/surfaces/websockets/wscript index 7c23e63579..22d0a90cf8 100644 --- a/libs/surfaces/websockets/wscript +++ b/libs/surfaces/websockets/wscript @@ -3,7 +3,7 @@ from waflib.extras import autowaf as autowaf import os def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/surfaces/wiimote/wscript b/libs/surfaces/wiimote/wscript index 3d12b7e6fd..8b3e1919b1 100644 --- a/libs/surfaces/wiimote/wscript +++ b/libs/surfaces/wiimote/wscript @@ -3,7 +3,7 @@ from waflib.extras import autowaf as autowaf import os def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript index c51390284f..1095b8991c 100644 --- a/libs/surfaces/wscript +++ b/libs/surfaces/wscript @@ -25,7 +25,7 @@ children = [ ] def options(opt): - autowaf.set_options(opt) + pass def sub_config_and_use(conf, name, has_objects = True): conf.recurse(name) diff --git a/libs/temporal/wscript b/libs/temporal/wscript index 7037e3b7f5..30817c6adc 100644 --- a/libs/temporal/wscript +++ b/libs/temporal/wscript @@ -31,7 +31,7 @@ temporal_sources = [ ] def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/vamp-plugins/wscript b/libs/vamp-plugins/wscript index f77e2ff8d1..44ebcfc1bd 100644 --- a/libs/vamp-plugins/wscript +++ b/libs/vamp-plugins/wscript @@ -3,7 +3,7 @@ from waflib.extras import autowaf as autowaf import os def options(opt): - autowaf.set_options(opt) + pass def configure(conf): autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', mandatory=True) diff --git a/libs/vamp-pyin/wscript b/libs/vamp-pyin/wscript index aa9b4f8c98..7bdafd7b79 100644 --- a/libs/vamp-pyin/wscript +++ b/libs/vamp-pyin/wscript @@ -9,7 +9,7 @@ import os VAMP_PYIN_LIB_VERSION = '0.0.0' def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/vfork/wscript b/libs/vfork/wscript index 67ee1b1514..9bd6a0f3ae 100644 --- a/libs/vfork/wscript +++ b/libs/vfork/wscript @@ -1,9 +1,8 @@ #!/usr/bin/env python -from waflib.extras import autowaf as autowaf import os def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/libs/waveview/wscript b/libs/waveview/wscript index fa1a0ed4d8..a6a6236e16 100644 --- a/libs/waveview/wscript +++ b/libs/waveview/wscript @@ -22,7 +22,7 @@ waveview_sources = [ ] def options(opt): - autowaf.set_options(opt) + pass def configure(conf): autowaf.check_pkg(conf, 'cairomm-1.0', uselib_store='CAIROMM', atleast_version='1.8.4') diff --git a/libs/widgets/wscript b/libs/widgets/wscript index c6e0130bb2..9ac8799c1f 100644 --- a/libs/widgets/wscript +++ b/libs/widgets/wscript @@ -47,7 +47,7 @@ widgets_sources = [ ] def options(opt): - autowaf.set_options(opt) + pass def configure(conf): autowaf.check_pkg(conf, 'cairomm-1.0', uselib_store='CAIROMM', atleast_version='1.8.4') diff --git a/libs/zita-convolver/wscript b/libs/zita-convolver/wscript index 22e16b6467..d974277fe5 100644 --- a/libs/zita-convolver/wscript +++ b/libs/zita-convolver/wscript @@ -16,7 +16,7 @@ ZCONVOLVER_LIB_VERSION = '4.0.0' I18N_PACKAGE = 'libzita-convolver' def options(opt): - autowaf.set_options(opt) + pass def configure(conf): autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', mandatory=True) diff --git a/libs/zita-resampler/wscript b/libs/zita-resampler/wscript index eb2e8f50a7..7a951d5e95 100644 --- a/libs/zita-resampler/wscript +++ b/libs/zita-resampler/wscript @@ -24,7 +24,7 @@ zresampler_sources = [ ] def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/luasession/wscript b/luasession/wscript index 19fc3d94ee..76ce13d7d7 100644 --- a/luasession/wscript +++ b/luasession/wscript @@ -1,11 +1,10 @@ #!/usr/bin/env python -from waflib.extras import autowaf as autowaf import waflib.Utils as Utils import os import sys def options(opt): - autowaf.set_options(opt) + pass def configure(conf): conf.load('misc') diff --git a/session_utils/wscript b/session_utils/wscript index 19bc103e1a..a789516d1b 100644 --- a/session_utils/wscript +++ b/session_utils/wscript @@ -5,7 +5,7 @@ import os import sys def options(opt): - autowaf.set_options(opt) + pass def configure(conf): if not "dummy" in conf.env['BACKENDS']: diff --git a/tools/gccabicheck/wscript b/tools/gccabicheck/wscript index 088fc834c3..6ef380a475 100644 --- a/tools/gccabicheck/wscript +++ b/tools/gccabicheck/wscript @@ -1,10 +1,9 @@ #!/usr/bin/env python -from waflib.extras import autowaf as autowaf import re import sys def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass diff --git a/tools/sanity_check/wscript b/tools/sanity_check/wscript index 35d761384e..418ad85f16 100644 --- a/tools/sanity_check/wscript +++ b/tools/sanity_check/wscript @@ -1,8 +1,7 @@ #!/usr/bin/env python -from waflib.extras import autowaf as autowaf def options(opt): - autowaf.set_options(opt) + pass def configure(conf): pass