r11516 - packages/trunk/fenix-plugins/debian

[Peter Pentchev]

Author: roam-guest
Date: 2010-11-26 14:04:17 +0000 (Fri, 26 Nov 2010)
New Revision: 11516

Modified:
   packages/trunk/fenix-plugins/debian/changelog
   packages/trunk/fenix-plugins/debian/control
   packages/trunk/fenix-plugins/debian/rules
Log:
Use dpkg-buildflags from dpkg-dev 1.15.7 to obtain CFLAGS and LDFLAGS.


Modified: packages/trunk/fenix-plugins/debian/changelog
===================================================================
--- packages/trunk/fenix-plugins/debian/changelog	2010-11-26 13:53:10 UTC (rev 11515)
+++ packages/trunk/fenix-plugins/debian/changelog	2010-11-26 14:04:17 UTC (rev 11516)
@@ -1,7 +1,5 @@
 fenix-plugins (0.0.20070803-4) UNRELEASED; urgency=low
 
-  TODO: dpkg-buildflags
-
   [ Miriam Ruiz ]
   * Added Renesas SH(sh4) CPU to support architecture list.
 
@@ -29,6 +27,7 @@
     - shorten the rules file using the dh(1) helper
     - use "dh --with autotools_dev" to handle config.guess and config.sub
     - use debhelper override rules
+  * Use dpkg-buildflags from dpkg-dev 1.15.7 to obtain CFLAGS and LDFLAGS.
 
  -- Peter Pentchev <roam at ringlet.net>  Thu, 25 Nov 2010 16:09:06 +0200
 

Modified: packages/trunk/fenix-plugins/debian/control
===================================================================
--- packages/trunk/fenix-plugins/debian/control	2010-11-26 13:53:10 UTC (rev 11515)
+++ packages/trunk/fenix-plugins/debian/control	2010-11-26 14:04:17 UTC (rev 11516)
@@ -4,7 +4,7 @@
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Barry deFreese <bdefreese at debian.org>
 Build-Depends: debhelper (>= 8), autotools-dev (>= 20100122.1~),
- autoconf, automake1.10 | automake1.9,
+ autoconf, automake1.10 | automake1.9, dpkg-dev (>= 1.15.7~),
  zlib1g-dev, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, libsdl-mixer1.2-dev,
  libsmpeg-dev, libfreetype6-dev, fenix, fenix-dev, libtool
 Standards-Version: 3.9.1

Modified: packages/trunk/fenix-plugins/debian/rules
===================================================================
--- packages/trunk/fenix-plugins/debian/rules	2010-11-26 13:53:10 UTC (rev 11515)
+++ packages/trunk/fenix-plugins/debian/rules	2010-11-26 14:04:17 UTC (rev 11516)
@@ -3,13 +3,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CFLAGS = -Wall -g
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
+CFLAGS += -Wall
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+LDFLAGS += -Wl,-z,defs
 
 PLUGINS = \
 	plugins/fgfx.so plugins/agua.so plugins/fire.so \
@@ -24,7 +22,7 @@
 		fi \
 	done
 	dh_auto_build -- \
-		CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" \
+		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
 		CONFFLAGS="--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)" \
 		$(PLUGINS)