[Pkg-wmaker-commits] [wmitime] 78/127: 0.3-11: use CPPFLAGS

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmitime.

commit 4582839bf27c14b21eb7ae0fe63ae8e14b7eb631
Author: Jari Aalto <jari.aalto at cante.net>
Date:   Sat Mar 24 02:39:25 2012 -0400

    0.3-11: use CPPFLAGS
    
    Signed-off-by: Jari Aalto <jari.aalto at cante.net>
---
 debian/changelog | 7 +++++++
 debian/rules     | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3e3eab6..354a9ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wmitime (0.3-11) unstable; urgency=low
+
+  * debian/rules
+    - Use DEB_*_MAINT_* variables and use CPPFLAGS (more hardening).
+
+ -- Jari Aalto <jari.aalto at cante.net>  Sat, 24 Mar 2012 02:37:54 -0400
+
 wmitime (0.3-10) unstable; urgency=low
 
   * Move to packaging format 3.0 quilt.
diff --git a/debian/rules b/debian/rules
index 873a8b6..9910322 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,14 +4,14 @@ PACKAGE	   = wmitime
 MAKE_FLAGS = -C wmitime
 
 export DEB_BUILD_MAINT_OPTIONS	= hardening=+all
-CFLAGS	+= -Wall -pedantic $(CPPFLAGS)
-LDFLAGS += -Wl,--as-needed
+export DEB_CFLAGS_MAINT_APPEND	= -Wall -pedantic
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 man:
 	$(MAKE) -C debian -f pod2man.mk PACKAGE=$(PACKAGE) makeman
 
 override_dh_auto_build: man
-	$(MAKE) $(MAKE_FLAGS) FLAGS="$(CFLAGS) $(LDFLAGS)"
+	$(MAKE) $(MAKE_FLAGS) FLAGS="$(CFLAGS) $(CPPFLAGS) $(LDFLAGS)"
 
 override_dh_auto_clean:
 	$(MAKE) $(MAKE_FLAGS) clean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmitime.git