From 4f22cc7a283d21000e8ffa0c39746aa9f824f49e Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 31 Oct 2010 02:31:59 +0100 Subject: talloc: Switch over to using waf as the default build system for the standalone build. --- lib/talloc/Makefile | 67 +++++++++++++++++++++++++++++++++++++++++ lib/talloc/autogen-autotools.sh | 14 +++++++++ lib/talloc/autogen-waf.sh | 12 +++++++- lib/talloc/autogen.sh | 15 +-------- lib/talloc/configure | 14 +++++++++ 5 files changed, 107 insertions(+), 15 deletions(-) create mode 100644 lib/talloc/Makefile create mode 100755 lib/talloc/autogen-autotools.sh mode change 120000 => 100755 lib/talloc/autogen-waf.sh mode change 100755 => 120000 lib/talloc/autogen.sh create mode 100755 lib/talloc/configure (limited to 'lib') 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 deleted file mode 120000 index 99150f3a28..0000000000 --- a/lib/talloc/autogen-waf.sh +++ /dev/null @@ -1 +0,0 @@ -../../buildtools/scripts/autogen-waf.sh \ No newline at end of file diff --git a/lib/talloc/autogen-waf.sh b/lib/talloc/autogen-waf.sh new file mode 100755 index 0000000000..ee95847ef0 --- /dev/null +++ b/lib/talloc/autogen-waf.sh @@ -0,0 +1,11 @@ +#!/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 deleted file mode 100755 index bf84eeee19..0000000000 --- a/lib/talloc/autogen.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/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.sh b/lib/talloc/autogen.sh new file mode 120000 index 0000000000..a229cc94ac --- /dev/null +++ b/lib/talloc/autogen.sh @@ -0,0 +1 @@ +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 -- cgit