[libdap] 11/13: Attempted fix for CXXFLAGS missing warning from Lintian

[Alastair McKinstry]

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

mckinstry pushed a commit to tag unstable/3.14.0-2
in repository libdap.

commit cb258fceeb84f23628e7f4df9c363d7433437ad6
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Jun 28 15:21:29 2015 +0100

    Attempted fix for CXXFLAGS missing warning from Lintian
---
 debian/rules | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index 103c587..5372c83 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,14 @@
 #!/usr/bin/make -f
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
 LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
 
-# To enable all, uncomment following line
-DEB_BUILD_MAINT_OPTIONS:= hardening=+all,-pie
-DEB_CFLAGS_MAINT_APPEND:= -Wall -pedantic
-DEB_LDFLAGS_MAINT_APPEND:= -Wl,--as-needed
-export DEB_BUILD_MAINT_OPTIONS
-export DEB_CFLAGS_MAINT_APPEND
-export DEB_LDFLAGS_MAINT_APPEND
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+CFLAGS += -Wall -pedantic
+LDFLAGS += -Wl,--as-needed
+
 # Always do verbose.
 export DH_VERBOSE=1
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libdap.git