Showing the changes to python (2 of 19 files). Show all
Unified · Split
| @@ -44,21 +44,23 @@ CLEANFILES = *.pyc *.so *.o aubio_wrap.c aubiowrapper.py · 43 unmodified lines | ||
| 44 | 44 | NOWARN_CFLAGS = -Wno-missing-prototypes -Wno-missing-declarations \ |
| 45 | 45 | -Wno-strict-aliasing |
| 46 | 46 | |
| 47 | −AM_CFLAGS = @AUBIO_CFLAGS@ $(NOWARN_CFLAGS) $(SWCFLAGS) \ | |
| 48 | − -I$(top_builddir)/src -I$(top_srcdir)/src -I$(top_srcdir)/ext \ | |
| 47 | +AM_CFLAGS = @AUBIO_CFLAGS@ @SNDFILE_CFLAGS@ \ | |
| 48 | + $(NOWARN_CFLAGS) $(SWCFLAGS) \ | |
| 49 | + -I$(top_builddir)/src -I$(top_srcdir)/src \ | |
| 50 | + -I$(top_srcdir)/examples \ | |
| 49 | 51 | -I/usr/include/python${PYTHON_VERSION} \ |
| 50 | 52 | -I${prefix}/include/python${PYTHON_VERSION} \ |
| 51 | 53 | -I/usr/include \ |
| 52 | 54 | -I${prefix}/include |
| 53 | 55 | |
| 54 | 56 | AUBIO_LDFLAGS = $(SWLDFLAGS) \ |
| 55 | − -L$(top_builddir)/ext -laubioext \ | |
| 57 | + @SNDFILE_LIBS@ \ | |
| 56 | 58 | -L$(top_builddir)/src -laubio |
| 57 | 59 | |
| 58 | 60 | pkgpyexec_LTLIBRARIES = _aubiowrapper.la |
| 59 | 61 | |
| 60 | 62 | _aubiowrapper_la_LDFLAGS = -module -avoid-version $(AUBIO_LDFLAGS) |
| 61 | −_aubiowrapper_la_SOURCES = aubio_wrap.c | |
| 63 | +_aubiowrapper_la_SOURCES = aubio_wrap.c $(top_srcdir)/examples/sndfileio.c | |
| 62 | 64 | |
| 63 | 65 | aubio_wrap.c aubiowrapper.py: |
| 64 | 66 | $(SWIG) -outdir . -o aubio_wrap.c -python $(top_srcdir)/swig/aubio.i |
| @@ -1,10 +1,18 @@ | ||
| 1 | +bld.new_task_gen(features = 'cc', | |
| 2 | + includes = '../../examples ../../src', | |
| 3 | + source = ['../../examples/sndfileio.c'], | |
| 4 | + uselib = ['JACK'], | |
| 5 | + target = 'sndfileio') | |
| 6 | + | |
| 1 | 7 | pyaubio = bld.new_task_gen(name = 'python-aubio', |
| 2 | 8 | features = 'cc cshlib pyext', |
| 3 | 9 | source = '../../swig/aubio.i', |
| 10 | + add_objects = 'sndfileio', | |
| 4 | 11 | target = '_aubiowrapper', |
| 5 | − uselib_local = ['aubio', 'aubioext'], | |
| 12 | + uselib_local = ['aubio'], | |
| 13 | + uselib = ['SNDFILE'], | |
| 6 | 14 | swig_flags = '-python -Wall', |
| 7 | − includes = '. ../../src ../../ext') | |
| 15 | + includes = '. ../../src ../../examples') | |
| 8 | 16 | pyaubio.install_path = '${PYTHONDIR}/${PACKAGE}' |
| 9 | 17 | |
| 10 | 18 | # install python files |