r9811 - in /desktop/experimental/pygobject/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Thu Apr 12 13:17:29 2007
New Revision: 9811

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

Modified:
    desktop/experimental/pygobject/debian/changelog
    desktop/experimental/pygobject/debian/rules

Modified: desktop/experimental/pygobject/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygobject/debian/changelog?rev=9811&op=diff
==============================================================================
--- desktop/experimental/pygobject/debian/changelog (original)
+++ desktop/experimental/pygobject/debian/changelog Thu Apr 12 13:17:29 2007
@@ -5,8 +5,10 @@
     unstable; bump build-dep on gnome-pkg-tools to >= 0.10.
   * Cleanup rules.
   * Build-depend on autotools-dev.
+  * 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,  8 Mar 2007 16:08:56 +0100
+ -- Loic Minier <lool at dooz.org>  Thu, 12 Apr 2007 15:14:32 +0200
 
 pygobject (2.12.3-1) experimental; urgency=low
 

Modified: desktop/experimental/pygobject/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygobject/debian/rules?rev=9811&op=diff
==============================================================================
--- desktop/experimental/pygobject/debian/rules (original)
+++ desktop/experimental/pygobject/debian/rules Thu Apr 12 13:17:29 2007
@@ -7,8 +7,12 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-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 -vs)
@@ -16,10 +20,12 @@
 build-%/configure-stamp:
 	dh_testdir
 	mkdir -p build-$*
-	cd build-$* && PYTHON=/usr/bin/python$* \
-		../configure --host=$(DEB_HOST_GNU_TYPE)	\
-			--build=$(DEB_BUILD_GNU_TYPE)		\
-			--prefix=/usr --enable-thread
+	cd build-$* && \
+		PYTHON=/usr/bin/python$* CFLAGS="$(CFLAGS)" \
+			../configure --host=$(DEB_HOST_GNU_TYPE) \
+				--build=$(DEB_BUILD_GNU_TYPE) \
+				--prefix=/usr \
+				--enable-thread
 	touch $@
 
 build-%/build-stamp: build-%/configure-stamp