r9815 - in /desktop/unstable/libgail-gnome/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Thu Apr 12 13:31:21 2007
New Revision: 9815

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9815
Log:
* Honor CFLAGS we set in rules, doh!
* Set some sane default CFLAGS and honor noopt in DEB_BUILD_OPTIONS.

Modified:
    desktop/unstable/libgail-gnome/debian/changelog
    desktop/unstable/libgail-gnome/debian/rules

Modified: desktop/unstable/libgail-gnome/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgail-gnome/debian/changelog?rev=9815&op=diff
==============================================================================
--- desktop/unstable/libgail-gnome/debian/changelog (original)
+++ desktop/unstable/libgail-gnome/debian/changelog Thu Apr 12 13:31:21 2007
@@ -1,3 +1,10 @@
+libgail-gnome (1.18.0-2) unstable; urgency=medium
+
+  * Honor CFLAGS we set in rules, doh!
+  * Set some sane default CFLAGS and honor noopt in DEB_BUILD_OPTIONS.
+
+ -- Loic Minier <lool at dooz.org>  Thu, 12 Apr 2007 15:29:02 +0200
+
 libgail-gnome (1.18.0-1) unstable; urgency=low
 
   * Set Maintainer to the Debian GNOME Maintainers.

Modified: desktop/unstable/libgail-gnome/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgail-gnome/debian/rules?rev=9815&op=diff
==============================================================================
--- desktop/unstable/libgail-gnome/debian/rules (original)
+++ desktop/unstable/libgail-gnome/debian/rules Thu Apr 12 13:31:21 2007
@@ -13,11 +13,7 @@
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 
 DEBVERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
 VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//')
@@ -53,7 +49,7 @@
 
 $(STAMP_DIR)/configure-stamp: $(STAMP_DIR)/patch-stamp
 	dh_testdir
-	./configure $(configure_flags)
+	CFLAGS="$(CFLAGS)" ./configure $(configure_flags)
 	touch $@
 
 configure: $(STAMP_DIR)/configure-stamp