[tecnoballz] 28/56: Use dpkg-buildflags to obtain the default CPPFLAGS, CXXFLAGS and LDFLAGS.

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository tecnoballz.

commit 11726aa4a450d8a8bdef4c24afe154d57dbb7978
Author: Peter Pentchev <roam at ringlet.net>
Date:   Thu Feb 17 15:24:12 2011 +0000

    Use dpkg-buildflags to obtain the default CPPFLAGS, CXXFLAGS and LDFLAGS.
---
 debian/changelog |  2 ++
 debian/control   |  3 ++-
 debian/rules     | 13 +++++--------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0ddab65..9fcbf29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ tecnoballz (0.92-4) UNRELEASED; urgency=low
     - break the clean-up list and the manpages list into debian/* files
     - minimize the rules file by using debhelper override rules
   * Add the 031_honor_cxxflags patch.
+  * Use dpkg-buildflags to obtain the default values for CPPFLAGS,
+    CXXFLAGS and LDFLAGS.
 
  -- Peter Pentchev <roam at ringlet.net>  Thu, 17 Feb 2011 10:35:58 +0200
 
diff --git a/debian/control b/debian/control
index acb8ced..619b855 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 8), autoconf, automake, libsdl-mixer1.2-dev, 
+Build-Depends: debhelper (>= 8), autoconf, automake, dpkg-dev (>= 1.15.7~),
+               libsdl-mixer1.2-dev, 
                libmikmod2-dev, libxext-dev, libvorbis-dev, 
                libogg-dev, libsmpeg-dev, libxxf86dga-dev, 
                libxxf86vm-dev, autotools-dev,
diff --git a/debian/rules b/debian/rules
index 57c7417..e07292d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,17 +3,14 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Optimisation flag if needed
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CXXFLAGS += -O0
-else
-	CXXFLAGS += -O2
-endif
+CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
+CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 
 # Warnings
-CXXFLAGS = -g -Wall
+CXXFLAGS += -Wall -fno-strict-aliasing
 
-export CXXFLAGS
+export CPPFLAGS CXXFLAGS LDFLAGS
 
 override_dh_auto_configure:
 	autoreconf -fvi

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