From: Sebastian Harl <sh@tokkee.org>
Date: Sat, 30 Jun 2012 12:26:24 +0000 (+0200)
Subject: rules: Use dpkg-buildflags to get build flags.
X-Git-Tag: pfstools-1.8.5-1~2
X-Git-Url: https://git.tokkee.org/?p=pkg-pfstools.git;a=commitdiff_plain;h=062fd5ddba2d22e891a57e9db2dc7850acb59bd7

rules: Use dpkg-buildflags to get build flags.
---

diff --git a/debian/changelog b/debian/changelog
index 0965c83..01b6bfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ pfstools (1.8.5-1) unstable; urgency=low
 
   * debian/rules:
     - Split 'build' target into 'build-arch' and 'build-indep'.
+    - Use dpkg-buildflags to get build flags.
   * debian/control:
     - Updated standards-version to 3.9.3.
   * debian/copyright:
diff --git a/debian/rules b/debian/rules
index b4d76a0..3b8f4f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,13 +11,10 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CXXFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CXXFLAGS += -O0
-else
-	CXXFLAGS += -O2
-endif
+CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS)
+CXXFLAGS += -Wall
 
 MDIR = $(shell octave-config  --print LOCALFCNFILEDIR)
 OCTDIR = $(shell octave-config  --print LOCALOCTFILEDIR)
@@ -45,7 +42,8 @@ config.status: configure
 		fi \
 	done
 	
-	./configure $(confflags) CXXFLAGS="$(CXXFLAGS)"
+	./configure $(confflags) CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
+		CXXFLAGS="$(CXXFLAGS)"
 
 build: build-arch build-indep
 build-arch: build-stamp