r11689 - packages/trunk/freealut/debian

[Peter Pentchev]

Author: roam-guest
Date: 2011-01-23 12:12:40 +0000 (Sun, 23 Jan 2011)
New Revision: 11689

Modified:
   packages/trunk/freealut/debian/changelog
   packages/trunk/freealut/debian/control
   packages/trunk/freealut/debian/rules
Log:
Use dpkg-buildflags to obtain the default CPPFLAGS, CFLAGS and LDFLAGS.


Modified: packages/trunk/freealut/debian/changelog
===================================================================
--- packages/trunk/freealut/debian/changelog	2011-01-23 04:08:30 UTC (rev 11688)
+++ packages/trunk/freealut/debian/changelog	2011-01-23 12:12:40 UTC (rev 11689)
@@ -12,6 +12,8 @@
   * Bump the debhelper compatibility version to 7 and shorten the rules
     file using the dh(1) utility.
   * Remove some cruft from the rules file.
+  * Use dpkg-buildflags from dpkg-dev 1.15.7 to obtain the default CFLAGS,
+    CPPFLAGS and LDFLAGS.
 
  -- Peter Pentchev <roam at ringlet.net>  Sat, 22 Jan 2011 15:24:20 +0200
 

Modified: packages/trunk/freealut/debian/control
===================================================================
--- packages/trunk/freealut/debian/control	2011-01-23 04:08:30 UTC (rev 11688)
+++ packages/trunk/freealut/debian/control	2011-01-23 12:12:40 UTC (rev 11689)
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Reinhard Tartler <siretart at tauware.de>, Sam Hocevar <sho at debian.org>
-Build-Depends: debhelper (>= 7), libopenal-dev (>= 1:0.0.8), dpkg-dev (>= 1.13.19)
+Build-Depends: debhelper (>= 7), libopenal-dev (>= 1:0.0.8), dpkg-dev (>= 1.15.7~)
 Standards-Version: 3.7.2
 Section: libs
 Homepage: http://openal.org/

Modified: packages/trunk/freealut/debian/rules
===================================================================
--- packages/trunk/freealut/debian/rules	2011-01-23 04:08:30 UTC (rev 11688)
+++ packages/trunk/freealut/debian/rules	2011-01-23 12:12:40 UTC (rev 11689)
@@ -1,20 +1,17 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-CFLAGS = -Wall -g
+CFLAGS:=	$(shell dpkg-buildflags --get CFLAGS)
+CPPFLAGS:=	$(shell dpkg-buildflags --get CPPFLAGS)
+LDFLAGS:=	$(shell dpkg-buildflags --get LDFLAGS)
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+CFLAGS+=	-Wall -fPIC -Wl,-z,defs
 
+export CFLAGS CPPFLAGS LDFLAGS
+
 build: build-stamp
 build-stamp:
-	dh_testdir
-	dh build --before auto_configure
-	dh_auto_configure -- CFLAGS="$(CFLAGS) -fPIC -Wl,-z,defs"
-	dh build --remaining
+	dh build
 	touch build-stamp
 
 clean: