From c6e73cb3b601dbbe737a7692e53c6fb9c72dff7b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 29 Mar 2010 07:07:18 +1100 Subject: build: move waf into buildtools/bin --- buildtools/bin/waf | 1 + buildtools/bin/waf-svn | Bin 0 -> 107097 bytes buildtools/waf | 1 - buildtools/waf-svn | Bin 107097 -> 0 bytes source4/Makefile.waf | 4 ++-- source4/configure.waf | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) create mode 120000 buildtools/bin/waf create mode 100755 buildtools/bin/waf-svn delete mode 120000 buildtools/waf delete mode 100755 buildtools/waf-svn diff --git a/buildtools/bin/waf b/buildtools/bin/waf new file mode 120000 index 0000000000..1e5b242062 --- /dev/null +++ b/buildtools/bin/waf @@ -0,0 +1 @@ +waf-svn \ No newline at end of file diff --git a/buildtools/bin/waf-svn b/buildtools/bin/waf-svn new file mode 100755 index 0000000000..57ae204e25 Binary files /dev/null and b/buildtools/bin/waf-svn differ diff --git a/buildtools/waf b/buildtools/waf deleted file mode 120000 index 1e5b242062..0000000000 --- a/buildtools/waf +++ /dev/null @@ -1 +0,0 @@ -waf-svn \ No newline at end of file diff --git a/buildtools/waf-svn b/buildtools/waf-svn deleted file mode 100755 index 57ae204e25..0000000000 Binary files a/buildtools/waf-svn and /dev/null differ diff --git a/source4/Makefile.waf b/source4/Makefile.waf index e304540637..1e950ed18c 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 b297b93278..40dfac6de4 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 -- cgit