Changeset 740f06b for examples


Ignore:
Timestamp:
Oct 17, 2009, 12:43:00 AM (11 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, master, pitchshift, sampler, timestretch, yinfft+
Children:
858cfa7
Parents:
6107f4c
Message:

ext/, examples/, swig/, python/, tests/: remove libaubioext, make libsamplerate optional

Location:
examples
Files:
3 edited
4 moved

Legend:

Unmodified
Added
Removed
  • examples/Makefile.am

    r6107f4c r740f06b  
    11# global flags
    2 AM_CFLAGS = -DAUBIO_PREFIX=\"$(prefix)\" -I$(top_srcdir)/src -I$(top_srcdir)/ext @AUBIO_CFLAGS@ @LASH_CFLAGS@ @FFTWLIB_CFLAGS@
    3 AM_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/ext -laubioext -laubio @LASH_LIBS@
     2AM_CFLAGS = -DAUBIO_PREFIX=\"$(prefix)\" -I$(top_srcdir)/src @AUBIO_CFLAGS@ @LASH_CFLAGS@ @SNDFILE_CFLAGS@ @JACK_CFLAGS@
     3AM_LDFLAGS = -L$(top_builddir)/src -laubio @LASH_LIBS@
    44
    55# add your programs to this list
     
    1313        aubioquiet
    1414
    15 EXTRA_DIST = utils.h
     15EXTRA_DIST = utils.h sndfileio.h jackio.h
    1616
    1717# optionally add sources file for these programs
    18 aubioonset_SOURCES = aubioonset.c utils.c
    19 aubionotes_SOURCES = aubionotes.c utils.c
    20 aubiotrack_SOURCES = aubiotrack.c utils.c
    21 aubioquiet_SOURCES = aubioquiet.c utils.c
    22 aubiomfcc_SOURCES = aubiomfcc.c utils.c
     18COMMON_SOURCE_FILES = sndfileio.c jackio.c utils.c
     19aubioonset_SOURCES = aubioonset.c $(COMMON_SOURCE_FILES)
     20aubionotes_SOURCES = aubionotes.c $(COMMON_SOURCE_FILES)
     21aubiotrack_SOURCES = aubiotrack.c $(COMMON_SOURCE_FILES)
     22aubioquiet_SOURCES = aubioquiet.c $(COMMON_SOURCE_FILES)
     23aubiomfcc_SOURCES = aubiomfcc.c $(COMMON_SOURCE_FILES)
    2324
    24 aubioonset_LDADD = @JACK_LIBS@
    25 aubionotes_LDADD = @JACK_LIBS@
    26 aubiotrack_LDADD = @JACK_LIBS@
    27 aubioquiet_LDADD = @JACK_LIBS@
    28 aubiomfcc_LDADD = @JACK_LIBS@
     25aubioonset_LDADD = @SNDFILE_LIBS@ @JACK_LIBS@
     26aubionotes_LDADD = @SNDFILE_LIBS@ @JACK_LIBS@
     27aubiotrack_LDADD = @SNDFILE_LIBS@ @JACK_LIBS@
     28aubioquiet_LDADD = @SNDFILE_LIBS@ @JACK_LIBS@
     29aubiomfcc_LDADD = @SNDFILE_LIBS@ @JACK_LIBS@
  • examples/utils.h

    r6107f4c r740f06b  
    2727#include <string.h>             /* for strcmp */
    2828#include <aubio.h>
    29 #include <aubioext.h>
     29#include "sndfileio.h"
     30#ifdef HAVE_JACK
     31#include "jackio.h"
     32#endif /* HAVE_JACK */
    3033
    3134#ifdef HAVE_C99_VARARGS_MACROS
  • examples/wscript_build

    r6107f4c r740f06b  
    44defines += ['PACKAGE="' + bld.env['PACKAGE'] + '"']
    55
     6extra_source = ['utils.c', 'sndfileio.c', 'jackio.c']
     7
    68bld.new_task_gen(features = 'cc',
    7     includes = '../src ../ext',
    8     source = 'utils.c',
     9    includes = '../src',
     10    source = extra_source,
    911    uselib = ['LASH'],
    1012    defines = defines,
    11     target = 'utils')
     13    target = 'utils_io')
    1214
    1315# loop over all *.c filenames in examples to build them all
    1416for target_name in bld.path.ant_glob('*.c').split():
    1517  # ignore utils.c
    16   if target_name in ['utils.c']: continue
     18  if target_name in extra_source: continue
    1719  bld.new_task_gen(features = 'cc cprogram',
    18       add_objects = 'utils',
    19       includes = '../src ../ext',
     20      add_objects = 'utils_io',
     21      includes = '../src',
    2022      defines = defines,
    21       uselib = ['LASH'],
    22       uselib_local = ['aubio', 'aubioext'],
     23      uselib = ['LASH', 'JACK', 'SNDFILE'],
     24      uselib_local = ['aubio'],
    2325      source = target_name,
    2426      # program name is filename.c without the .c
Note: See TracChangeset for help on using the changeset viewer.