r9355 - packages/trunk/xmahjongg/debian

[Peter Pentchev]

Author: roam-guest
Date: 2009-04-02 12:56:36 +0000 (Thu, 02 Apr 2009)
New Revision: 9355

Modified:
   packages/trunk/xmahjongg/debian/changelog
   packages/trunk/xmahjongg/debian/rules
Log:
Pass -Werror to the compiler if the non-standard "werror" option is on.


Modified: packages/trunk/xmahjongg/debian/changelog
===================================================================
--- packages/trunk/xmahjongg/debian/changelog	2009-04-02 12:21:34 UTC (rev 9354)
+++ packages/trunk/xmahjongg/debian/changelog	2009-04-02 12:56:36 UTC (rev 9355)
@@ -3,7 +3,6 @@
   * New maintainer.  Closes: #519355
   * TODO:
     - fix a couple of compiler warnings, build with more warning flags
-    - build with -Werror
     - build with the hardening wrapper
     - add a desktop file to fix #478955
   * Use quilt for patch management.
@@ -26,6 +25,7 @@
   * Fix a typo in the manual page.  Closes: #302663
   * Convert the copyright file to the machine-parseable format and
     actually list all the relevant files' licenses there.
+  * Build with -Werror if "werror" is specified in DEB_BUILD_OPTIONS.
 
  -- Peter Pentchev <roam at ringlet.net>  Tue, 31 Mar 2009 17:19:37 +0300
 

Modified: packages/trunk/xmahjongg/debian/rules
===================================================================
--- packages/trunk/xmahjongg/debian/rules	2009-04-02 12:21:34 UTC (rev 9354)
+++ packages/trunk/xmahjongg/debian/rules	2009-04-02 12:56:36 UTC (rev 9355)
@@ -9,6 +9,14 @@
 PACKAGE=	xmahjongg
 D=		$(CURDIR)/debian/$(PACKAGE)
 
+WARNFLAGS?=
+ifneq (,$(filter werror,$(DEB_BUILD_OPTIONS)))
+	WARNFLAGS+=	-Werror
+endif
+CFLAGS+=	${WARNFLAGS}
+CXXFLAGS+=	${WARNFLAGS}
+export CFLAGS CXXFLAGS
+
 include /usr/share/quilt/quilt.make
 
 override_dh_auto_configure:	${QUILT_STAMPFN}