wscript: factorise build of extra source files

diff --git a/examples/wscript_build b/examples/wscript_build
index 33b601a764c6067fc7824ba6f528acafd59a2099..5215672f3f3a5734fe81938e7930cccfe8d2c9c9 100644 (file)
--- a/examples/wscript_build
+++ b/examples/wscript_build
@@ -1,25 +1,12 @@
 # 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'],
       source = target_name,

diff --git a/python/aubio/wscript_build b/python/aubio/wscript_build
index 34943f15c928cc738585aadac871bf2e150ad52d..8ec4cc0e8d5750c2afb895aea2c62a42cc113a3a 100644 (file)
--- a/python/aubio/wscript_build
+++ b/python/aubio/wscript_build
@@ -1,9 +1,3 @@
-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', 
   source = '../../swig/aubio.i',

diff --git a/wscript b/wscript
index 1b675457fd4de2655584bf45d70564caedcfc804..b823b0591a945aee6183bf5640b83f601c345a61 100644 (file)
--- a/wscript
+++ b/wscript
@@ -125,6 +125,8 @@ def build(bld):
   bld.env['VERSION'] = VERSION 
   bld.env['LIB_VERSION'] = LIB_VERSION 
 
+  build_extras(bld)
+
   # add sub directories
   bld.add_subdirs('src examples')
   if bld.env['SWIG']:
@@ -180,3 +182,20 @@ def build_tests(bld):
       this_target.uselib_local = ['aubio']
       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')