History

bumping to 0.1.8

Paul Brossier committed 21 years ago

Commit 77494e71 parent 205da8614 files · +94 −81Browse files

Showing the changes to python (3 of 14 files). Show all

Unified · Split

3 files
  1. python/aubio/Makefile.am +16 −6
  2. python/aubio/Makefile.in +50 −15
  3. python/aubiocut +2 −1
python/aubio/Makefile.am+16−6
@@ -1,10 +1,20 @@
1−EXTRA_DIST = __init__.py onsetcompare.py aubioclass.py gnuplot.py\
2− median.py txtfile.py
3−
41 pkgpython_PYTHON = __init__.py onsetcompare.py\
52 gnuplot.py median.py txtfile.py aubioclass.py
3+
4+nodist_pkgpython_PYTHON = aubiowrapper.py _aubiowrapper.so
5+
6+CLEANFILES = *.pyc *.so *.o aubio_wrap.c aubiowrapper.py
7+
8+all: _aubiowrapper.so
9+
10+SWIG = swig
11+# removed -Wall -Wmissing-prototypes -Wmissing-declarations
12+SWCFLAGS = -DJACK_SUPPORT -Werror -Wno-char-subscripts -Wno-unknown-pragmas -I/usr/include/python2.3 -I../../src -I../../ext -I/usr/include
13+SWLDFLAGS = -shared -L../../ext/.libs -laubioext -L../../src/.libs -laubio
614
7−clean:
8− rm -f *.pyc
15+aubio_wrap.c:
16+ $(SWIG) -outdir . -o aubio_wrap.c -python ../../swig/aubio.i
917
10−distclean: clean
18+_aubiowrapper.so: aubio_wrap.c
19+ $(CC) $(SWCFLAGS) -c aubio_wrap.c
20+ $(CC) $(SWLDFLAGS) aubio_wrap.o -o _aubiowrapper.so
python/aubio/Makefile.in+50−15
@@ -151,13 +151,18 @@ sbindir = @sbindir@ · 150 unmodified lines
151151 sharedstatedir = @sharedstatedir@
152152 sysconfdir = @sysconfdir@
153153 target_alias = @target_alias@
154−EXTRA_DIST = __init__.py onsetcompare.py aubioclass.py gnuplot.py\
155− median.py txtfile.py
156−
157−
158154 pkgpython_PYTHON = __init__.py onsetcompare.py\
159155 gnuplot.py median.py txtfile.py aubioclass.py
160156
157+
158+nodist_pkgpython_PYTHON = aubiowrapper.py _aubiowrapper.so
159+
160+CLEANFILES = *.pyc *.so *.o aubio_wrap.c aubiowrapper.py
161+
162+SWIG = swig
163+# removed -Wall -Wmissing-prototypes -Wmissing-declarations
164+SWCFLAGS = -DJACK_SUPPORT -Werror -Wno-char-subscripts -Wno-unknown-pragmas -I/usr/include/python2.3 -I../../src -I../../ext -I/usr/include
165+SWLDFLAGS = -shared -L../../ext/.libs -laubioext -L../../src/.libs -laubio
161166 subdir = python/aubio
162167 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
163168 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -184,6 +189,29 @@ clean-libtool: · 20 unmodified lines
184189 distclean-libtool:
185190 -rm -f libtool
186191 uninstall-info-am:
192+nodist_pkgpythonPYTHON_INSTALL = $(INSTALL_DATA)
193+install-nodist_pkgpythonPYTHON: $(nodist_pkgpython_PYTHON)
194+ @$(NORMAL_INSTALL)
195+ $(mkinstalldirs) $(DESTDIR)$(pkgpythondir)
196+ @list='$(nodist_pkgpython_PYTHON)'; dlist=''; for p in $$list; do\
197+ if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
198+ if test -f $$b$$p; then \
199+ d=`echo "$$p" | sed -e 's,^.*/,,'`; \
200+ dlist="$$dlist $$d"; \
201+ echo " $(nodist_pkgpythonPYTHON_INSTALL) $$b$$p $(DESTDIR)$(pkgpythondir)/$$d"; \
202+ $(nodist_pkgpythonPYTHON_INSTALL) $$b$$p $(DESTDIR)$(pkgpythondir)/$$d; \
203+ else :; fi; \
204+ done; \
205+ PYTHON=$(PYTHON) $(py_compile) --basedir $(DESTDIR)$(pkgpythondir) $$dlist
206+
207+uninstall-nodist_pkgpythonPYTHON:
208+ @$(NORMAL_UNINSTALL)
209+ list='$(nodist_pkgpython_PYTHON)'; for p in $$list; do \
210+ d=`echo "$$p" | sed -e 's,^.*/,,'`; \
211+ rm -f $(DESTDIR)$(pkgpythondir)/$$d; \
212+ rm -f $(DESTDIR)$(pkgpythondir)/$${d}c; \
213+ rm -f $(DESTDIR)$(pkgpythondir)/$${d}o; \
214+ done
187215 pkgpythonPYTHON_INSTALL = $(INSTALL_DATA)
188216 install-pkgpythonPYTHON: $(pkgpython_PYTHON)
189217 @$(NORMAL_INSTALL)
@@ -250,7 +278,7 @@ check: check-am · 60 unmodified lines
250278 all-am: Makefile
251279
252280 installdirs:
253− $(mkinstalldirs) $(DESTDIR)$(pkgpythondir)
281+ $(mkinstalldirs) $(DESTDIR)$(pkgpythondir) $(DESTDIR)$(pkgpythondir)
254282 install: install-am
255283 install-exec: install-exec-am
256284 install-data: install-data-am
@@ -268,6 +296,7 @@ install-strip: · 11 unmodified lines
268296 mostlyclean-generic:
269297
270298 clean-generic:
299+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
271300
272301 distclean-generic:
273302 -rm -f $(CONFIG_CLEAN_FILES)
@@ -291,7 +320,7 @@ info: info-am · 17 unmodified lines
291320
292321 info-am:
293322
294−install-data-am: install-pkgpythonPYTHON
323+install-data-am: install-nodist_pkgpythonPYTHON install-pkgpythonPYTHON
295324
296325 install-exec-am:
297326
@@ -317,24 +346,30 @@ ps: ps-am · 19 unmodified lines
317346
318347 ps-am:
319348
320−uninstall-am: uninstall-info-am uninstall-pkgpythonPYTHON
349+uninstall-am: uninstall-info-am uninstall-nodist_pkgpythonPYTHON \
350+ uninstall-pkgpythonPYTHON
321351
322352 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
323353 distclean distclean-generic distclean-libtool distdir dvi \
324354 dvi-am info info-am install install-am install-data \
325355 install-data-am install-exec install-exec-am install-info \
326− install-info-am install-man install-pkgpythonPYTHON \
327− install-strip installcheck installcheck-am installdirs \
328− maintainer-clean maintainer-clean-generic mostlyclean \
329− mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
330− uninstall uninstall-am uninstall-info-am \
356+ install-info-am install-man install-nodist_pkgpythonPYTHON \
357+ install-pkgpythonPYTHON install-strip installcheck \
358+ installcheck-am installdirs maintainer-clean \
359+ maintainer-clean-generic mostlyclean mostlyclean-generic \
360+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
361+ uninstall-info-am uninstall-nodist_pkgpythonPYTHON \
331362 uninstall-pkgpythonPYTHON
332363
333364
334−clean:
335− rm -f *.pyc
365+all: _aubiowrapper.so
366+
367+aubio_wrap.c:
368+ $(SWIG) -outdir . -o aubio_wrap.c -python ../../swig/aubio.i
336369
337−distclean: clean
370+_aubiowrapper.so: aubio_wrap.c
371+ $(CC) $(SWCFLAGS) -c aubio_wrap.c
372+ $(CC) $(SWLDFLAGS) aubio_wrap.o -o _aubiowrapper.so
338373 # Tell versions [3.59,3.63) of GNU make to not export all variables.
339374 # Otherwise a system limit (for SysV at least) may be exceeded.
340375 .NOEXPORT:
python/aubiocut+2−1
@@ -60,7 +60,8 @@ def cutfile(filein,onsets): · 59 unmodified lines
6060 writesize = fileo.write(zerocross,myvec)
6161 fromcross = 0
6262 while (zerocross < readsize):
63− mycopy.set(myvec.get(zerocross,0),fromcross,0)
63+ for i in range(channels):
64+ mycopy.set(myvec.get(zerocross,i),fromcross,i)
6465 fromcross += 1
6566 zerocross += 1
6667 del fileo

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