From dc0e759e1e74676d0df5846b357888b434f23d4e Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Thu, 6 Mar 2014 14:03:49 -0300 Subject: [PATCH] {tests,src,examples}/wscript_build: indent --- examples/wscript_build | 22 +++++++++++----------- src/wscript_build | 29 +++++++++++++++-------------- tests/wscript_build | 27 +++++++++++++-------------- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/examples/wscript_build b/examples/wscript_build index 68b6ead5..db5fed67 100644 --- a/examples/wscript_build +++ b/examples/wscript_build @@ -8,17 +8,17 @@ programs_source = ctx.path.ant_glob('*.c', excl = utils_source) # build examples bld(features = 'c', - source = utils_source, - includes = ['../src'], - uselib = uselib, - target = 'utilsio') + source = utils_source, + includes = ['../src'], + uselib = uselib, + target = 'utilsio') # loop over all *.c filenames in examples to build them all for source_file in programs_source: - bld(features = 'c cprogram', - includes = '../src', - lib = 'm', - use = ['aubio', 'utilsio'], - source = source_file, - target = str(source_file).split('.')[0] - ) + bld(features = 'c cprogram', + includes = '../src', + lib = 'm', + use = ['aubio', 'utilsio'], + source = source_file, + target = str(source_file).split('.')[0] + ) diff --git a/src/wscript_build b/src/wscript_build index 542c564a..94b2062c 100644 --- a/src/wscript_build +++ b/src/wscript_build @@ -1,6 +1,5 @@ # vim:set syntax=python: -source = ctx.path.ant_glob('*.c **/*.c') uselib = [] uselib += ['FFTW3', 'FFTW3F'] uselib += ['SAMPLERATE'] @@ -10,12 +9,14 @@ uselib += ['AVFORMAT'] uselib += ['AVRESAMPLE'] uselib += ['AVUTIL'] +# build each source files +source = ctx.path.ant_glob('*.c **/*.c') ctx(features = 'c', - source = source, - includes = ['.'], - uselib = uselib, - lib = 'm', - target = 'lib_objects') + source = source, + includes = ['.'], + uselib = uselib, + lib = 'm', + target = 'lib_objects') # build libaubio.so (cshlib) and/or libaubio.a (cstlib) if ctx.env['DEST_OS'] in ['ios', 'iosimulator']: @@ -26,14 +27,14 @@ else: #linux, darwin, android, mingw, ... build_features = ['cshlib', 'cstlib'] for target in build_features: - ctx(features = 'c ' + target, - use = ['lib_objects'], #source = source, - lib = 'm', - target = 'aubio', - install_path = '${PREFIX}/lib', - vnum = ctx.env['LIB_VERSION']) + ctx(features = 'c ' + target, + use = ['lib_objects'], + lib = 'm', + target = 'aubio', + install_path = '${PREFIX}/lib', + vnum = ctx.env['LIB_VERSION']) # install headers, except _priv.h ones ctx.install_files('${PREFIX}/include/aubio/', - ctx.path.ant_glob('**/*.h', excl = ['**_priv.h', 'config.h']), - relative_trick=True) + ctx.path.ant_glob('**/*.h', excl = ['**_priv.h', 'config.h']), + relative_trick=True) diff --git a/tests/wscript_build b/tests/wscript_build index 7f4708a7..04bbf9af 100644 --- a/tests/wscript_build +++ b/tests/wscript_build @@ -1,18 +1,17 @@ # vim:set syntax=python: for target_name in ctx.path.ant_glob('src/**/*.c'): - uselib = [] - includes = ['../src', '.'] - extra_source = [] - - bld(features = 'c cprogram test', - lib = 'm', - uselib = uselib, - source = [target_name] + extra_source, - target = str(target_name).split('.')[0], - includes = includes, - install_path = None, - defines = 'AUBIO_UNSTABLE_API=1', - cflags = ['-g'], - use = 'aubio') + uselib = [] + includes = ['../src', '.'] + extra_source = [] + bld(features = 'c cprogram test', + lib = 'm', + uselib = uselib, + source = [target_name] + extra_source, + target = str(target_name).split('.')[0], + includes = includes, + install_path = None, + defines = 'AUBIO_UNSTABLE_API=1', + cflags = ['-g'], + use = 'aubio') -- 2.11.0