setup.py: use custom build_ext instead of 'generate' command, define HAVE_AUBIO_DOUBL...

[aubio.git] / Makefile

diff --git a/Makefile b/Makefile
index 56caf0c..07e6bcd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 WAFCMD=python waf
+WAFURL=https://waf.io/waf-1.8.22
 
 SOX=sox
 
@@ -11,8 +12,7 @@ checkwaf:
        @[ -f waf ] || make getwaf
 
 getwaf:
-       @( which wget > /dev/null && wget -qO waf $(WAFURL) ) || ( which curl > /dev/null && curl $(WAFURL) > waf )
-       @chmod +x waf
+       @./scripts/get_waf.sh
 
 expandwaf:
        @[ -d wafilb ] || rm -fr waflib
@@ -28,7 +28,7 @@ build: configure
        $(WAFCMD) build $(WAFOPTS)
 
 build_python:
-       python ./setup.py generate $(ENABLE_DOUBLE) build
+       python ./setup.py build_ext $(ENABLE_DOUBLE)
 
 test_python: export LD_LIBRARY_PATH=$(PWD)/build/src
 test_python:
@@ -39,7 +39,7 @@ test_python:
 
 test_python_osx:
        # create links from ~/lib/lib* to build/src/lib*
-       [ -f build/src/libaubio.[0-9].dylib ] && ( mkdir -p ~/lib && cp -prv build/src/libaubio.4.dylib ~/lib ) || true
+       [ -f build/src/libaubio.[0-9].dylib ] && ( mkdir -p ~/lib && cp -prv build/src/libaubio.[0-9].dylib ~/lib ) || true
        # then run the tests
        pip install --user -v -r requirements.txt
        pip install --user -v .
@@ -72,7 +72,7 @@ test_pure_python_wheel:
        pip uninstall -v -y aubio
 
 build_python3:
-       python3 ./setup.py generate $(ENABLE_DOUBLE) build
+       python3 ./setup.py build_ext $(ENABLE_DOUBLE)
 
 clean_python3:
        python3 ./setup.py clean