Simplify making waf more verbose.

4 files changed, 4 insertions, 19 deletions

diff --git a/debian/changelog b/debian/changelog
index 7f1b0e0..c9d6f67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ talloc (2.1.5-2) UNRELEASED; urgency=medium
     library, just append a '-py3'.
   * Make the build log a bit more verbose.
 
+  [ Jelmer Vernooij ]
+  * Simplify making waf more verbose.
+
  -- Jelmer Vernooij <jelmer@debian.org>  Thu, 25 Feb 2016 03:43:08 +0000
 
 talloc (2.1.5-1) unstable; urgency=medium
diff --git a/debian/patches/pass-waf-flags.diff b/debian/patches/pass-waf-flags.diff
deleted file mode 100644
index 921e0a8..0000000
--- a/debian/patches/pass-waf-flags.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-# Allow to pass flags to waf
-
---- talloc-2.1.5.orig/Makefile
-+++ talloc-2.1.5/Makefile
-@@ -3,10 +3,10 @@
- WAF=WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$$PATH waf
- 
- all:
--	$(WAF) build
-+	$(WAF) build $(WAFFLAGS)
- 
- install:
--	$(WAF) install
-+	$(WAF) install $(WAFFLAGS)
- 
- uninstall:
- 	$(WAF) uninstall
diff --git a/debian/patches/series b/debian/patches/series
index be899f4..08a8758 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-pass-waf-flags.diff
 pytalloc-util-name.diff
diff --git a/debian/rules b/debian/rules
index 035a6e1..c041ad6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ override_dh_auto_configure:
 	LDFLAGS="$(LDFLAGS)" PYTHON="$(PYTHON)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" ./configure $(conf_args)
 
 override_dh_auto_build:
-	$(MAKE) all WAFFLAGS="-vv"
+	$(MAKE) all V=1
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))