talloc: Switch over to using waf as the default build system for the standalone build.

6 files changed, 107 insertions, 17 deletions

diff --git a/.gitignore b/.gitignore
index 49b24a03fb..3c521a2f07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,8 +15,6 @@ config.log
 config.status
 source3/configure
 source3/Makefile
-lib/talloc/configure
-lib/talloc/Makefile
 lib/tdb/configure
 lib/tdb/Makefile
 *.d
diff --git a/lib/talloc/Makefile b/lib/talloc/Makefile
new file mode 100644
index 0000000000..177937fbc9
--- /dev/null
+++ b/lib/talloc/Makefile
@@ -0,0 +1,67 @@
+# simple makefile wrapper to run waf
+
+WAF=WAF_MAKE=1 ../../buildtools/bin/waf
+
+all:
+	$(WAF) build
+
+install:
+	$(WAF) install
+
+uninstall:
+	$(WAF) uninstall
+
+test:
+	$(WAF) test $(TEST_OPTIONS)
+
+testenv:
+	$(WAF) test --testenv $(TEST_OPTIONS)
+
+quicktest:
+	$(WAF) test --quick $(TEST_OPTIONS)
+
+dist:
+	$(WAF) dist
+
+distcheck:
+	$(WAF) distcheck
+
+clean:
+	$(WAF) clean
+
+distclean:
+	$(WAF) distclean
+
+reconfigure: configure
+	$(WAF) reconfigure
+
+show_waf_options:
+	$(WAF) --help
+
+# some compatibility make targets
+everything: all
+
+testsuite: all
+
+check: test
+
+torture: all
+
+# this should do an install as well, once install is finished
+installcheck: test
+
+etags:
+	$(WAF) etags
+
+ctags:
+	$(WAF) ctags
+
+bin/%:: FORCE
+	$(WAF) --targets=`basename $@`
+FORCE:
+
+configure: autogen-waf.sh ../../buildtools/scripts/configure.waf
+	./autogen-waf.sh
+
+Makefile: autogen-waf.sh configure ../../buildtools/scripts/Makefile.waf
+	./autogen-waf.sh
diff --git a/lib/talloc/autogen-autotools.sh b/lib/talloc/autogen-autotools.sh
new file mode 100755
index 0000000000..bf84eeee19
--- /dev/null
+++ b/lib/talloc/autogen-autotools.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+rm -rf autom4te.cache
+rm -f configure config.h.in
+
+IPATHS="-I libreplace -I lib/replace -I ../libreplace -I ../replace"
+autoconf $IPATHS || exit 1
+autoheader $IPATHS || exit 1
+
+rm -rf autom4te.cache
+
+echo "Now run ./configure and then make."
+exit 0
+
diff --git a/lib/talloc/autogen-waf.sh b/lib/talloc/autogen-waf.sh
index 99150f3a28..ee95847ef0 120000..100755
--- a/lib/talloc/autogen-waf.sh
+++ b/lib/talloc/autogen-waf.sh
@@ -1 +1,11 @@
-../../buildtools/scripts/autogen-waf.sh
\ No newline at end of file
+#!/bin/sh
+
+p=`dirname $0`
+
+echo "Setting up for waf build"
+
+echo "done. Now run $p/configure or $p/configure.developer then make."
+if [ $p != "." ]; then
+	echo "Notice: The build invoke path is not the main directory! Use make with the parameter"
+	echo "-C $p. Example: make -C $p all"
+fi
diff --git a/lib/talloc/autogen.sh b/lib/talloc/autogen.sh
index bf84eeee19..a229cc94ac 100755..120000
--- a/lib/talloc/autogen.sh
+++ b/lib/talloc/autogen.sh
@@ -1,14 +1 @@
-#!/bin/sh
-
-rm -rf autom4te.cache
-rm -f configure config.h.in
-
-IPATHS="-I libreplace -I lib/replace -I ../libreplace -I ../replace"
-autoconf $IPATHS || exit 1
-autoheader $IPATHS || exit 1
-
-rm -rf autom4te.cache
-
-echo "Now run ./configure and then make."
-exit 0
-
+autogen-waf.sh
\ No newline at end of file
diff --git a/lib/talloc/configure b/lib/talloc/configure
new file mode 100755
index 0000000000..2d4aec724e
--- /dev/null
+++ b/lib/talloc/configure
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+PREVPATH=`dirname $0`
+
+WAF=../../buildtools/bin/waf
+
+# using JOBS=1 gives maximum compatibility with
+# systems like AIX which have broken threading in python
+JOBS=1
+export JOBS
+
+cd . || exit 1
+$WAF configure "$@" || exit 1
+cd $PREVPATH