INSTALL.{linux,osx}: update

diff --git a/INSTALL.linux b/INSTALL.linux
new file mode 100644 (file)
index 0000000..939fcfa
--- /dev/null
+++ b/INSTALL.linux
@@ -0,0 +1,20 @@
+#! /bin/sh
+
+# instructions to build vamp-aubio-plugins for linux
+
+# get waf
+./scripts/get_waf.sh
+
+# fetch Vamp SDK
+./scripts/get_deps_linux.sh
+
+# fetch and build aubio
+./scripts/get_aubio.sh
+
+# configure and build plugin
+./waf configure
+
+./waf build -v
+
+# system-wide installation
+# sudo ./waf install

diff --git a/INSTALL.linux32 b/INSTALL.linux32
deleted file mode 100644 (file)
index 87526a3..0000000
--- a/INSTALL.linux32
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-
-# instructions to build vamp-aubio-plugins for linux i686
-
-# move one directoy up
-pushd ..
-
-# fetch Vamp SDK
-curl -O https://code.soundsoftware.ac.uk/attachments/download/690/vamp-plugin-sdk-2.5.tar.gz
-tar xf vamp-plugin-sdk-2.5.tar.gz
-
-# fetch Vamp linux32 binaries
-curl -O https://code.soundsoftware.ac.uk/attachments/download/704/vamp-plugin-sdk-2.5-binaries-i686-linux.tar.gz
-tar xf vamp-plugin-sdk-2.5-binaries-i686-linux.tar.gz
-
-# fetch and build aubio
-
-# from git develop branch
-#git clone git://git.aubio.org/git/aubio/ aubio-linux32
-#pushd aubio-linux32
-##git co develop
-
-# from latest release
-curl -O http://aubio.org/pub/aubio-0.4.1.tar.bz2
-tar xf aubio-0.4.1.tar.bz2
-pushd aubio-0.4.1
-
-./waf distclean configure build install \
-  --destdir=../aubio-dist-linux32 \
-  --disable-avcodec --disable-samplerate --disable-jack --disable-sndfile
-popd
-
-# back to current directory
-popd
-# now build vamp-aubio-plugins
-CXXFLAGS="-I../aubio-dist-linux32/usr/local/include" \
-  LDFLAGS="-L../aubio-dist-linux32/usr/local/lib" \
-  make -f Makefile.linux clean all

diff --git a/INSTALL.linux64 b/INSTALL.linux64
deleted file mode 100644 (file)
index aafb3ab..0000000
--- a/INSTALL.linux64
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-
-# instructions to build vamp-aubio-plugins for linux amd64
-
-# move one directoy up
-pushd ..
-
-# fetch Vamp SDK
-curl -O https://code.soundsoftware.ac.uk/attachments/download/690/vamp-plugin-sdk-2.5.tar.gz
-tar xf vamp-plugin-sdk-2.5.tar.gz
-
-# fetch Vamp linux64 binaries
-curl -O https://code.soundsoftware.ac.uk/attachments/download/703/vamp-plugin-sdk-2.5-binaries-amd64-linux.tar.gz
-tar xf vamp-plugin-sdk-2.5-binaries-amd64-linux.tar.gz
-
-# fetch and build aubio
-
-# from git develop branch
-#git clone git://git.aubio.org/git/aubio/ aubio-linux64
-#pushd aubio-linux64
-##git co develop
-
-# from latest release
-curl -O http://aubio.org/pub/aubio-0.4.1.tar.bz2
-tar xf aubio-0.4.1.tar.bz2
-pushd aubio-0.4.1
-
-./waf distclean configure build install \
-  --destdir=../aubio-dist-linux64 \
-  --disable-avcodec --disable-samplerate --disable-jack --disable-sndfile
-popd
-
-# back to current directory
-popd
-# now build vamp-aubio-plugins
-CXXFLAGS="-I../aubio-dist-linux64/usr/local/include" \
-  LDFLAGS="-L../aubio-dist-linux64/usr/local/lib" \
-  make -f Makefile.linux clean all

diff --git a/INSTALL.osx b/INSTALL.osx
index fb43844..bd27971 100644 (file)
--- a/INSTALL.osx
+++ b/INSTALL.osx
@@ -2,37 +2,22 @@
 
 # instructions to build vamp-aubio-plugins for mac os x
 
-# move one directoy up
-pushd ..
+# get waf
+./scripts/get_waf.sh
 
 # fetch Vamp SDK
-curl -O https://code.soundsoftware.ac.uk/attachments/download/690/vamp-plugin-sdk-2.5.tar.gz
-tar xf vamp-plugin-sdk-2.5.tar.gz
-
-# fetch Vamp osx binaries
-curl -O https://code.soundsoftware.ac.uk/attachments/download/693/vamp-plugin-sdk-2.5-binaries-osx.tar.gz
-tar xf vamp-plugin-sdk-2.5-binaries-osx.tar.gz
+./scripts/get_deps_osx.sh
 
 # fetch and build aubio
+./scripts/get_aubio.sh
+
+# configure and build plugin
+./waf configure
+
+./waf build -v
+
+# install in user's home directory
+# ./waf install --destdir=$HOME
 
-# from git develop branch
-#git clone git://git.aubio.org/git/aubio/ aubio-osx
-#pushd aubio-osx
-##git co develop
-
-# from latest release
-curl -O http://aubio.org/pub/aubio-0.4.1.tar.bz2
-tar xf aubio-0.4.1.tar.bz2
-pushd aubio-0.4.1
-
-./waf distclean configure build install \
-  --destdir=../aubio-dist-osx \
-  --disable-avcodec --disable-samplerate --disable-jack --disable-sndfile
-popd
-
-# back to current directory
-popd
-# now build vamp-aubio-plugins
-CXXFLAGS="-I../aubio-dist-osx/usr/local/include" \
-  LDFLAGS="-L../aubio-dist-osx/usr/local/lib" \
-  make -f Makefile.osx clean all
+# system-wide installation
+# sudo ./waf install