bumping to 0.1.8

diff --git a/ChangeLog b/ChangeLog
index 8f85a138400ebb25b577346ee74db491709d0752..b2513215367a2929d62dfee4d29b71ad2afa3477 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
+2004-12-11  Paul Brossier <piem@altern,org>
+       * swig/Makefile.am: instructions moved to python/aubio and cleaned
+       * python/aubiocut: corrected slicing on multichannel files
+       * VERSION: bumped to 0.1.8
+
 2004-12-06  Paul Brossier <piem@altern.org>
        * examples/{midi*,testforclam}.c: removed
+       * src/{sndfile,midi*,jackio}.[ch]: moved to ext
 
 2004-12-03  Paul Brossier <piem@altern.org>
        * src/{mathutils,pitchyin}.h: got rid of some shadowed declarations
@@ -16,6 +22,7 @@
 
 2004-10-28  Paul Brossier <piem@altern.org>
        * src/Makefile.am: added config.h installation
+       * VERSION: 0.1.7.1
 
 2004-10-26  Paul Brossier <piem@altern.org>:
        * src/pitchdetection.*: moved to src/pitchmcomb.*, now includes a

diff --git a/VERSION b/VERSION
index b390af831de4ca7cc99fc66f418100a6ec8fe670..547cf88dbd0351b9371a1485378758d28e56328a 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,5 +1,5 @@
 AUBIO_MAJOR_VERSION=0
 AUBIO_MINOR_VERSION=1
-AUBIO_PATCH_VERSION=7
-AUBIO_VERSION_STATUS=.2
+AUBIO_PATCH_VERSION=8
+AUBIO_VERSION_STATUS=
 

diff --git a/doc/Makefile.am b/doc/Makefile.am
index e88bcf9438dd660617a054c5f89aa285562bbebd..4d8b3e7a78c018299a919692055787fd1580bbe6 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -5,6 +5,7 @@ EXTRA_DIST = devel.cfg examples.cfg user.cfg aubio.css \
        aubionotes.sgml aubioonset.sgml
 
 man_MANS = aubionotes.1 aubioonset.1
+CLEANFILES = $(man_MANS)
 #docbook_docs = aubio-devdoc.xml
 #DOCBOOK_STYLESHEET ?= http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl
 

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 89f1bf752cfae29032f3adeaaf12ecdd1bc97568..ed1851e66e73067cde0edd7ff0b2d10d9224ec9b 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -160,6 +160,7 @@ EXTRA_DIST = devel.cfg examples.cfg user.cfg aubio.css \
 
 
 man_MANS = aubionotes.1 aubioonset.1
+CLEANFILES = $(man_MANS)
 subdir = doc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -296,6 +297,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
        -rm -f $(CONFIG_CLEAN_FILES)

diff --git a/ext/Makefile.am b/ext/Makefile.am
index 637a9442f9c84fdcf2c64736e17c9b5fba168736..6832b0acf6e1ba334eca0358b64d758bf9b03c21 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -1,5 +1,3 @@
-EXTRA_DIST = aubio_priv.h
-
 pkginclude_HEADERS = aubioext.h \
        jackio.h \
        sndfileio.h \

diff --git a/ext/Makefile.in b/ext/Makefile.in
index 96b371171612481e23491e05740edf9d81a7a7b4..0a5eed1567e96fe4e1fbb8f587e638105487b295 100644 (file)
--- a/ext/Makefile.in
+++ b/ext/Makefile.in
@@ -151,8 +151,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-EXTRA_DIST = aubio_priv.h
-
 pkginclude_HEADERS = aubioext.h \
        jackio.h \
        sndfileio.h \

diff --git a/plugins/puredata/Makefile.am b/plugins/puredata/Makefile.am
index 615a68fdf7d13d8b4d5d1eb70cf4539aaeab4d0e..a533bce63ebd08055dd7da1589087e24209e395d 100644 (file)
--- a/plugins/puredata/Makefile.am
+++ b/plugins/puredata/Makefile.am
@@ -8,7 +8,7 @@ pddir = $(PDDIR)
 #SUBDIRS = ladspa vst win
 
 ## Make and install the shared library.
-pdinstalldir = $(pddir)/extra/aubio
+pdinstalldir = $(pddir)/extra
 
 # Automake won't accept something ending in ".pd_linux" as a library
 pdinstall_PROGRAMS = aubioonset~.pd_linux
@@ -37,5 +37,4 @@ pdinstall_DATA = \
 ## My kludge
 noinst_SCRIPTS = libtoolkludge
 
-## version.h is there for the Windows platform (no autoconf)
-EXTRA_DIST = $(pdinstall_DATA) $(noinst_SCRIPTS) version.h
+EXTRA_DIST = $(pdinstall_DATA) $(noinst_SCRIPTS)

diff --git a/plugins/puredata/Makefile.in b/plugins/puredata/Makefile.in
index 7656ecdbacd527b0152042ce18166301df7f2939..6084295052d390934cb379740f269dec54317b16 100644 (file)
--- a/plugins/puredata/Makefile.in
+++ b/plugins/puredata/Makefile.in
@@ -161,7 +161,7 @@ PDDIR = $(prefix)/lib/pd
 pddir = $(PDDIR)
 
 #SUBDIRS = ladspa vst win
-pdinstalldir = $(pddir)/extra/aubio
+pdinstalldir = $(pddir)/extra
 
 # Automake won't accept something ending in ".pd_linux" as a library
 pdinstall_PROGRAMS = aubioonset~.pd_linux
@@ -187,7 +187,7 @@ pdinstall_DATA = \
 
 noinst_SCRIPTS = libtoolkludge
 
-EXTRA_DIST = $(pdinstall_DATA) $(noinst_SCRIPTS) version.h
+EXTRA_DIST = $(pdinstall_DATA) $(noinst_SCRIPTS)
 subdir = plugins/puredata
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

diff --git a/plugins/puredata/libtoolkludge b/plugins/puredata/libtoolkludge
index 47d3224b026df12e1859addd7a4b91e45a8e5aec..e54a3574c33b7fbf055f26b16cba7d40b3bef7d5 100644 (file)
--- a/plugins/puredata/libtoolkludge
+++ b/plugins/puredata/libtoolkludge
@@ -1,10 +1,16 @@
 #! /bin/sh
 
+# added --mode=link
 if test \( $# -gt 1 \) -a \( $1 = "--mode=link" \); then
   shift;
   echo " libtoolkludge running \"$*\""
   $*
   exit 0
+elif test \( $# -gt 1 \) -a \( $1 = "--mode=install" \); then
+  shift;
+  echo " libtoolkludge running \"$*\""
+  $*
+  exit 0
 else
   echo "Libtoolkludge is a kludge for libtool --mode=install only.  Die!" >&2
   exit 1

diff --git a/python/aubio/Makefile.am b/python/aubio/Makefile.am
index e25db817c53cbff6f212b41964baefc4914b7ec6..5b2749ba1096364188b720efc4ae049b4b1bdb15 100644 (file)
--- a/python/aubio/Makefile.am
+++ b/python/aubio/Makefile.am
@@ -1,10 +1,20 @@
-EXTRA_DIST = __init__.py onsetcompare.py aubioclass.py gnuplot.py\
-       median.py txtfile.py
-
 pkgpython_PYTHON = __init__.py onsetcompare.py\
        gnuplot.py median.py txtfile.py aubioclass.py
+       
+nodist_pkgpython_PYTHON = aubiowrapper.py _aubiowrapper.so
+
+CLEANFILES = *.pyc *.so *.o aubio_wrap.c aubiowrapper.py 
+
+all: _aubiowrapper.so
+
+SWIG = swig
+# removed -Wall -Wmissing-prototypes -Wmissing-declarations 
+SWCFLAGS = -DJACK_SUPPORT -Werror -Wno-char-subscripts -Wno-unknown-pragmas -I/usr/include/python2.3 -I../../src -I../../ext -I/usr/include
+SWLDFLAGS = -shared -L../../ext/.libs -laubioext -L../../src/.libs -laubio
 
-clean:
-       rm -f *.pyc
+aubio_wrap.c:
+       $(SWIG) -outdir . -o aubio_wrap.c -python ../../swig/aubio.i
 
-distclean: clean
+_aubiowrapper.so: aubio_wrap.c
+       $(CC)   $(SWCFLAGS) -c aubio_wrap.c
+       $(CC)   $(SWLDFLAGS) aubio_wrap.o -o _aubiowrapper.so

diff --git a/python/aubio/Makefile.in b/python/aubio/Makefile.in
index ccdaf8c192d12871c7ce3b413620db75c964f63e..8d6092f09da9ba9fd7d0825f94a4a337e97ab6c1 100644 (file)
--- a/python/aubio/Makefile.in
+++ b/python/aubio/Makefile.in
@@ -151,13 +151,18 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-EXTRA_DIST = __init__.py onsetcompare.py aubioclass.py gnuplot.py\
-       median.py txtfile.py
-
-
 pkgpython_PYTHON = __init__.py onsetcompare.py\
        gnuplot.py median.py txtfile.py aubioclass.py
 
+
+nodist_pkgpython_PYTHON = aubiowrapper.py _aubiowrapper.so
+
+CLEANFILES = *.pyc *.so *.o aubio_wrap.c aubiowrapper.py 
+
+SWIG = swig
+# removed -Wall -Wmissing-prototypes -Wmissing-declarations 
+SWCFLAGS = -DJACK_SUPPORT -Werror -Wno-char-subscripts -Wno-unknown-pragmas -I/usr/include/python2.3 -I../../src -I../../ext -I/usr/include
+SWLDFLAGS = -shared -L../../ext/.libs -laubioext -L../../src/.libs -laubio
 subdir = python/aubio
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -184,6 +189,29 @@ clean-libtool:
 distclean-libtool:
        -rm -f libtool
 uninstall-info-am:
+nodist_pkgpythonPYTHON_INSTALL = $(INSTALL_DATA)
+install-nodist_pkgpythonPYTHON: $(nodist_pkgpython_PYTHON)
+       @$(NORMAL_INSTALL)
+       $(mkinstalldirs) $(DESTDIR)$(pkgpythondir)
+       @list='$(nodist_pkgpython_PYTHON)'; dlist=''; for p in $$list; do\
+         if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
+         if test -f $$b$$p; then \
+           d=`echo "$$p" | sed -e 's,^.*/,,'`; \
+           dlist="$$dlist $$d"; \
+           echo " $(nodist_pkgpythonPYTHON_INSTALL) $$b$$p $(DESTDIR)$(pkgpythondir)/$$d"; \
+           $(nodist_pkgpythonPYTHON_INSTALL) $$b$$p $(DESTDIR)$(pkgpythondir)/$$d; \
+         else :; fi; \
+       done; \
+       PYTHON=$(PYTHON) $(py_compile) --basedir $(DESTDIR)$(pkgpythondir) $$dlist
+
+uninstall-nodist_pkgpythonPYTHON:
+       @$(NORMAL_UNINSTALL)
+       list='$(nodist_pkgpython_PYTHON)'; for p in $$list; do \
+         d=`echo "$$p" | sed -e 's,^.*/,,'`; \
+         rm -f $(DESTDIR)$(pkgpythondir)/$$d; \
+         rm -f $(DESTDIR)$(pkgpythondir)/$${d}c; \
+         rm -f $(DESTDIR)$(pkgpythondir)/$${d}o; \
+       done
 pkgpythonPYTHON_INSTALL = $(INSTALL_DATA)
 install-pkgpythonPYTHON: $(pkgpython_PYTHON)
        @$(NORMAL_INSTALL)
@@ -250,7 +278,7 @@ check: check-am
 all-am: Makefile
 
 installdirs:
-       $(mkinstalldirs) $(DESTDIR)$(pkgpythondir)
+       $(mkinstalldirs) $(DESTDIR)$(pkgpythondir) $(DESTDIR)$(pkgpythondir)
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -268,6 +296,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
        -rm -f $(CONFIG_CLEAN_FILES)
@@ -291,7 +320,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-pkgpythonPYTHON
+install-data-am: install-nodist_pkgpythonPYTHON install-pkgpythonPYTHON
 
 install-exec-am:
 
@@ -317,24 +346,30 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-pkgpythonPYTHON
+uninstall-am: uninstall-info-am uninstall-nodist_pkgpythonPYTHON \
+       uninstall-pkgpythonPYTHON
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
        distclean distclean-generic distclean-libtool distdir dvi \
        dvi-am info info-am install install-am install-data \
        install-data-am install-exec install-exec-am install-info \
-       install-info-am install-man install-pkgpythonPYTHON \
-       install-strip installcheck installcheck-am installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       uninstall uninstall-am uninstall-info-am \
+       install-info-am install-man install-nodist_pkgpythonPYTHON \
+       install-pkgpythonPYTHON install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+       uninstall-info-am uninstall-nodist_pkgpythonPYTHON \
        uninstall-pkgpythonPYTHON
 
 
-clean:
-       rm -f *.pyc
+all: _aubiowrapper.so
+
+aubio_wrap.c:
+       $(SWIG) -outdir . -o aubio_wrap.c -python ../../swig/aubio.i
 
-distclean: clean
+_aubiowrapper.so: aubio_wrap.c
+       $(CC)   $(SWCFLAGS) -c aubio_wrap.c
+       $(CC)   $(SWLDFLAGS) aubio_wrap.o -o _aubiowrapper.so
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/python/aubiocut b/python/aubiocut
index 79e94b6f6a0e105c7395f81e8fa1815dcef8ac30..19ac8a9542947c928ba11e5ea0ed024d33ef4369 100755 (executable)
--- a/python/aubiocut
+++ b/python/aubiocut
@@ -60,7 +60,8 @@ def cutfile(filein,onsets):
                     writesize = fileo.write(zerocross,myvec)
                    fromcross = 0
                    while (zerocross < readsize):
-                       mycopy.set(myvec.get(zerocross,0),fromcross,0)
+                       for i in range(channels):
+                               mycopy.set(myvec.get(zerocross,i),fromcross,i)
                        fromcross += 1
                        zerocross += 1
                     del fileo

diff --git a/swig/Makefile.am b/swig/Makefile.am
index e6da4eef51fd266f2e28cb3b6a98e9a9b8c9997f..de8d567b978a5fad8a0a7413028ebb386c6e6c2f 100644 (file)
--- a/swig/Makefile.am
+++ b/swig/Makefile.am
@@ -1,25 +1,2 @@
+# see ../python/Makefile.am
 EXTRA_DIST = aubio.i
-
-PYTHON_DIR = ../python/aubio
-SWIG = swig
-#SW_FLAGS = -c++
-# removed -Wall -Wmissing-prototypes -Wmissing-declarations 
-SW_CFLAGS = -DJACK_SUPPORT -shared -Werror -Wno-char-subscripts -Wno-unknown-pragmas
-#SW_CFLAGS = -Wno-missing-prototypes -Wno-missing-declarations
-SWINCLUDE = -I/usr/include/python2.3 -I../src -I../ext -I/usr/include
-SWLDFLAGS = -L../ext/.libs -laubioext -L../src/.libs -laubio
-
-all:
-       $(SWIG) $(SW_FLAGS) -outdir $(PYTHON_DIR) -python aubio.i
-       $(CC) $(SW_CFLAGS) -c aubio_wrap.c $(SWINCLUDE)
-       $(CC) $(SW_CFLAGS) aubio_wrap.o -o $(PYTHON_DIR)/_aubiowrapper.so $(SWLDFLAGS)
-
-install:
-       $(mkinstalldirs) $(DESTDIR)$(pkgpythondir)
-       $(INSTALL) $(PYTHON_DIR)/_aubiowrapper.so $(DESTDIR)$(pkgpythondir)
-       $(INSTALL) -m644 $(PYTHON_DIR)/aubiowrapper.py $(DESTDIR)$(pkgpythondir)
-
-clean:
-       rm -f aubio_wrap.{c,o} $(PYTHON_DIR)/{_aubiowrapper.so,aubiowrapper.py,aubiowrapper.pyc}
-
-distclean: clean

diff --git a/swig/Makefile.in b/swig/Makefile.in
index 62d97f15f16e2fa8f9fbf842ae2ef50d11f684ac..59f5970b0612445cb1896aac05a6bd2e7fd60f7e 100644 (file)
--- a/swig/Makefile.in
+++ b/swig/Makefile.in
@@ -151,16 +151,9 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-EXTRA_DIST = aubio.i
 
-PYTHON_DIR = ../python/aubio
-SWIG = swig
-#SW_FLAGS = -c++
-# removed -Wall -Wmissing-prototypes -Wmissing-declarations 
-SW_CFLAGS = -DJACK_SUPPORT -shared -Werror -Wno-char-subscripts -Wno-unknown-pragmas
-#SW_CFLAGS = -Wno-missing-prototypes -Wno-missing-declarations
-SWINCLUDE = -I/usr/include/python2.3 -I../src -I../ext -I/usr/include
-SWLDFLAGS = -L../ext/.libs -laubioext -L../src/.libs -laubio
+# see ../python/Makefile.am
+EXTRA_DIST = aubio.i
 subdir = swig
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -229,6 +222,7 @@ check: check-am
 all-am: Makefile
 
 installdirs:
+install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -306,21 +300,6 @@ uninstall-am: uninstall-info-am
        mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
        uninstall-info-am
 
-
-all:
-       $(SWIG) $(SW_FLAGS) -outdir $(PYTHON_DIR) -python aubio.i
-       $(CC) $(SW_CFLAGS) -c aubio_wrap.c $(SWINCLUDE)
-       $(CC) $(SW_CFLAGS) aubio_wrap.o -o $(PYTHON_DIR)/_aubiowrapper.so $(SWLDFLAGS)
-
-install:
-       $(mkinstalldirs) $(DESTDIR)$(pkgpythondir)
-       $(INSTALL) $(PYTHON_DIR)/_aubiowrapper.so $(DESTDIR)$(pkgpythondir)
-       $(INSTALL) -m644 $(PYTHON_DIR)/aubiowrapper.py $(DESTDIR)$(pkgpythondir)
-
-clean:
-       rm -f aubio_wrap.{c,o} $(PYTHON_DIR)/{_aubiowrapper.so,aubiowrapper.py,aubiowrapper.pyc}
-
-distclean: clean
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: