From 296ff486e41d309493c9ddb195578cb6355e2b36 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 23 Sep 2010 17:29:53 -0700 Subject: Check in configure/Makefile for those projects that have waf as primary build system. --- .gitignore | 11 ++++----- lib/tevent/Makefile | 57 +++++++++++++++++++++++++++++++++++++++++++++++ lib/tevent/configure | 14 ++++++++++++ source4/Makefile | 57 +++++++++++++++++++++++++++++++++++++++++++++++ source4/configure | 14 ++++++++++++ source4/lib/ldb/Makefile | 57 +++++++++++++++++++++++++++++++++++++++++++++++ source4/lib/ldb/configure | 14 ++++++++++++ 7 files changed, 219 insertions(+), 5 deletions(-) create mode 100644 lib/tevent/Makefile create mode 100755 lib/tevent/configure create mode 100644 source4/Makefile create mode 100755 source4/configure create mode 100644 source4/lib/ldb/Makefile create mode 100755 source4/lib/ldb/configure diff --git a/.gitignore b/.gitignore index 56bba7e68a..49b24a03fb 100644 --- a/.gitignore +++ b/.gitignore @@ -13,8 +13,12 @@ config.h config.h.in config.log config.status -configure -Makefile +source3/configure +source3/Makefile +lib/talloc/configure +lib/talloc/Makefile +lib/tdb/configure +lib/tdb/Makefile *.d *_err.c *_err.h @@ -83,7 +87,6 @@ source3/library-versions librpc/gen_ndr/*.* source3/librpc/gen_ndr/*.* source4/librpc/gen_ndr/*.* -source3/Makefile source3/nsswitch/*.so source3/pkgconfig/*.pc source3/proto_exists @@ -313,14 +316,12 @@ packaging/RHEL-CTDB/samba.spec packaging/RHEL/samba.spec packaging/RHEL/makerpms.sh source3/setup -lib/tevent/Makefile lib/tevent/tevent.so lib/tevent/libtevent.so* lib/tevent/libtevent.a lib/tdb/libtdb.so lib/tdb/tdb.so lib/tdb/libtdb.a -lib/tdb/Makefile lib/tdb/bin docs-xml/build/catalog.xml docs-xml/*/images/*.eps diff --git a/lib/tevent/Makefile b/lib/tevent/Makefile new file mode 100644 index 0000000000..bf19ebeae0 --- /dev/null +++ b/lib/tevent/Makefile @@ -0,0 +1,57 @@ +# 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 diff --git a/lib/tevent/configure b/lib/tevent/configure new file mode 100755 index 0000000000..2d4aec724e --- /dev/null +++ b/lib/tevent/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/source4/Makefile b/source4/Makefile new file mode 100644 index 0000000000..b49024047c --- /dev/null +++ b/source4/Makefile @@ -0,0 +1,57 @@ +# 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 diff --git a/source4/configure b/source4/configure new file mode 100755 index 0000000000..fbd81fe1c5 --- /dev/null +++ b/source4/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/source4/lib/ldb/Makefile b/source4/lib/ldb/Makefile new file mode 100644 index 0000000000..dbd5e2b477 --- /dev/null +++ b/source4/lib/ldb/Makefile @@ -0,0 +1,57 @@ +# 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 diff --git a/source4/lib/ldb/configure b/source4/lib/ldb/configure new file mode 100755 index 0000000000..50ff475cca --- /dev/null +++ b/source4/lib/ldb/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