r9808 - in /desktop/experimental/gnome-python/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Thu Apr 12 12:56:25 2007
New Revision: 9808

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

Modified:
    desktop/experimental/gnome-python/debian/changelog
    desktop/experimental/gnome-python/debian/rules

Modified: desktop/experimental/gnome-python/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-python/debian/changelog?rev=9808&op=diff
==============================================================================
--- desktop/experimental/gnome-python/debian/changelog (original)
+++ desktop/experimental/gnome-python/debian/changelog Thu Apr 12 12:56:25 2007
@@ -4,8 +4,10 @@
   * Include the new check-dist Makefile to prevent accidental uploads to
     unstable; bump build-dep on gnome-pkg-tools to >= 0.10.
   * Cleanup rules.
-
- -- Loic Minier <lool at dooz.org>  Thu,  8 Mar 2007 15:58:42 +0100
+  * 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 14:55:53 +0200
 
 gnome-python (2.16.2-1) experimental; urgency=low
 

Modified: desktop/experimental/gnome-python/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-python/debian/rules?rev=9808&op=diff
==============================================================================
--- desktop/experimental/gnome-python/debian/rules (original)
+++ desktop/experimental/gnome-python/debian/rules Thu Apr 12 12:56:25 2007
@@ -20,8 +20,12 @@
 # Prevent accidental uploads to unstable
 include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
 
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
+CFLAGS += -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
 endif
 
 PYVERS=$(shell pyversions -vr debian/control 2>/dev/null)
@@ -29,10 +33,12 @@
 build-%/configure-stamp: configure
 	dh_testdir
 	mkdir -p build-$*
-	cd build-$* && PYTHON=/usr/bin/python$* ../configure	\
-		--host=$(DEB_HOST_GNU_TYPE) 		\
-		--build=$(DEB_BUILD_GNU_TYPE) 		\
-		--prefix=/usr
+	cd build-$* && \
+		PYTHON=/usr/bin/python$* CFLAGS="$(CFLAGS)" \
+			$(CURDIR)/configure \
+				--host=$(DEB_HOST_GNU_TYPE) \
+				--build=$(DEB_BUILD_GNU_TYPE) \
+				--prefix=/usr
 	touch $@
 
 build-%/build-stamp: build-%/configure-stamp