summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-09-23 17:29:53 -0700
committerJelmer Vernooij <jelmer@samba.org>2010-09-25 12:20:57 -0700
commit296ff486e41d309493c9ddb195578cb6355e2b36 (patch)
tree801385522a05eeb710faef79149e847bef17ffc9
parente68afdc02f7ead1da8d0e11cf13a1845eebe7d48 (diff)
downloadsamba-296ff486e41d309493c9ddb195578cb6355e2b36.tar.gz
samba-296ff486e41d309493c9ddb195578cb6355e2b36.tar.bz2
samba-296ff486e41d309493c9ddb195578cb6355e2b36.zip
Check in configure/Makefile for those projects that have waf as primary build system.
-rw-r--r--.gitignore11
-rw-r--r--lib/tevent/Makefile57
-rwxr-xr-xlib/tevent/configure14
-rw-r--r--source4/Makefile57
-rwxr-xr-xsource4/configure14
-rw-r--r--source4/lib/ldb/Makefile57
-rwxr-xr-xsource4/lib/ldb/configure14
7 files changed, 219 insertions, 5 deletions
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