r11534 - packages/trunk/cookietool/debian

[Peter Pentchev]

Author: roam-guest
Date: 2010-11-28 23:06:06 +0000 (Sun, 28 Nov 2010)
New Revision: 11534

Modified:
   packages/trunk/cookietool/debian/changelog
   packages/trunk/cookietool/debian/control
   packages/trunk/cookietool/debian/rules
Log:
Use dpkg-buildflags from dpkg-dev 1.15.7 to get CFLAGS, CPPFLAGS and LDFLAGS.


Modified: packages/trunk/cookietool/debian/changelog
===================================================================
--- packages/trunk/cookietool/debian/changelog	2010-11-28 16:11:00 UTC (rev 11533)
+++ packages/trunk/cookietool/debian/changelog	2010-11-28 23:06:06 UTC (rev 11534)
@@ -7,6 +7,8 @@
   * Bump Standards-Version to 3.9.1 with no changes.
   * Update the copyright file to rev. 135 of the DEP 5 proposal and
     bump the year on my packaging copyright notice.
+  * Use dpkg-buildflags from dpkg-dev 1.15.7 to obtain the default values
+    for CFLAGS, CPPFLAGS, and LDFLAGS.
 
  -- Peter Pentchev <roam at ringlet.net>  Sun, 28 Nov 2010 16:58:20 +0200
 

Modified: packages/trunk/cookietool/debian/control
===================================================================
--- packages/trunk/cookietool/debian/control	2010-11-28 16:11:00 UTC (rev 11533)
+++ packages/trunk/cookietool/debian/control	2010-11-28 23:06:06 UTC (rev 11534)
@@ -1,7 +1,7 @@
 Source: cookietool
 Section: games
 Priority: optional
-Build-Depends: debhelper (>= 7.0.50), hardening-wrapper
+Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.7~), hardening-wrapper
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Peter Pentchev <roam at ringlet.net>
 Standards-Version: 3.9.1

Modified: packages/trunk/cookietool/debian/rules
===================================================================
--- packages/trunk/cookietool/debian/rules	2010-11-28 16:11:00 UTC (rev 11533)
+++ packages/trunk/cookietool/debian/rules	2010-11-28 23:06:06 UTC (rev 11534)
@@ -1,6 +1,10 @@
 #!/usr/bin/make -f
 # debhelper config file for cookietool, the fortune database maintenance suite
 
+CPPFLAGS=	$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS=		$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=	$(shell dpkg-buildflags --get LDFLAGS)
+
 CFLAGS+=	-Wall -W -ansi -pedantic -Wbad-function-cast \
 		-Wcast-align -Wcast-qual -Wchar-subscripts -Winline \
 		-Wmissing-prototypes -Wnested-externs -Wpointer-arith \
@@ -8,7 +12,9 @@
 ifneq (,$(filter werror,$(DEB_BUILD_OPTIONS)))
 	CFLAGS+=	-Werror
 endif
-export CFLAGS
+
+export CFLAGS CPPFLAGS LDFLAGS
+
 ifneq (,$(filter hardening,$(DEB_BUILD_OPTIONS)))
 export DEB_BUILD_HARDENING=1
 else