Changeset 740f06b for python

Timestamp:

Oct 17, 2009, 12:43:00 AM (15 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:

858cfa7

Parents:

6107f4c

Message:

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

Location:

python/aubio

Files:

• Makefile.am (modified) (3 diffs)
• wscript_build (modified) (1 diff)

python/aubio/Makefile.am

@@ -45 +45 @@
         -Wno-strict-aliasing
 
-AM_CFLAGS = @AUBIO_CFLAGS@ $(NOWARN_CFLAGS) $(SWCFLAGS) \
-        -I$(top_builddir)/src -I$(top_srcdir)/src -I$(top_srcdir)/ext \
+AM_CFLAGS = @AUBIO_CFLAGS@ @SNDFILE_CFLAGS@ \
+        $(NOWARN_CFLAGS) $(SWCFLAGS) \
+        -I$(top_builddir)/src -I$(top_srcdir)/src \
+        -I$(top_srcdir)/examples \
         -I/usr/include/python${PYTHON_VERSION} \
         -I${prefix}/include/python${PYTHON_VERSION} \
@@ -53 +55 @@
 
 AUBIO_LDFLAGS = $(SWLDFLAGS) \
-        -L$(top_builddir)/ext -laubioext \
+        @SNDFILE_LIBS@ \
         -L$(top_builddir)/src -laubio
 
@@ -59 +61 @@
 
 _aubiowrapper_la_LDFLAGS = -module -avoid-version $(AUBIO_LDFLAGS) 
-_aubiowrapper_la_SOURCES = aubio_wrap.c
+_aubiowrapper_la_SOURCES = aubio_wrap.c $(top_srcdir)/examples/sndfileio.c
 
 aubio_wrap.c aubiowrapper.py:

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', 
   source = '../../swig/aubio.i',
+  add_objects = 'sndfileio',
   target = '_aubiowrapper',
-  uselib_local = ['aubio', 'aubioext'],
+  uselib_local = ['aubio'],
+  uselib = ['SNDFILE'],
   swig_flags = '-python -Wall',
-  includes = '. ../../src ../../ext')
+  includes = '. ../../src ../../examples')
 pyaubio.install_path = '${PYTHONDIR}/${PACKAGE}'