From 81ad5771b778ebe9a91fb770bbb7932b0b7b765b Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Tue, 19 Apr 2016 01:40:23 +0200 Subject: [PATCH] Makefile: only expand waf if needed, use 'python waf' by default --- Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 125ec28b..c4b2b91e 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +WAFCMD=python waf all: build checkwaf: @@ -5,8 +6,11 @@ checkwaf: getwaf: curl https://waf.io/waf-1.8.14 > waf + @chmod +x waf + +expandwaf: @[ -d wafilb ] || rm -fr waflib - @chmod +x waf && ./waf --help > /dev/null + @$(WAFCMD) --help > /dev/null @mv .waf*/waflib . && rm -fr .waf* @sed '/^#==>$$/,$$d' waf > waf2 && mv waf2 waf @chmod +x waf @@ -22,10 +26,10 @@ clean_python: cd python && ./setup.py clean clean: - ./waf clean + $(WAFCMD) clean distcheck: build - ./waf distcheck + $(WAFCMD) distcheck help: - ./waf --help + $(WAFCMD) --help -- 2.11.0