Initial simplified build system based on GNU Make

24 files changed, 8 insertions, 1696 deletions

diff --git a/Make.config b/Make.config
new file mode 100644
index 0000000..036344a
--- /dev/null
+++ b/Make.config
@@ -0,0 +1,6 @@
+NAME := xtract
+DIRS := src src/c-ringbuf src/ooura src/dywapitchtrack
+
+ifeq ($(PLATFORM), Darwin)
+    LDFLAGS = -framework Accelerate
+endif
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index e844bd3..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-MAINTAINERCLEANFILES = INSTALL Makefile.in configure depcomp compile config.guess ltmain.sh config.sub missing install-sh aclocal.m4 config.h.in config.h.in~ py-compile m4/ltsugar.m4 m4/libtool.m4 m4/ltversion.m4 m4/lt~obsolete.m4 m4/ltoptions.m4
-
-if BUILD_SWIG
-SWIG_DIR = swig
-endif
-
-if HAVE_DOXYGEN
-DOXY_DIR = @DOXYGEN@
-endif
-
-SUBDIRS = src xtract examples $(SWIG_DIR) doc
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libxtract.pc
-
-ACLOCAL_AMFLAGS = -I m4
-
-EXTRA_DIST = examples/MSP \
-	     bootstrap \
-	     autogen.sh \
-	     README.md \
-	     TODO \
-	     $(SWIG_DIR)/java/*.java \
-	     $(SWIG_DIR)/java/xtract/core/src/* \
-	     $(SWIG_DIR)/python/test.py \
-	     $(SWIG_DIR)/python/__init__.py
-
diff --git a/README.md b/README.md
index 19be5ad..bdddb1f 100644
--- a/README.md
+++ b/README.md
@@ -18,98 +18,12 @@ The latest source code release for LibXtract can be downloaded from [https://git
 
 ## Dependencies
 
-To build the PD external, the PD header 'm_pd.h' is required, this can be found in the [Pure Data source code release](http://puredata.info/downloads/pure-data).
-
-If you are compiling LibXtract from a GIT clone, the **autotools** build system is required. This includes:
-
-    automake >= 1.11
-    autoconf >= 2.68
-    libtool >= 2.4
+To build the SWIG bindings [SWIG]() is required. For the Python bindings, a Python install is required. For the Java bindings a Java install is required.
 
 ## Installation
 
-If you are installing from a GIT clone, first run:
-
-    sh autogen.sh
-
-If autogen.sh was successful, or you downloaded the source release, type:
-
-    ./configure --enable-pd_example
-    make
-    sudo make install
-
-There following configure flags are optional:
-
-    --enable-pd_example (to build the PD example)
-    --enable-simpletest (to build the simpletest example)
-
-If you wish to build a Universal binary on OS X, you may need to do something like this:
-
-    CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" \./configure --isable-dependency-tracking --your-options
-
-## Building the MSP external
-
-Type:
-
-    cd examples/MSP
-    make
-    sudo make install
-
-To build for a specific architecture:
-
-    make intel
-    or
-    make ppc
-
-## Building the Python bindings
-
-To build the python bindings, add to your configure flags:
-
-    --enable-swig --with-python
-
-This requres additional dependencies to be resolved:
-
-    swig >= 1.3
-    python (with development files) >= 2.5
-
-It might work with earlier versions of Python, but this has not been tested.
+Type `make install` to build and install to `/usr/local`. Type `make install PREFIX=/somewhere/else` to install to `/somewhere/else`,
 
-If you do not have the 'standard' version of Python on OS X, you might need to tell the configure script where the python library is e.g.:
-
-    ./configure --your-flags LDFLAGS="-L/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/config/"
-
-To find your Python library type:
-
-    locate libpython
-
-NOTE: The python module will get installed under the main install prefix, so if your install prefix is set to /usr/local, then the python module will get installed to /usr/local/lib/python2.5/site-packages/libxtract/xtract. You may need to add this to your PYTHONPATH environment variable. For example in ~/.bash_profile add:
-    export PYTHONPATH=/usr/local/lib/python2.7/site-packages
-
-
-## Building the Java bindings
-
-To build the java bindings, add to your configure flags:
-
-    --enable-swig --with-java
-
-This requres additional dependencies to be resolved:
-
-    swig >= 1.3
-    java (with development files) >= 2.0
-
-It might work with other versions of Java, but this has not been tested.
-
-On OS X, you will probably need to set your CLASSPATH environment variable before running ./configure
-
-    export CLASSPATH=/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar
-
-On OS X, you also probably need to tell the configure script where to find your Java (JNI) headers.
-
-    ./configure --flags  CFLAGS="-I/System/Library/Frameworks/JavaVM.framework/Headers"
-
-To find out where your headers are:
-
-    locate jni.h
 
 ## Documentation
 
@@ -123,8 +37,6 @@ The generated HTML documentation can then be viewed in a web browser by opening
 
 
 
-
-
 ## License 
 
 Copyright (C) 2012 Jamie Bullock
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index cc118e8..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-# This works on Gentoo, whose automake wrapper is based on Mandrake:
-WANT_AUTOMAKE=1.6
-export WANT_AUTOMAKE
-
-
-case `uname -s` in
-  Linux)
-      LIBTOOLIZE=libtoolize
-      ACLOCALARGS='-I m4'
-      ;;
-  Darwin)
-      LIBTOOLIZE=glibtoolize
-      ACLOCALARGS='-I m4'
-      ;;
-  *)  echo error: unrecognized OS
-      exit 1
-      ;;
-esac
-
-AUTOMAKE_REQ=1.6
-
-# Automake version check from MusE
-lessthan () {
-  ver1="$1"
-  ver2="$2"
-
-  major1=$( echo $ver1 | sed "s/^\([0-9]*\)\..*/\1/");
-  minor1=$( echo $ver1 | sed "s/^[^\.]*\.\([0-9]*\).*/\1/" );
-  major2=$( echo $ver2 | sed "s/^\([0-9]*\)\..*/\1/");
-  minor2=$( echo $ver2 | sed "s/^[^\.]*\.\([0-9]*\).*/\1/" );
-  test "$major1" -lt "$major2" || test "$minor1" -lt "$minor2";
-}
-
-amver=$( automake --version | head -n 1 | sed "s/.* //" );
-if lessthan $amver $AUTOMAKE_REQ ; then
-    echo "you must have automake version >= $AUTOMAKE_REQ to proper plugin support"
-    exit 1
-fi
-
-
-echo "=============== running libtoolize --force --copy" &&
-    $LIBTOOLIZE --force --copy &&
-    echo "=============== running aclocal" &&
-    aclocal $ACLOCALARGS &&
-    echo "=============== running autoheader" &&
-    autoheader &&
-    echo "=============== running automake -c --add-missing --foreign" &&
-    automake -c --add-missing --foreign &&
-    echo "=============== running autoconf" &&
-    autoconf &&
-    echo "=============== done"
-
diff --git a/bootstrap b/bootstrap
deleted file mode 100644
index eff731b..0000000
--- a/bootstrap
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-autoreconf --force --install -I config -I m4
-
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 8f5b39f..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,363 +0,0 @@
-AC_PREREQ(2.13)
-# Increment for major API changes, release status changes
-m4_define(libxtract_major_version, 0)
-# Increment for feature additions and enhancements
-m4_define(libxtract_minor_version, 7)
-# Increment for fixes 
-m4_define(libxtract_fix_version, 1)
-# Development status
-m4_define(libIntegra_dev_status, [beta])
-
-m4_define(libxtract_version, libxtract_major_version.libxtract_minor_version.libxtract_fix_version)
-
-PACKAGE=libxtract
-
-AC_INIT([libxtract], [libxtract_version], [libxtract-devel@lists.sourceforge.net])
-AC_DEFINE(LIBXTRACT_VERSION, libxtract_version, [LibXtract Version])
-AM_INIT_AUTOMAKE([subdir-objects])
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_MACRO_DIR([m4])
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_LIBTOOL
-AC_PROG_INSTALL
-AC_C_BIGENDIAN
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-AC_ENABLE_STATIC(no)
-AC_ENABLE_SHARED(yes)
-AC_PROG_LIBTOOL
-AC_CHECK_HEADERS([math.h, stdlib.h, stdio.h])
-
-dnl DOXYGEN support
-
-AC_CHECK_PROGS([DOXYGEN], [doxygen])
-
-if test -z "$DOXYGEN";
-then AC_MSG_WARN([Doxygen not found - continuing without Doxygen support])
-else
-    AC_MSG_NOTICE([Doxygen found - continuing with Doxygen support])
-fi
-
-AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
-AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([doc/documentation.doxygen])])
-AC_SUBST(HAVE_DOXYGEN)
-
-dnl check if we have Accelerate.h
-
-#AC_CHECK_HEADER(Accelerate/Accelerate.h, [AC_DEFINE(HAVE_ACCELERATE, 1, [Accelerate framework])], [AC_DEFINE(HAVE_ACCELERATE, 0, [Accelerate framework])])
-AC_CHECK_HEADER(Accelerate/Accelerate.h, [use_ooura=false], [use_ooura=true])
-
-
-
-
-dnl if [[ "$have_accelerate" = "true" ]] ; then
-   dnl AC_DEFINE([HAVE_ACCELERATE], [1], [Accelerate headers])
-dnl fi
-
-dnl --enable flags
-
-AC_ARG_ENABLE(pd_example, 
-              [  --enable-pd_example    Compile the Pure Data external example],
-              [case "${enableval}" in
-               yes) pd_example=true ;;
-               no)  pd_example=false ;;
-               *) AC_MSG_ERROR(bad value ${enableval} for --enable-pd_external) ;;
-           esac],[pd_example=false])
-	   
-AC_ARG_ENABLE(simpletest, 
-              [  --enable-simpletest    Compile the 'simpletest' example],
-              [case "${enableval}" in
-               yes) simpletest=true ;;
-               no)  simpletest=false ;;
-               *) AC_MSG_ERROR(bad value ${enableval} for --enable-simpletest) ;;
-           esac],[simpletest=false])
-
-# libtool version: current:revision:age
-#
-# If the library source code has changed at all since the last update, then
-# increment revision (`c:r:a' becomes `c:r+1:a').
-#
-# If any interfaces have been added, removed, or changed since the last update,
-# increment current, and set revision to 0.
-#
-# If any interfaces have been added since the last public release, then
-# increment age.
-#
-# If any interfaces have been removed since the last public release, then set
-# age to 0.
-XTRACT_SO_VERSION=0:0:0
-
-CFLAGS="-pedantic -ansi -fno-strict-aliasing -Wall -std=c99 -I/usr/local/include"
-LDFLAGS="$LDFLAGS -lm"
-
-AC_ARG_WITH(ooura,
-    [  --with-ooura   compile with ooura fft backend ],
-    [
-     with_ooura="$withval"
-    ])
-
-if [[ "$with_ooura" = "yes" ]] ; then
-    use_ooura=true
-fi
-
-if [[ "$use_ooura" = "true" ]] ; then
-    AC_DEFINE([USE_OOURA], [1], [Use the Ooura fft backend])
-fi
-
-AM_CONDITIONAL([BUILD_OOURA], test "x$use_ooura" = 'xtrue')
-AC_SUBST(BUILD_OOURA)
-
-AC_ARG_WITH(pd_dir,
-    [  --with-pd-dir=path   pd header path (default=/usr/local/include) ],
-    [
-    CFLAGS+=" -I$withval"
-    echo
-    echo "pd dir is $withval"
-    echo
-    ])
-
-dnl set a specific java compiler
-AC_ARG_WITH(javac,
-	[  --with-javac=compiler  set a specific java compiler (determined automatically if not set) ],
-	[JAVAC="$withval"
-	echo
-	echo "JAVAC is set to $withval"
-	echo
-	])
-
-dnl If --enable-swig, make with java bindings
-AC_ARG_WITH(java,
-    [ --with-java=no If --enable-swig - make with java bindings (default=no) ],
-    [with_java=true
-    ])
-
-AM_CONDITIONAL(BUILD_JAVA, test "x${with_java}" = 'xtrue')
-
-dnl If --enable-swig, make with java bindings
-AC_ARG_WITH(python,
-    [ --with-python If --enable-swig - make with python bindings (default=no) ],    [with_python=true])
-
-AM_CONDITIONAL(BUILD_PYTHON, test "x${with_python}" = 'xtrue')
-
-dnl are we building the simpletest example
-if [[ "$simpletest" = "true" ]] ; then
-    AC_DEFINE([BUILD_SIMPLETEST], [1], [Build the simpletest example])
-fi
-
-AM_CONDITIONAL(BUILD_SIMPLETEST, test "x${simpletest}" = 'xtrue')
-
-dnl Are we building the PD examples?
-if [[ "$pd_example" = "true" ]] ; then
-    PD_SOURCES="xtract~.c"
-    AC_DEFINE([BUILD_PD_EXAMPLE], [1], [Build the pd example])
-    AC_CHECK_HEADER(m_pd.h, [have_pd_hdr=yes ], [
-    have_pd_hdr=no
-    echo
-    echo "no m_pd.h header found.  try with option --with-pd-dir=/path/to/pd/src"
-    echo
-    exit
-    ])
-fi
-
-AM_CONDITIONAL(BUILD_PD_EXAMPLE, test "x${pd_example}" = 'xtrue')
-
-
-dnl Enable debugging (no)
-AC_ARG_ENABLE(debug,
-  [  --enable-debug[[=value]]   compile with debug [[default=no]]],
-  with_debug="yes",
-  with_debug="no")
-if test "$with_debug" = "yes"
-then
-  AC_DEFINE(DEBUG,1,[Define to enable debug])
-  CFLAGS+="  -O0 -ggdb -g -Werror"
-else
-  CFLAGS+="  -O3"
-fi
-
-AC_ARG_ENABLE(swig,
-       [  --enable-swig    Generate swig bindings],
-       [case "${enableval}" in
-        yes) swig=true ;;
-        no)  swig=false ;;
-        *) AC_MSG_ERROR(bad value ${enableval} for --enable-swig) ;;
-    esac],[swig=false])
-
-
-
-if [[ "$with_java" = "true" ]] ; then
-    if test "$JAVAC" = ""
-    then
-	AC_PROG_JAVAC
-    fi
-    if test "$JAVAC" = "javac"
-    then
-	AC_JNI_INCLUDE_DIR
-    
-	for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS
-	do
-	    CFLAGS+=" -I$JNI_INCLUDE_DIR"
-	done
-    fi
-   dnl AC_PROG_JAVAH
-   dnl AC_PATH_PROG(JAVAH,javah)
-fi
-
-if [[ "$with_python" = "true" ]] ; then
-    AM_PATH_PYTHON
-    SWIG_PYTHON
-fi
-
-
-AM_CONDITIONAL(BUILD_SWIG, test "x${swig}" = 'xtrue')
-
-dnl SWIG stuff
-if [[ "$swig" = "true" ]] ; then
-    AX_PKG_SWIG(1.3.21, [], [ AC_MSG_ERROR([SWIG is not installed]) ])
-    AC_DEFINE([BUILD_SWIG], [1], [Build the swig bindings])
-fi
-
-dnl Check for architecture endian-ness
-#AC_C_BIGENDIAN(bigendian=true, bigendian=false, bigendian=undefined)
-#if [[ "$is_bigendian" = "false" ]] ; then
-#    AC_DEFINE([WORDS_BIGENDIAN], [0], [Architecture is big endian])
-#else
-#    AC_DEFINE([WORDS_BIGENDIAN], [1], [Architecture is not big endian])
-#fi
-
-
-dnl ------------------------------------------
-dnl ----  do some magic to gues the host opsys
-dnl ----  taken from libvorbis configure.in
-dnl ------------------------------------------
-dnl AC_CANONICAL_HOST
-
-dnl AC_SUBST(PD_CFLAGS,"$PD_CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1")
-dnl AC_SUBST(PD_LDFLAGS,"$PD_LDFLAGS -shared")
-dnl pd_ldflags="$PD_LDFLAGS -L/usr/local/lib -ldl"
-if test -z "$GCC"; then
-        case $host in
-        *-*-irix*)
-            dnl If we're on IRIX, we wanna use cc even if gcc
-            dnl is there (unless the user has overriden us)...
-            if test -z "$CC"; then
-                    CC=cc
-            fi
-        ;;
-        sparc-sun-solaris*)
-            PD_CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
-        ;;
-        *)
-            PD_CFLAGS="-O"
-        ;;
-        esac
-else
-
-        case $host in
-        *86-*-linux*)
-            PD_CFLAGS+=" -DUNIX -Wall -Wimplicit -Wunused"
-            PD_LDFLAGS+=" -shared"
-            dnl we could test for bad glibc here, but don't
-            PD_SUFFIX=pd_linux
-        ;;
-        powerpc-*-linux*)
-            PD_CFLAGS+=" -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes"
-            PD_LDFLAGS+=" -shared"
-            PD_SUFFIX=pd_linux
-        ;;
-        *-*-linux*)
-            PD_CFLAGS+=" -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -fPIC"
-            PD_LDFLAGS+=" -shared -export_dynamic -undefined dynamic_lookup"
-            PD_SUFFIX=pd_linux
-        ;;
-        sparc-sun-*)
-            echo "YOU HAVE A SPARC STATION, not setting any flags, not supported yet"
-        ;;
-        dnl *86-*-darwin*)
-        dnl    PD_CFLAGS="$PD_CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes"
-        dnl    PD_LDFLAGS="$PD_LDFLAGS -dynamiclib -mmacosx-version-min=10.5 -undefined dynamic_lookup -single_module"
-        dnl    PD_SUFFIX=pd_darwin
-	dnl ;;
-	*-*-darwin*)
-            PD_CFLAGS+=" -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes"
-            PD_LDFLAGS+=" -bundle -undefined dynamic_lookup -flat_namespace"
-            PD_SUFFIX=pd_darwin
-	;;
-
-        *)
-        dnl assume unix
-            PD_CFLAGS+=" -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1"
-            PD_LDFLAGS+=" -shared"
-            PD_SUFFIX=pd_linux
-        ;;
-        esac
-fi
-
-PD_CFLAGS+=" -DPD"
-
-AC_SUBST(PD_CFLAGS)
-AC_SUBST(PD_LDFLAGS)
-AC_SUBST(PD_SUFFIX)
-AC_SUBST(PD_SOURCES)
-		
-AC_CONFIG_FILES([libxtract.pc])
-
-dnl There must be a better way to do this...
-AC_OUTPUT(Makefile src/Makefile doc/Makefile xtract/Makefile examples/Makefile examples/puredata/Makefile examples/simpletest/Makefile swig/Makefile swig/python/Makefile swig/java/Makefile)
-
-echo
-echo "**************************************************************"
-echo
-echo "Summary:"
-echo
-dnl echo you are using the ${host} architecture 
-
-
-if test -z "$DOXYGEN"; then
-    echo "doxygen documentation:            no (doxygen not found)"
-else
-    echo "doxygen documentation:            yes"
-fi
-if test "$simpletest" = "true"; then
-    echo "simpletest example:               yes"
-else
-    echo "simpletest example:               no"
-fi
-if test "$pd_example" = "true"; then
-    echo "PD external:                      yes"
-    echo 
-    echo "The PD help files will be installed in:" 
-    echo ${prefix}"/lib/doc/5.reference/xtract/" 
-    echo "You must make sure that this is in your PD help path"
-else
-    echo "PD external:                      no"
-fi
-if test "$swig" == "true"; then
-    echo "SWIG bindings:                    yes"
-else
-    echo "SWIG bindings:                    no"
-fi
-if test "$with_java" == "true"; then
-    echo "with JAVA module:                 yes"
-else
-    echo "with JAVA module:                 no"
-fi
-if test "$with_python" == "true"; then
-    echo "with Python module:               yes"
-else
-    echo "with Python module:               no"
-fi
-if test "$use_ooura" == "true"; then
-    echo "Ooura FFT backend:                yes"
-else
-    echo "Accelerate FFT backend:           yes"
-fi
-
-
-echo
-echo "**************************************************************"
-echo
-echo Configuration completed successfully. Type \'make\' to build ${PACKAGE}
-echo
-
-
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 560a006..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-MAINTAINERCLEANFILES=Makefile.in config.log
-if HAVE_DOXYGEN
-CLEANFILES=doxygen-build.stamp
-
-DOX=documentation.doxygen
-
-INSTIMAGES=html/doxygen.png
-
-DOC_STAMPS=html-build.stamp
-
-DOC_DIR=$(HTML_DIR)
-
-all-local: doxygen-build.stamp
-
-doxygen-build.stamp: $(DOX) ../xtract/libxtract.h ../xtract/xtract_scalar.h ../xtract/xtract_vector.h
-		@echo '*** Running doxygen ***'
-		doxygen $(DOX)
-		touch doxygen-build.stamp
-
-clean-local:
-		rm -f *~ *.bak $(DOC_STAMPS) || true
-		if test -d html; then rm -fr html; fi
-		if test -d latex; then rm -fr latex; fi
-		if test -d man; then rm -fr man; fi
-
-distclean-local: clean
-		rm -f *.stamp || true
-		if test -d html; then rm -rf html; fi
-
-endif
diff --git a/examples/Makefile.am b/examples/Makefile.am
deleted file mode 100644
index 46acfbc..0000000
--- a/examples/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in 
-
-if BUILD_PD_EXAMPLE 
-PUREDATA_DIR = puredata
-endif
-
-if BUILD_SIMPLETEST
-SIMPLETEST_DIR = simpletest
-endif
-
-SUBDIRS = $(PUREDATA_DIR) $(SIMPLETEST_DIR)
diff --git a/examples/puredata/Makefile.am b/examples/puredata/Makefile.am
deleted file mode 100644
index ee594d7..0000000
--- a/examples/puredata/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUFFIXES = .@PD_SUFFIX@
-PDDIR = $(prefix)/lib/pd
-pddir = $(PDDIR)
-
-## Make and install the shared library.
-pdinstalldir = $(pddir)/extra
-pdinstallrefdir = $(pddir)/doc/5.reference
-pdinstallexpdir = $(pddir)/doc/xtract
-
-pdinstall_PROGRAMS = xtract.@PD_SUFFIX@
-
-xtract_@PD_SUFFIX@_SOURCES = xtract~.c
-
-pdincludedir = $(pddir)/src
-
-AM_CFLAGS = @PD_CFLAGS@ -I$(top_srcdir)/src -I$(pdincludedir)
-AM_LDFLAGS = @PD_LDFLAGS@ -lxtract -L$(top_builddir)/src/
-		
-## Install the documentation.
-
-install:
-	install -d $(pdinstalldir)
-	install -m 644 $(top_builddir)/examples/puredata/.libs/xtract.@PD_SUFFIX@ $(pdinstalldir)/xtract~.@PD_SUFFIX@
-	install -d $(pddir)/doc/5.reference/xtract
-	cp xtract/* $(PDDIR)/doc/5.reference/xtract
diff --git a/examples/simpletest/Makefile.am b/examples/simpletest/Makefile.am
deleted file mode 100644
index 9f4256a..0000000
--- a/examples/simpletest/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-noinst_PROGRAMS = simpletest
-AM_CPPFLAGS = -I$(top_srcdir)/src
-simpletest_SOURCES = simpletest.cpp WaveFile.cpp
-simpletest_LDADD = ../../src/libxtract.la
-
-
diff --git a/libxtract.pc.in b/libxtract.pc.in
deleted file mode 100644
index 6a1dcfd..0000000
--- a/libxtract.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libxtract
-Description: A lightweight feature extraction library
-Version: @VERSION@
-Libs: -L${libdir} -lxtract
-Cflags: -I${includedir} 
diff --git a/m4/ac_jni_include_dir.m4 b/m4/ac_jni_include_dir.m4
deleted file mode 100644
index b8cbf34..0000000
--- a/m4/ac_jni_include_dir.m4
+++ /dev/null
@@ -1,112 +0,0 @@
-##### http://autoconf-archive.cryp.to/ac_jni_include_dir.html
-#
-# SYNOPSIS
-#
-#   AC_JNI_INCLUDE_DIR
-#
-# DESCRIPTION
-#
-#   AC_JNI_INCLUDE_DIR finds include directories needed for compiling
-#   programs using the JNI interface.
-#
-#   JNI include directories are usually in the java distribution This
-#   is deduced from the value of JAVAC. When this macro completes, a
-#   list of directories is left in the variable JNI_INCLUDE_DIRS.
-#
-#   Example usage follows:
-#
-#       AC_JNI_INCLUDE_DIR
-#
-#       for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS
-#       do
-#               CPPFLAGS="$CPPFLAGS -I$JNI_INCLUDE_DIR"
-#       done
-#
-#   If you want to force a specific compiler:
-#
-#   - at the configure.in level, set JAVAC=yourcompiler before calling
-#   AC_JNI_INCLUDE_DIR
-#
-#   - at the configure level, setenv JAVAC
-#
-#   Note: This macro can work with the autoconf M4 macros for Java
-#   programs. This particular macro is not part of the original set of
-#   macros.
-#
-# LAST MODIFICATION
-#
-#   2006-05-27
-#
-# COPYLEFT
-#
-#   Copyright (c) 2006 Don Anderson <dda@sleepycat.com>
-#
-#   Copying and distribution of this file, with or without
-#   modification, are permitted in any medium without royalty provided
-#   the copyright notice and this notice are preserved.
-
-AC_DEFUN([AC_JNI_INCLUDE_DIR],[
-
-JNI_INCLUDE_DIRS=""
-
-test "x$JAVAC" = x && AC_MSG_ERROR(['\$JAVAC' undefined])
-AC_PATH_PROG(_ACJNI_JAVAC, $JAVAC, no)
-test "x$_ACJNI_JAVAC" = xno && AC_MSG_ERROR([$JAVAC could not be found in path])
-
-_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC")
-_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'`
-case "$host_os" in
-        darwin*)        _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
-                        _JINC="$_JTOPDIR/Headers";;
-        *)              _JINC="$_JTOPDIR/include";;
-esac
-if test -f "$_JINC/jni.h"; then
-        JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $_JINC"
-else
-        _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
-        if test -f "$_JTOPDIR/include/jni.h"; then
-                JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $_JTOPDIR/include"
-        else
-                AC_MSG_ERROR([cannot find java include files])
-        fi
-fi
-
-# get the likely subdirectories for system specific java includes
-case "$host_os" in
-bsdi*)          _JNI_INC_SUBDIRS="bsdos";;
-linux*)         _JNI_INC_SUBDIRS="linux genunix";;
-osf*)           _JNI_INC_SUBDIRS="alpha";;
-solaris*)       _JNI_INC_SUBDIRS="solaris";;
-mingw*)			_JNI_INC_SUBDIRS="win32";;
-cygwin*)		_JNI_INC_SUBDIRS="win32";;
-*)              _JNI_INC_SUBDIRS="genunix";;
-esac
-
-# add any subdirectories that are present
-for JINCSUBDIR in $_JNI_INC_SUBDIRS
-do
-        if test -d "$_JTOPDIR/include/$JINCSUBDIR"; then
-                JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $_JTOPDIR/include/$JINCSUBDIR"
-        fi
-done
-])
-
-# _ACJNI_FOLLOW_SYMLINKS <path>
-# Follows symbolic links on <path>,
-# finally setting variable _ACJNI_FOLLOWED
-# --------------------
-AC_DEFUN([_ACJNI_FOLLOW_SYMLINKS],[
-# find the include directory relative to the javac executable
-_cur="$1"
-while ls -ld "$_cur" 2>/dev/null | grep " -> " >/dev/null; do
-        AC_MSG_CHECKING(symlink for $_cur)
-        _slink=`ls -ld "$_cur" | sed 's/.* -> //'`
-        case "$_slink" in
-        /*) _cur="$_slink";;
-        # 'X' avoids triggering unwanted echo options.
-        *) _cur=`echo "X$_cur" | sed -e 's/^X//' -e 's:[[^/]]*$::'`"$_slink";;
-        esac
-        AC_MSG_RESULT($_cur)
-done
-_ACJNI_FOLLOWED="$_cur"
-])# _ACJNI
diff --git a/m4/ac_prog_javac.m4 b/m4/ac_prog_javac.m4
deleted file mode 100644
index 87c5723..0000000
--- a/m4/ac_prog_javac.m4
+++ /dev/null
@@ -1,84 +0,0 @@
-##### http://autoconf-archive.cryp.to/ac_prog_javac.html
-#
-# SYNOPSIS
-#
-#   AC_PROG_JAVAC
-#
-# DESCRIPTION
-#
-#   AC_PROG_JAVAC tests an existing Java compiler. It uses the
-#   environment variable JAVAC then tests in sequence various common
-#   Java compilers. For political reasons, it starts with the free
-#   ones.
-#
-#   If you want to force a specific compiler:
-#
-#   - at the configure.in level, set JAVAC=yourcompiler before calling
-#   AC_PROG_JAVAC
-#
-#   - at the configure level, setenv JAVAC
-#
-#   You can use the JAVAC variable in your Makefile.in, with @JAVAC@.
-#
-#   *Warning*: its success or failure can depend on a proper setting of
-#   the CLASSPATH env. variable.
-#
-#   TODO: allow to exclude compilers (rationale: most Java programs
-#   cannot compile with some compilers like guavac).
-#
-#   Note: This is part of the set of autoconf M4 macros for Java
-#   programs. It is VERY IMPORTANT that you download the whole set,
-#   some macros depend on other. Unfortunately, the autoconf archive
-#   does not support the concept of set of macros, so I had to break it
-#   for submission. The general documentation, as well as the sample
-#   configure.in, is included in the AC_PROG_JAVA macro.
-#
-# LAST MODIFICATION
-#
-#   2000-07-19
-#
-# COPYLEFT
-#
-#   Copyright (c) 2000 Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
-#
-#   This program is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation; either version 2 of the
-#   License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#   General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-#   02111-1307, USA.
-#
-#   As a special exception, the respective Autoconf Macro's copyright
-#   owner gives unlimited permission to copy, distribute and modify the
-#   configure scripts that are the output of Autoconf when processing
-#   the Macro. You need not follow the terms of the GNU General Public
-#   License when using or distributing such scripts, even though
-#   portions of the text of the Macro appear in them. The GNU General
-#   Public License (GPL) does govern all other use of the material that
-#   constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the
-#   Autoconf Macro released by the Autoconf Macro Archive. When you
-#   make and distribute a modified version of the Autoconf Macro, you
-#   may extend this special exception to the GPL to apply to your
-#   modified version as well.
-
-AC_DEFUN([AC_PROG_JAVAC],[
-AC_REQUIRE([AC_EXEEXT])dnl
-if test "x$JAVAPREFIX" = x; then
-        test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT javac$EXEEXT)
-else
-        test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT javac$EXEEXT, $JAVAPREFIX)
-fi
-test "x$JAVAC" = x && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH])
-AC_PROG_JAVAC_WORKS
-AC_PROVIDE([$0])dnl
-])
diff --git a/m4/ac_prog_javac_works.m4 b/m4/ac_prog_javac_works.m4
deleted file mode 100644
index 5a16ca7..0000000
--- a/m4/ac_prog_javac_works.m4
+++ /dev/null
@@ -1,75 +0,0 @@
-##### http://autoconf-archive.cryp.to/ac_prog_javac_works.html
-#
-# SYNOPSIS
-#
-#   AC_PROG_JAVAC_WORKS
-#
-# DESCRIPTION
-#
-#   Internal use ONLY.
-#
-#   Note: This is part of the set of autoconf M4 macros for Java
-#   programs. It is VERY IMPORTANT that you download the whole set,
-#   some macros depend on other. Unfortunately, the autoconf archive
-#   does not support the concept of set of macros, so I had to break it
-#   for submission. The general documentation, as well as the sample
-#   configure.in, is included in the AC_PROG_JAVA macro.
-#
-# LAST MODIFICATION
-#
-#   2000-07-19
-#
-# COPYLEFT
-#
-#   Copyright (c) 2000 Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
-#
-#   This program is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation; either version 2 of the
-#   License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#   General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-#   02111-1307, USA.
-#
-#   As a special exception, the respective Autoconf Macro's copyright
-#   owner gives unlimited permission to copy, distribute and modify the
-#   configure scripts that are the output of Autoconf when processing
-#   the Macro. You need not follow the terms of the GNU General Public
-#   License when using or distributing such scripts, even though
-#   portions of the text of the Macro appear in them. The GNU General
-#   Public License (GPL) does govern all other use of the material that
-#   constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the
-#   Autoconf Macro released by the Autoconf Macro Archive. When you
-#   make and distribute a modified version of the Autoconf Macro, you
-#   may extend this special exception to the GPL to apply to your
-#   modified version as well.
-
-AC_DEFUN([AC_PROG_JAVAC_WORKS],[
-AC_CACHE_CHECK([if $JAVAC works], ac_cv_prog_javac_works, [
-JAVA_TEST=Test.java
-CLASS_TEST=Test.class
-cat << \EOF > $JAVA_TEST
-/* [#]line __oline__ "configure" */
-public class Test {
-}
-EOF
-if AC_TRY_COMMAND($JAVAC $JAVACFLAGS $JAVA_TEST) >/dev/null 2>&1; then
-  ac_cv_prog_javac_works=yes
-else
-  AC_MSG_ERROR([The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)])
-  echo "configure: failed program was:" >&AC_FD_CC
-  cat $JAVA_TEST >&AC_FD_CC
-fi
-rm -f $JAVA_TEST $CLASS_TEST
-])
-AC_PROVIDE([$0])dnl
-])
diff --git a/m4/ax_pkg_swig.m4 b/m4/ax_pkg_swig.m4
deleted file mode 100644
index e112f3d..0000000
--- a/m4/ax_pkg_swig.m4
+++ /dev/null
@@ -1,135 +0,0 @@
-# ===========================================================================
-#        http://www.gnu.org/software/autoconf-archive/ax_pkg_swig.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PKG_SWIG([major.minor.micro], [action-if-found], [action-if-not-found])
-#
-# DESCRIPTION
-#
-#   This macro searches for a SWIG installation on your system. If found,
-#   then SWIG is AC_SUBST'd; if not found, then $SWIG is empty.  If SWIG is
-#   found, then SWIG_LIB is set to the SWIG library path, and AC_SUBST'd.
-#
-#   You can use the optional first argument to check if the version of the
-#   available SWIG is greater than or equal to the value of the argument. It
-#   should have the format: N[.N[.N]] (N is a number between 0 and 999. Only
-#   the first N is mandatory.) If the version argument is given (e.g.
-#   1.3.17), AX_PKG_SWIG checks that the swig package is this version number
-#   or higher.
-#
-#   As usual, action-if-found is executed if SWIG is found, otherwise
-#   action-if-not-found is executed.
-#
-#   In configure.in, use as:
-#
-#     AX_PKG_SWIG(1.3.17, [], [ AC_MSG_ERROR([SWIG is required to build..]) ])
-#     AX_SWIG_ENABLE_CXX
-#     AX_SWIG_MULTI_MODULE_SUPPORT
-#     AX_SWIG_PYTHON
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Sebastian Huber <sebastian-huber@web.de>
-#   Copyright (c) 2008 Alan W. Irwin <irwin@beluga.phys.uvic.ca>
-#   Copyright (c) 2008 Rafael Laboissiere <rafael@laboissiere.net>
-#   Copyright (c) 2008 Andrew Collier <colliera@ukzn.ac.za>
-#   Copyright (c) 2011 Murray Cumming <murrayc@openismus.com>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 8
-
-AC_DEFUN([AX_PKG_SWIG],[
-        # Ubuntu has swig 2.0 as /usr/bin/swig2.0
-        AC_PATH_PROGS([SWIG],[swig swig2.0])
-        if test -z "$SWIG" ; then
-                m4_ifval([$3],[$3],[:])
-        elif test -n "$1" ; then
-                AC_MSG_CHECKING([SWIG version])
-                [swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`]
-                AC_MSG_RESULT([$swig_version])
-                if test -n "$swig_version" ; then
-                        # Calculate the required version number components
-                        [required=$1]
-                        [required_major=`echo $required | sed 's/[^0-9].*//'`]
-                        if test -z "$required_major" ; then
-                                [required_major=0]
-                        fi
-                        [required=`echo $required | sed 's/[0-9]*[^0-9]//'`]
-                        [required_minor=`echo $required | sed 's/[^0-9].*//'`]
-                        if test -z "$required_minor" ; then
-                                [required_minor=0]
-                        fi
-                        [required=`echo $required | sed 's/[0-9]*[^0-9]//'`]
-                        [required_patch=`echo $required | sed 's/[^0-9].*//'`]
-                        if test -z "$required_patch" ; then
-                                [required_patch=0]
-                        fi
-                        # Calculate the available version number components
-                        [available=$swig_version]
-                        [available_major=`echo $available | sed 's/[^0-9].*//'`]
-                        if test -z "$available_major" ; then
-                                [available_major=0]
-                        fi
-                        [available=`echo $available | sed 's/[0-9]*[^0-9]//'`]
-                        [available_minor=`echo $available | sed 's/[^0-9].*//'`]
-                        if test -z "$available_minor" ; then
-                                [available_minor=0]
-                        fi
-                        [available=`echo $available | sed 's/[0-9]*[^0-9]//'`]
-                        [available_patch=`echo $available | sed 's/[^0-9].*//'`]
-                        if test -z "$available_patch" ; then
-                                [available_patch=0]
-                        fi
-                        # Convert the version tuple into a single number for easier comparison.
-                        # Using base 100 should be safe since SWIG internally uses BCD values
-                        # to encode its version number.
-                        required_swig_vernum=`expr $required_major \* 10000 \
-                            \+ $required_minor \* 100 \+ $required_patch`
-                        available_swig_vernum=`expr $available_major \* 10000 \
-                            \+ $available_minor \* 100 \+ $available_patch`
-
-                        if test $available_swig_vernum -lt $required_swig_vernum; then
-                                AC_MSG_WARN([SWIG version >= $1 is required.  You have $swig_version.])
-                                SWIG=''
-                                m4_ifval([$3],[$3],[])
-                        else
-                                AC_MSG_CHECKING([for SWIG library])
-                                SWIG_LIB=`$SWIG -swiglib`
-                                AC_MSG_RESULT([$SWIG_LIB])
-                                m4_ifval([$2],[$2],[])
-                        fi
-                else
-                        AC_MSG_WARN([cannot determine SWIG version])
-                        SWIG=''
-                        m4_ifval([$3],[$3],[])
-                fi
-        fi
-        AC_SUBST([SWIG_LIB])
-])
diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4
deleted file mode 100644
index a62b860..0000000
--- a/m4/ax_python_devel.m4
+++ /dev/null
@@ -1,325 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_python_devel.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PYTHON_DEVEL([version])
-#
-# DESCRIPTION
-#
-#   Note: Defines as a precious variable "PYTHON_VERSION". Don't override it
-#   in your configure.ac.
-#
-#   This macro checks for Python and tries to get the include path to
-#   'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS)
-#   output variables. It also exports $(PYTHON_EXTRA_LIBS) and
-#   $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code.
-#
-#   You can search for some particular version of Python by passing a
-#   parameter to this macro, for example ">= '2.3.1'", or "== '2.4'". Please
-#   note that you *have* to pass also an operator along with the version to
-#   match, and pay special attention to the single quotes surrounding the
-#   version number. Don't use "PYTHON_VERSION" for this: that environment
-#   variable is declared as precious and thus reserved for the end-user.
-#
-#   This macro should work for all versions of Python >= 2.1.0. As an end
-#   user, you can disable the check for the python version by setting the
-#   PYTHON_NOVERSIONCHECK environment variable to something else than the
-#   empty string.
-#
-#   If you need to use this macro for an older Python version, please
-#   contact the authors. We're always open for feedback.
-#
-# LICENSE
-#
-#   Copyright (c) 2009 Sebastian Huber <sebastian-huber@web.de>
-#   Copyright (c) 2009 Alan W. Irwin <irwin@beluga.phys.uvic.ca>
-#   Copyright (c) 2009 Rafael Laboissiere <rafael@laboissiere.net>
-#   Copyright (c) 2009 Andrew Collier <colliera@ukzn.ac.za>
-#   Copyright (c) 2009 Matteo Settenvini <matteo@member.fsf.org>
-#   Copyright (c) 2009 Horst Knorr <hk_classes@knoda.org>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 8
-
-AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL])
-AC_DEFUN([AX_PYTHON_DEVEL],[
-	#
-	# Allow the use of a (user set) custom python version
-	#
-	AC_ARG_VAR([PYTHON_VERSION],[The installed Python
-		version to use, for example '2.3'. This string
-		will be appended to the Python interpreter
-		canonical name.])
-
-	AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
-	if test -z "$PYTHON"; then
-	   AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path])
-	   PYTHON_VERSION=""
-	fi
-
-	#
-	# Check for a version of Python >= 2.1.0
-	#
-	AC_MSG_CHECKING([for a version of Python >= '2.1.0'])
-	ac_supports_python_ver=`$PYTHON -c "import sys; \
-		ver = sys.version.split ()[[0]]; \
-		print (ver >= '2.1.0')"`
-	if test "$ac_supports_python_ver" != "True"; then
-		if test -z "$PYTHON_NOVERSIONCHECK"; then
-			AC_MSG_RESULT([no])
-			AC_MSG_FAILURE([
-This version of the AC@&t@_PYTHON_DEVEL macro
-doesn't work properly with versions of Python before
-2.1.0. You may need to re-run configure, setting the
-variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG,
-PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
-Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
-to something else than an empty string.
-])
-		else
-			AC_MSG_RESULT([skip at user request])
-		fi
-	else
-		AC_MSG_RESULT([yes])
-	fi
-
-	#
-	# if the macro parameter ``version'' is set, honour it
-	#
-	if test -n "$1"; then
-		AC_MSG_CHECKING([for a version of Python $1])
-		ac_supports_python_ver=`$PYTHON -c "import sys; \
-			ver = sys.version.split ()[[0]]; \
-			print (ver $1)"`
-		if test "$ac_supports_python_ver" = "True"; then
-		   AC_MSG_RESULT([yes])
-		else
-			AC_MSG_RESULT([no])
-			AC_MSG_ERROR([this package requires Python $1.
-If you have it installed, but it isn't the default Python
-interpreter in your system path, please pass the PYTHON_VERSION
-variable to configure. See ``configure --help'' for reference.
-])
-			PYTHON_VERSION=""
-		fi
-	fi
-
-	#
-	# Check if you have distutils, else fail
-	#
-	AC_MSG_CHECKING([for the distutils Python package])
-	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
-	if test -z "$ac_distutils_result"; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		AC_MSG_ERROR([cannot import Python module "distutils".
-Please check your Python installation. The error was:
-$ac_distutils_result])
-		PYTHON_VERSION=""
-	fi
-
-	#
-	# Check for Python include path
-	#
-	AC_MSG_CHECKING([for Python include path])
-	if test -z "$PYTHON_CPPFLAGS"; then
-		python_path=`$PYTHON -c "import distutils.sysconfig; \
-			print (distutils.sysconfig.get_python_inc ());"`
-		if test -n "${python_path}"; then
-			python_path="-I$python_path"
-		fi
-		PYTHON_CPPFLAGS=$python_path
-	fi
-	AC_MSG_RESULT([$PYTHON_CPPFLAGS])
-	AC_SUBST([PYTHON_CPPFLAGS])
-
-	#
-	# Check for Python library path
-	#
-	AC_MSG_CHECKING([for Python library path])
-	if test -z "$PYTHON_LDFLAGS"; then
-		# (makes two attempts to ensure we've got a version number
-		# from the interpreter)
-		ac_python_version=`cat<<EOD | $PYTHON -
-
-# join all versioning strings, on some systems
-# major/minor numbers could be in different list elements
-from distutils.sysconfig import *
-ret = ''
-for e in get_config_vars ('VERSION'):
-	if (e != None):
-		ret += e
-print (ret)
-EOD`
-
-		if test -z "$ac_python_version"; then
-			if test -n "$PYTHON_VERSION"; then
-				ac_python_version=$PYTHON_VERSION
-			else
-				ac_python_version=`$PYTHON -c "import sys; \
-					print (sys.version[[:3]])"`
-			fi
-		fi
-
-		# Make the versioning information available to the compiler
-		AC_DEFINE_UNQUOTED([HAVE_PYTHON], ["$ac_python_version"],
-                                   [If available, contains the Python version number currently in use.])
-
-		# First, the library directory:
-		ac_python_libdir=`cat<<EOD | $PYTHON -
-
-# There should be only one
-import distutils.sysconfig
-for e in distutils.sysconfig.get_config_vars ('LIBDIR'):
-	if e != None:
-		print (e)
-		break
-EOD`
-
-		# Before checking for libpythonX.Y, we need to know
-		# the extension the OS we're on uses for libraries
-		# (we take the first one, if there's more than one fix me!):
-		ac_python_soext=`$PYTHON -c \
-		  "import distutils.sysconfig; \
-		  print (distutils.sysconfig.get_config_vars('SO')[[0]])"`
-
-		# Now, for the library:
-		ac_python_soname=`$PYTHON -c \
-		  "import distutils.sysconfig; \
-		  print (distutils.sysconfig.get_config_vars('LDLIBRARY')[[0]])"`
-
-		# Strip away extension from the end to canonicalize its name:
-		ac_python_library=`echo "$ac_python_soname" | sed "s/${ac_python_soext}$//"`
-
-		# This small piece shamelessly adapted from PostgreSQL python macro;
-		# credits goes to momjian, I think. I'd like to put the right name
-		# in the credits, if someone can point me in the right direction... ?
-		#
-		if test -n "$ac_python_libdir" -a -n "$ac_python_library" \
-			-a x"$ac_python_library" != x"$ac_python_soname"
-		then
-			# use the official shared library
-			ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`
-			PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library"
-		else
-			# old way: use libpython from python_configdir
-			ac_python_libdir=`$PYTHON -c \
-			  "from distutils.sysconfig import get_python_lib as f; \
-			  import os; \
-			  print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`
-			PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version"
-		fi
-
-		if test -z "PYTHON_LDFLAGS"; then
-			AC_MSG_ERROR([
-  Cannot determine location of your Python DSO. Please check it was installed with
-  dynamic libraries enabled, or try setting PYTHON_LDFLAGS by hand.
-			])
-		fi
-	fi
-	AC_MSG_RESULT([$PYTHON_LDFLAGS])
-	AC_SUBST([PYTHON_LDFLAGS])
-
-	#
-	# Check for site packages
-	#
-	AC_MSG_CHECKING([for Python site-packages path])
-	if test -z "$PYTHON_SITE_PKG"; then
-		PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
-			print (distutils.sysconfig.get_python_lib(0,0));"`
-	fi
-	AC_MSG_RESULT([$PYTHON_SITE_PKG])
-	AC_SUBST([PYTHON_SITE_PKG])
-
-	#
-	# libraries which must be linked in when embedding
-	#
-	AC_MSG_CHECKING(python extra libraries)
-	if test -z "$PYTHON_EXTRA_LIBS"; then
-	   PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
-                conf = distutils.sysconfig.get_config_var; \
-                print (conf('LOCALMODLIBS') + ' ' + conf('LIBS'))"`
-	fi
-	AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
-	AC_SUBST(PYTHON_EXTRA_LIBS)
-
-	#
-	# linking flags needed when embedding
-	#
-	AC_MSG_CHECKING(python extra linking flags)
-	if test -z "$PYTHON_EXTRA_LDFLAGS"; then
-		PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
-			conf = distutils.sysconfig.get_config_var; \
-			print (conf('LINKFORSHARED'))"`
-	fi
-	AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
-	AC_SUBST(PYTHON_EXTRA_LDFLAGS)
-
-	#
-	# final check to see if everything compiles alright
-	#
-	AC_MSG_CHECKING([consistency of all components of python development environment])
-	# save current global flags
-	ac_save_LIBS="$LIBS"
-	ac_save_CPPFLAGS="$CPPFLAGS"
-	LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS $PYTHON_EXTRA_LIBS"
-	CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
-	AC_LANG_PUSH([C])
-	AC_LINK_IFELSE([
-		AC_LANG_PROGRAM([[#include <Python.h>]],
-				[[Py_Initialize();]])
-		],[pythonexists=yes],[pythonexists=no])
-	AC_LANG_POP([C])
-	# turn back to default flags
-	CPPFLAGS="$ac_save_CPPFLAGS"
-	LIBS="$ac_save_LIBS"
-
-	AC_MSG_RESULT([$pythonexists])
-
-        if test ! "x$pythonexists" = "xyes"; then
-	   AC_MSG_FAILURE([
-  Could not link test program to Python. Maybe the main Python library has been
-  installed in some non-standard library path. If so, pass it to configure,
-  via the LDFLAGS environment variable.
-  Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib"
-  ============================================================================
-   ERROR!
-   You probably have to install the development version of the Python package
-   for your distribution.  The exact name of this package varies among them.
-  ============================================================================
-	   ])
-	  PYTHON_VERSION=""
-	fi
-
-	#
-	# all done!
-	#
-])
diff --git a/m4/ax_swig_enable_cxx.m4 b/m4/ax_swig_enable_cxx.m4
deleted file mode 100644
index 348c15d..0000000
--- a/m4/ax_swig_enable_cxx.m4
+++ /dev/null
@@ -1,53 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_swig_enable_cxx.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_SWIG_ENABLE_CXX
-#
-# DESCRIPTION
-#
-#   Enable SWIG C++ support. This affects all invocations of $(SWIG).
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Sebastian Huber <sebastian-huber@web.de>
-#   Copyright (c) 2008 Alan W. Irwin <irwin@beluga.phys.uvic.ca>
-#   Copyright (c) 2008 Rafael Laboissiere <rafael@laboissiere.net>
-#   Copyright (c) 2008 Andrew Collier <colliera@ukzn.ac.za>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 6
-
-AU_ALIAS([SWIG_ENABLE_CXX], [AX_SWIG_ENABLE_CXX])
-AC_DEFUN([AX_SWIG_ENABLE_CXX],[
-        AC_REQUIRE([AX_PKG_SWIG])
-        AC_REQUIRE([AC_PROG_CXX])
-        SWIG="$SWIG -c++"
-])
diff --git a/m4/ax_swig_multi_module_support.m4 b/m4/ax_swig_multi_module_support.m4
deleted file mode 100644
index f9c3842..0000000
--- a/m4/ax_swig_multi_module_support.m4
+++ /dev/null
@@ -1,56 +0,0 @@
-# ================================================================================
-#  http://www.gnu.org/software/autoconf-archive/ax_swig_multi_module_support.html
-# ================================================================================
-#
-# SYNOPSIS
-#
-#   AX_SWIG_MULTI_MODULE_SUPPORT
-#
-# DESCRIPTION
-#
-#   Enable support for multiple modules. This effects all invocations of
-#   $(SWIG). You have to link all generated modules against the appropriate
-#   SWIG runtime library. If you want to build Python modules for example,
-#   use the AX_SWIG_PYTHON macro and link the modules against
-#   $(AX_SWIG_PYTHON_LIBS).
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Sebastian Huber <sebastian-huber@web.de>
-#   Copyright (c) 2008 Alan W. Irwin <irwin@beluga.phys.uvic.ca>
-#   Copyright (c) 2008 Rafael Laboissiere <rafael@laboissiere.net>
-#   Copyright (c) 2008 Andrew Collier <colliera@ukzn.ac.za>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 7
-
-AU_ALIAS([SWIG_MULTI_MODULE_SUPPORT], [AX_SWIG_MULTI_MODULE_SUPPORT])
-AC_DEFUN([AX_SWIG_MULTI_MODULE_SUPPORT],[
-        AC_REQUIRE([AX_PKG_SWIG])
-        SWIG="$SWIG -noruntime"
-])
diff --git a/m4/ax_swig_python.m4 b/m4/ax_swig_python.m4
deleted file mode 100644
index 8fd3df5..0000000
--- a/m4/ax_swig_python.m4
+++ /dev/null
@@ -1,64 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_swig_python.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_SWIG_PYTHON([use-shadow-classes = {no, yes}])
-#
-# DESCRIPTION
-#
-#   Checks for Python and provides the $(AX_SWIG_PYTHON_CPPFLAGS), and
-#   $(AX_SWIG_PYTHON_OPT) output variables.
-#
-#   $(AX_SWIG_PYTHON_OPT) contains all necessary SWIG options to generate
-#   code for Python. Shadow classes are enabled unless the value of the
-#   optional first argument is exactly 'no'. If you need multi module
-#   support (provided by the AX_SWIG_MULTI_MODULE_SUPPORT macro) use
-#   $(AX_SWIG_PYTHON_LIBS) to link against the appropriate library. It
-#   contains the SWIG Python runtime library that is needed by the type
-#   check system for example.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Sebastian Huber <sebastian-huber@web.de>
-#   Copyright (c) 2008 Alan W. Irwin <irwin@beluga.phys.uvic.ca>
-#   Copyright (c) 2008 Rafael Laboissiere <rafael@laboissiere.net>
-#   Copyright (c) 2008 Andrew Collier <colliera@ukzn.ac.za>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 7
-
-AU_ALIAS([SWIG_PYTHON], [AX_SWIG_PYTHON])
-AC_DEFUN([AX_SWIG_PYTHON],[
-        AC_REQUIRE([AX_PKG_SWIG])
-        AC_REQUIRE([AX_PYTHON_DEVEL])
-        test "x$1" != "xno" || swig_shadow=" -noproxy"
-        AC_SUBST([AX_SWIG_PYTHON_OPT],[-python$swig_shadow])
-        AC_SUBST([AX_SWIG_PYTHON_CPPFLAGS],[$PYTHON_CPPFLAGS])
-])
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 84cbb84..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-if BUILD_OOURA
-OOURA = ooura/fftsg.c
-else
-OOURA =
-ACCELERATE_FLAGS = -framework Accelerate
-endif
-
-SOURCES = libxtract.c \
-	  descriptors.c \
-	  scalar.c \
-	  vector.c \
-	  delta.c \
-	  init.c \
-	  window.c \
-	  fini.c \
-	  helper.c \
-	  stateful.c \
-	  c-ringbuf/ringbuf.c \
-	  dywapitchtrack/dywapitchtrack.c \
-	  $(OOURA)
-
-lib_LTLIBRARIES = libxtract.la
-libxtract_la_CFLAGS =
-libxtract_la_SOURCES = $(SOURCES)
-libxtract_la_LDFLAGS = -export-dynamic $(ACCELERATE_FLAGS)
-
-EXTRA_DIST = xtract_globals_private.h \
-	     xtract_macros_private.h \
-	     xtract_window_private.h
diff --git a/swig/Makefile.am b/swig/Makefile.am
deleted file mode 100644
index 536bfed..0000000
--- a/swig/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in 
-
-if BUILD_JAVA
-JAVA_BUILD_DIR = java
-endif
-
-if BUILD_PYTHON
-PYTHON_BUILD_DIR = python
-endif
-
-SUBDIRS = $(JAVA_BUILD_DIR) $(PYTHON_BUILD_DIR)
diff --git a/swig/java/Makefile.am b/swig/java/Makefile.am
deleted file mode 100644
index 8205201..0000000
--- a/swig/java/Makefile.am
+++ /dev/null
@@ -1,101 +0,0 @@
-MAINTAINERCLEANFILES = all-local $(javasources) Makefile.in
-TESTNAME = test
-JAVA = java
-
-javasources = \
-	SWIGTYPE_p_double.java \
-	SWIGTYPE_p_int.java \
-	SWIGTYPE_p_p_double.java \
-	SWIGTYPE_p_unit_.java \
-	SWIGTYPE_p_void.java \
-	xtract_bool_t.java \
-	xtractConstants.java \
-	xtract_feature_init_.java \
-	xtract_features_.java \
-	xtract_feature_types_.java \
-	xtract_function_descriptor_t_algo.java \
-	xtract_function_descriptor_t_argv.java \
-	xtract_function_descriptor_t_data.java \
-	xtract_function_descriptor_t.java \
-	xtract_function_descriptor_t_result.java \
-	xtract_function_descriptor_t_result_scalar.java \
-	xtract_function_descriptor_t_result_vector.java \
-	xtract.java \
-	xtractJNI.java \
-	xtract_lnorm_filter_types_.java \
-	xtract_mel_filter.java \
-	xtract_mfcc_types_.java \
-	xtract_return_codes_.java \
-	xtract_spectrum_.java \
-	xtract_type_t.java \
-	xtract_unit_t.java \
-	xtract_vector_t.java \
-	xtract_window_types_.java 
-
-
-	
-javaclasses = \
-	SWIGTYPE_p_double.class \
-	SWIGTYPE_p_int.class \
-	SWIGTYPE_p_p_double.class \
-	SWIGTYPE_p_unit_.class \
-	SWIGTYPE_p_void.class \
-	xtract_bool_t.class \
-	xtractConstants.class \
-	xtract_feature_init_.class \
-	xtract_features_.class \
-	xtract_feature_types_.class \
-	xtract_function_descriptor_t_algo.class \
-	xtract_function_descriptor_t_argv.class \
-	xtract_function_descriptor_t_data.class \
-	xtract_function_descriptor_t.class \
-	xtract_function_descriptor_t_result.class \
-	xtract_function_descriptor_t_result_scalar.class \
-	xtract_function_descriptor_t_result_vector.class \
-	xtract.class \
-	xtractJNI.class \
-	xtract_lnorm_filter_types_.class \
-	xtract_mel_filter.class \
-	xtract_mfcc_types_.class \
-	xtract_return_codes_.class \
-	xtract_spectrum_.class \
-	xtract_type_t.class \
-	xtract_unit_t.class \
-	xtract_vector_t.class \
-	xtract_window_types_.class 
-
-BUILT_SOURCES = xtract_wrap.c
-SWIG_SOURCES = jxtract.i
-
-lib_LTLIBRARIES = libjxtract.la
-libjxtract_la_SOURCES = $(BUILT_SOURCES) $(SWIG_SOURCES)
-libjxtract_la_CFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_srcdir)/src
-libjxtract_la_LDFLAGS = -lxtract
-libjxtract_la_LIBADD = $(top_srcdir)/src/libxtract.la
-
-SWIG_JAVA_OPT = -java -package xtract.core
-
-xtract_wrap.c: $(SWIG_SOURCES)
-	grep xtract_.*\(const $(top_srcdir)/xtract/xtract_* | grep argv | cut -d: -f 2 | sed 's/const void/void/g' > xtract_redeclare.i
-	$(SWIG) $(SWIG_JAVA_OPT) -I$(top_srcdir) -o $@ $<
-	mkdir -p xtract/core
-	mkdir -p xtract/core/src
-	mv $(javasources) xtract/core/src
-
-java-wrap:
-	cd xtract/core/src && $(JAVAC) $(javasources)
-	cd xtract/core/src && mv $(javaclasses) ../
-
-test:
-	$(JAVAC) $(TESTNAME).java
-
-run:
-	$(JAVA) -Djava.library.path=.libs $(TESTNAME)
-
-all-local: java-wrap $(TESTNAME)
-
-clean-local:
-	-rm xtract_redeclare.i 
-	-rm -f libjxtract.so xtract_wrap.c $(TESTNAME).class xtract_subband_scales_.java #$(javasources) $(javaclasses) $(nonautojavaclasses) $(TESTNAME).class xtract_subband_scales_.java
-	-rm -rf xtract
-
diff --git a/swig/python/Makefile.am b/swig/python/Makefile.am
deleted file mode 100644
index 833c2f3..0000000
--- a/swig/python/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-MAINTAINERCLEANFILES = xtract.py xtract_wrap.c Makefile.in _xtract.so
-
-BUILT_SOURCES = xtract_wrap.c
-SWIG_SOURCES = ../xtract.i
-
-pkgpython_PYTHON = xtract.py __init__.py
-pkgpyexec_LTLIBRARIES = _xtract.la
-_xtract_la_SOURCES = $(BUILT_SOURCES) $(SWIG_SOURCES)
-_xtract_la_CFLAGS = $(AX_SWIG_PYTHON_CPPFLAGS) -I$(top_srcdir)/src
-_xtract_la_LDFLAGS = -module
-_xtract_la_LIBADD = $(top_srcdir)/src/libxtract.la
-
-$(srcdir)/xtract_wrap.c : $(SWIG_SOURCES)
-	$(SWIG) $(AX_SWIG_PYTHON_OPT) -I$(top_srcdir) -o $@ $<
-
-clean-local:
-	-rm -f _xtract.so xtract.py xtract_wrap.c xtract.pyc
-
diff --git a/xtract/Makefile.am b/xtract/Makefile.am
deleted file mode 100644
index ad79356..0000000
--- a/xtract/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-libxtractdir = $(includedir)/xtract
-
-libxtract_HEADERS = libxtract.h xtract_macros.h xtract_types.h xtract_delta.h \
-		    xtract_scalar.h  xtract_vector.h xtract_helper.h
-