From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 23 Jan 2012 22:19:46 +0000 (+0000)
Subject: revert the debugging changes
X-Git-Tag: 4.2~117
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fbaa6d4a3d3f38747280c02b94db4fe8aaa273d5;p=i3%2Fi3

revert the debugging changes

Building a non-optimized (-O0 vs. -O2) Debian package required:

    echo 'export DEB_BUILD_OPTIONS=noopt' >> ~/.pbuilderrc
---

diff --git a/common.mk b/common.mk
index 2cf8629c..537d4dda 100644
--- a/common.mk
+++ b/common.mk
@@ -124,12 +124,10 @@ CPPFLAGS += -D_GNU_SOURCE
 endif
 
 ifeq ($(DEBUG),1)
-$(warning "DEBUG build")
 # Extended debugging flags, macros shall be available in gcc
 CFLAGS += -gdwarf-2
 CFLAGS += -g3
 else
-$(warning "non-DEBUG build, enabling optimization")
 CFLAGS += -O2
 CFLAGS += -freorder-blocks-and-partition
 endif
@@ -140,7 +138,7 @@ LIBS += -lgcov
 endif
 
 # Don’t print command lines which are run
-#.SILENT:
+.SILENT:
 
 # Always remake the following targets
 .PHONY: install clean dist distclean
diff --git a/debian/rules b/debian/rules
index 61643724..a6bfc2c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,8 +28,7 @@ binary-indep: install
 binary: binary-arch binary-indep
 
 override_dh_auto_build:
-	env
-	$(MAKE) -d
+	$(MAKE)
 	$(MAKE) -C man
 	$(MAKE) -C docs