python/lib/moresetuptools.py: add get_aubio_version and get_aubio_pyversion

[aubio.git] / Makefile

diff --git a/Makefile b/Makefile
index afe00e2..d51516a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@
 # $ make test_python
 
 WAFCMD=python waf
-WAFURL=https://waf.io/waf-1.8.22
+WAFURL=https://waf.io/waf-1.9.6
 
 #WAFOPTS:=
 # turn on verbose mode
@@ -53,7 +53,7 @@ expandwaf: getwaf
        $(WAFCMD) --help > /dev/null
        mv .waf*/waflib . && rm -fr .waf*
        sed '/^#==>$$/,$$d' waf > waf2 && mv waf2 waf
-       chmod +x waf
+       chmod +x waf && chmod -R go-w waflib
 
 cleanwaf:
        rm -rf waf waflib .waf*
@@ -113,7 +113,8 @@ install_python_with_pip:
 
 uninstall_python_with_pip:
        # uninstall package
-       pip uninstall -y -v aubio || make uninstall_python_with_distutils
+       ( pip show aubio | grep -l aubio > /dev/null ) && \
+       pip uninstall -y -v aubio || echo "info: aubio package is not installed"
 
 install_python_with_distutils:
        ./setup.py install $(PIPOPTS) $(DISTUTILSOPTS)
@@ -161,6 +162,8 @@ check_clean:
 
 distclean:
        $(WAFCMD) distclean
+       -rm -rf doc/_build/
+       -rm -rf doc/web/
 
 check_distclean:
        make distclean
@@ -174,10 +177,10 @@ help:
 create_test_sounds:
        -[ -z `which $(SOX)` ] && ( echo $(SOX) could not be found) || true
        -mkdir -p $(TESTSOUNDS)
-       -$(SOX) -r 44100 -b 16 -n "$(TESTSOUNDS)/44100Hz_1f_silence.wav"          synth 1s   silence 0        dcshift .01
+       -$(SOX) -r 44100 -b 16 -n "$(TESTSOUNDS)/44100Hz_1f_silence.wav"      trim 0 1s
        -$(SOX) -r 22050 -b 16 -n "$(TESTSOUNDS)/22050Hz_5s_brownnoise.wav"   synth 5    brownnoise      vol 0.9
        -$(SOX) -r 32000 -b 16 -n "$(TESTSOUNDS)/32000Hz_127f_sine440.wav"    synth 127s sine 440        vol 0.9
-       -$(SOX) -r  8000 -b 16 -n "$(TESTSOUNDS)/8000Hz_30s_silence.wav"      synth 30   silence 0       vol 0.9
+       -$(SOX) -r  8000 -b 16 -n "$(TESTSOUNDS)/8000Hz_30s_silence.wav"      trim 0 30
        -$(SOX) -r 48000 -b 32 -n "$(TESTSOUNDS)/48000Hz_60s_sweep.wav"       synth 60   sine 100-20000  vol 0.9
        -$(SOX) -r 44100 -b 16 -n "$(TESTSOUNDS)/44100Hz_44100f_sine441.wav"  synth 44100s   sine 441   vol 0.9
        -$(SOX) -r 44100 -b 16 -n "$(TESTSOUNDS)/44100Hz_100f_sine441.wav"    synth 100s sine 441       vol 0.9