From c6e73cb3b601dbbe737a7692e53c6fb9c72dff7b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 29 Mar 2010 07:07:18 +1100 Subject: [PATCH] build: move waf into buildtools/bin --- buildtools/{ => bin}/waf | 0 buildtools/{ => bin}/waf-svn | Bin source4/Makefile.waf | 4 ++-- source4/configure.waf | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename buildtools/{ => bin}/waf (100%) rename buildtools/{ => bin}/waf-svn (100%) diff --git a/buildtools/waf b/buildtools/bin/waf similarity index 100% rename from buildtools/waf rename to buildtools/bin/waf diff --git a/buildtools/waf-svn b/buildtools/bin/waf-svn similarity index 100% rename from buildtools/waf-svn rename to buildtools/bin/waf-svn diff --git a/source4/Makefile.waf b/source4/Makefile.waf index e304540637d..1e950ed18c9 100644 --- a/source4/Makefile.waf +++ b/source4/Makefile.waf @@ -10,7 +10,7 @@ # from make to pass it to waf? JOBS=1 -WAF=JOBS=$(JOBS) ../buildtools/waf +WAF=JOBS=$(JOBS) ../buildtools/bin/waf all: $(WAF) build @@ -30,7 +30,7 @@ quicktest: clean: $(WAF) clean -distclean: +distclean: clean rm -rf bin # some compatibility make targets diff --git a/source4/configure.waf b/source4/configure.waf index b297b932784..40dfac6de44 100755 --- a/source4/configure.waf +++ b/source4/configure.waf @@ -2,7 +2,7 @@ echo "Using waf based build" -WAF=../buildtools/waf +WAF=../buildtools/bin/waf # don't enable WAFCACHE by default till it is # size limited -- 2.34.1