From da876fc4308fe7fdc10de7d4ed7f4a0554a03e3e Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 13 Jun 2011 20:27:59 +1000
Subject: [PATCH 1/3] Remove Makefile and configure for top level build in
 v3-6-test

This will avoid confusion about which to use in this release.

Andrew Bartlett
---
 Makefile            |   75 ---------------------------------------------------
 configure           |   14 ---------
 configure.developer |    6 ----
 3 files changed, 0 insertions(+), 95 deletions(-)
 delete mode 100644 Makefile
 delete mode 100755 configure
 delete mode 100755 configure.developer

diff --git a/Makefile b/Makefile
deleted file mode 100644
index cbbf045..0000000
--- a/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-# simple makefile wrapper to run waf
-
-WAF_BINARY=./buildtools/bin/waf
-WAF=WAF_MAKE=1 $(WAF_BINARY)
-
-all:
-	$(WAF) build
-
-install:
-	$(WAF) install
-
-uninstall:
-	$(WAF) uninstall
-
-test:
-	$(WAF) test $(TEST_OPTIONS)
-
-help:
-	@echo NOTE: to run extended waf options use $(WAF_BINARY) or modify your PATH
-	$(WAF) --help
-
-subunit-test:
-	$(WAF) test --filtered-subunit $(TEST_OPTIONS)
-
-testenv:
-	$(WAF) test --testenv $(TEST_OPTIONS)
-
-quicktest:
-	$(WAF) test --quick $(TEST_OPTIONS)
-
-dist:
-	touch .tmplock
-	WAFLOCK=.tmplock $(WAF) dist
-
-distcheck:
-	touch .tmplock
-	WAFLOCK=.tmplock $(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
-
-# this allows for things like "make bin/smbtorture"
-bin/%:: FORCE
-	$(WAF) --targets=`basename $@`
-FORCE:
-
-pydoctor:
-	$(WAF) pydoctor
diff --git a/configure b/configure
deleted file mode 100755
index 72f758e..0000000
--- a/configure
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/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/configure.developer b/configure.developer
deleted file mode 100755
index 5033670..0000000
--- a/configure.developer
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-`dirname $0`/configure -C \
-	--enable-developer \
-	--enable-socket-wrapper \
-	--enable-nss-wrapper \
-	"$@"
-- 
1.7.5.2