Changeset 2359cbd

Timestamp:

Nov 6, 2009, 12:08:21 AM (14 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

7b485af

Parents:

3e17aed

Message:

wscript: factorise build of extra source files

Files:

• examples/wscript_build (modified) (1 diff)
• python/aubio/wscript_build (modified) (1 diff)
• wscript (modified) (2 diffs)

examples/wscript_build

@@ -1 +1 @@
 # build examples
-
-defines = ['AUBIO_PREFIX="' + bld.env['AUBIO_PREFIX'] + '"']
-defines += ['PACKAGE="' + bld.env['PACKAGE'] + '"']
-
-extra_source = ['utils.c', 'sndfileio.c', 'jackio.c']
-
-bld.new_task_gen(features = 'cc',
-    includes = '../src',
-    source = extra_source, 
-    uselib = ['LASH'],
-    defines = defines, 
-    target = 'utils_io')
 
 # loop over all *.c filenames in examples to build them all
 for target_name in bld.path.ant_glob('*.c').split():
   # ignore utils.c
-  if target_name in extra_source: continue 
+  if target_name in ['utils.c', 'jackio.c', 'sndfileio.c']: continue 
   bld.new_task_gen(features = 'cc cprogram', 
-      add_objects = 'utils_io',
+      add_objects = 'utilsio',
       includes = '../src',
-      defines = defines, 
       uselib = ['LASH', 'JACK', 'SNDFILE'],
       uselib_local = ['aubio'],

python/aubio/wscript_build

@@ -1 @@
-bld.new_task_gen(features = 'cc',
-    includes = '../../examples ../../src',
-    source = ['../../examples/sndfileio.c'], 
-    uselib = ['JACK'],
-    target = 'sndfileio')
-
 pyaubio = bld.new_task_gen(name = 'python-aubio', 
   features = 'cc cshlib pyext', 

wscript

@@ -126 +126 @@
   bld.env['LIB_VERSION'] = LIB_VERSION 
 
+  build_extras(bld)
+
   # add sub directories
   bld.add_subdirs('src examples')
@@ -181 +183 @@
       this_target.uselib = ['JACK']
       this_target.source += ' examples/jackio.c'
+
+def build_extras(bld):
+    # corner cases to build these ones only once
+    sndfileio = bld.new_task_gen(features = 'cc',
+        includes = 'examples src',
+        source = ['examples/sndfileio.c'], 
+        target = 'sndfileio')
+
+    defines = ['AUBIO_PREFIX="' + bld.env['AUBIO_PREFIX'] + '"']
+    defines += ['PACKAGE="' + bld.env['PACKAGE'] + '"']
+
+    utilsio = bld.new_task_gen(features = 'cc',
+          includes = 'examples src',
+          add_objects = 'sndfileio',
+          source = ['examples/utils.c', 'examples/jackio.c'], 
+          defines = defines, 
+          target = 'utilsio')