diff options
| -rw-r--r-- | lib/replace/Makefile | 69 | ||||
| -rwxr-xr-x | lib/replace/autogen-autotools.sh | 13 | ||||
| -rwxr-xr-x[l---------] | lib/replace/autogen-waf.sh | 12 | ||||
| l---------[-rwxr-xr-x] | lib/replace/autogen.sh | 14 | ||||
| -rwxr-xr-x | lib/replace/configure | 14 | ||||
| -rw-r--r-- | lib/talloc/Makefile | 4 |
6 files changed, 111 insertions, 15 deletions
diff --git a/lib/replace/Makefile b/lib/replace/Makefile new file mode 100644 index 0000000000..2cc2819103 --- /dev/null +++ b/lib/replace/Makefile @@ -0,0 +1,69 @@ +# simple makefile wrapper to run waf + +WAFPATH:=$(shell PATH=../../buildtools/bin:buildtools/bin:$(PATH) which waf) + +WAF=WAF_MAKE=1 $(WAFPATH) + +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/replace/autogen-autotools.sh b/lib/replace/autogen-autotools.sh new file mode 100755 index 0000000000..d46a4279f3 --- /dev/null +++ b/lib/replace/autogen-autotools.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +rm -rf autom4te.cache +rm -f configure config.h.in + +autoheader || exit 1 +autoconf || exit 1 + +rm -rf autom4te.cache + +echo "Now run ./configure and then make." +exit 0 + diff --git a/lib/replace/autogen-waf.sh b/lib/replace/autogen-waf.sh index 99150f3a28..ee95847ef0 120000..100755 --- a/lib/replace/autogen-waf.sh +++ b/lib/replace/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/replace/autogen.sh b/lib/replace/autogen.sh index d46a4279f3..a229cc94ac 100755..120000 --- a/lib/replace/autogen.sh +++ b/lib/replace/autogen.sh @@ -1,13 +1 @@ -#!/bin/sh - -rm -rf autom4te.cache -rm -f configure config.h.in - -autoheader || exit 1 -autoconf || 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/replace/configure b/lib/replace/configure new file mode 100755 index 0000000000..2d4aec724e --- /dev/null +++ b/lib/replace/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 diff --git a/lib/talloc/Makefile b/lib/talloc/Makefile index 177937fbc9..2cc2819103 100644 --- a/lib/talloc/Makefile +++ b/lib/talloc/Makefile @@ -1,6 +1,8 @@ # simple makefile wrapper to run waf -WAF=WAF_MAKE=1 ../../buildtools/bin/waf +WAFPATH:=$(shell PATH=../../buildtools/bin:buildtools/bin:$(PATH) which waf) + +WAF=WAF_MAKE=1 $(WAFPATH) all: $(WAF) build |