r11861 - in packages/trunk/alex4/debian: . patches

[Peter Pentchev]

Author: roam-guest
Date: 2011-03-09 20:04:07 +0000 (Wed, 09 Mar 2011)
New Revision: 11861

Modified:
   packages/trunk/alex4/debian/changelog
   packages/trunk/alex4/debian/control
   packages/trunk/alex4/debian/patches/unix-port.patch
   packages/trunk/alex4/debian/rules
Log:
Get CFLAGS, CPPFLAGS and LDFLAGS from dpkg-buildflags.

Modified: packages/trunk/alex4/debian/changelog
===================================================================
--- packages/trunk/alex4/debian/changelog	2011-03-09 20:03:52 UTC (rev 11860)
+++ packages/trunk/alex4/debian/changelog	2011-03-09 20:04:07 UTC (rev 11861)
@@ -10,12 +10,15 @@
       Closes: #617465
     - put the aldumb library before the Allegro libraries that it
       depends on
+    - honor CPPFLAGS, CFLAGS and LDFLAGS
   * Convert to the 3.0 (quilt) source format.
   * Add misc:Depends to the alex4-data package just in case.
   * Expand the alex4-data package's long description.
   * Bump the debhelper compatibility level to 8 and minimize the rules file
     using debhelper override targets.
   * Bump Standards-Version to 3.9.1 with no changes.
+  * Use dpkg-buildflags to obtain the default values for CPPFLAGS, CFLAGS
+    and LDFLAGS.
 
  -- Peter Pentchev <roam at ringlet.net>  Wed, 09 Mar 2011 14:14:04 +0200
 

Modified: packages/trunk/alex4/debian/control
===================================================================
--- packages/trunk/alex4/debian/control	2011-03-09 20:03:52 UTC (rev 11860)
+++ packages/trunk/alex4/debian/control	2011-03-09 20:04:07 UTC (rev 11861)
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Peter De Wachter <pdewacht at gmail.com>
-Build-Depends: debhelper (>= 8), liballegro4.2-dev (>= 2:4.2.2-2), libdumb1-dev, libaldmb1-dev
+Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.15.7~),
+	liballegro4.2-dev (>= 2:4.2.2-2), libdumb1-dev, libaldmb1-dev
 Standards-Version: 3.9.1
 Homepage: http://allegator.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/alex4/

Modified: packages/trunk/alex4/debian/patches/unix-port.patch
===================================================================
--- packages/trunk/alex4/debian/patches/unix-port.patch	2011-03-09 20:03:52 UTC (rev 11860)
+++ packages/trunk/alex4/debian/patches/unix-port.patch	2011-03-09 20:04:07 UTC (rev 11861)
@@ -451,7 +451,7 @@
 @@ -0,0 +1,24 @@
 +PREFIX  = /usr/local
 +DATADIR = $(PREFIX)/share/$(TARGET)
-+CFLAGS  = -g -Wall -Wno-deprecated-declarations -O2
++CFLAGS  ?= -g -Wall -Wno-deprecated-declarations -O2
 +LIBS = -laldmb -ldumb `allegro-config --libs`
 +DEFINES = -DDATADIR=\"$(DATADIR)/\"
 +OBJS    =  actor.o    edit.o  map.o       player.o    shooter.o unix.o \
@@ -460,10 +460,10 @@
 +TARGET  = alex4
 +
 +$(TARGET): $(OBJS)
-+	$(CC) -o $@ $^ $(LIBS)
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 +
 +%.o: %.c
-+	$(CC) $(CFLAGS) $(DEFINES) -o $@ -c $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -o $@ -c $<
 +
 +install: $(TARGET)
 +	mkdir -p $(PREFIX)/bin

Modified: packages/trunk/alex4/debian/rules
===================================================================
--- packages/trunk/alex4/debian/rules	2011-03-09 20:03:52 UTC (rev 11860)
+++ packages/trunk/alex4/debian/rules	2011-03-09 20:04:07 UTC (rev 11861)
@@ -3,11 +3,16 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CFLAGS = -Wall -g $(if $(findstring noopt,$(DEB_BUILD_OPTIONS)), -O0, -O2)
+CFLAGS:=	$(shell dpkg-buildflags --get CFLAGS)
+CPPFLAGS:=	$(shell dpkg-buildflags --get CPPFLAGS)
+LDFLAGS:=	$(shell dpkg-buildflags --get LDFLAGS)
 
+CFLAGS+=	-Wall
+
+export CPPFLAGS CFLAGS LDFLAGS
+
 override_dh_auto_build:
-	dh_auto_build -D src -- CFLAGS="$(CFLAGS)" \
-		DATADIR=/usr/share/games/alex4
+	dh_auto_build -D src -- DATADIR=/usr/share/games/alex4
 
 override_dh_auto_clean:
 	dh_auto_clean -D src