History

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

Paul Brossier committed 17 years ago

Commit 740f06b1 parent 6107f4c19 files · +96 −134Browse files

Showing the changes to python (2 of 19 files). Show all

Unified · Split

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

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t