From cd8a2c6cad1dd72b57d3d271e46302b0105f3347 Mon Sep 17 00:00:00 2001
From: Evan Nemerson <evan@coeus-group.com>
Date: Wed, 2 Jan 2013 15:37:57 -0800
Subject: [PATCH 2/2] Use the GNOME_COMPILE_WARNINGS([maximum]) macro instead
 of -Werror

https://bugs.freedesktop.org/show_bug.cgi?id=56852
---
 .gitignore           | 2 ++
 configure.ac         | 2 +-
 examples/Makefile.am | 8 ++++----
 gypsy/Makefile.am    | 1 +
 src/Makefile.am      | 1 +
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0cc2ead..5267d52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,8 @@ examples/simple-gps-gypsy
 examples/simple-gps-satellites
 interfaces/gypsy-client.xml
 interfaces/gypsy-server.xml
+m4/
+!m4/gnome-compiler-flags.m4
 src/gypsy-daemon
 src/gypsy-marshal-internal.c
 src/gypsy-marshal-internal.h
diff --git a/configure.ac b/configure.ac
index 24a346f..8063215 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,7 @@ AC_MSG_RESULT([$with_user])
 AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
 AS_AC_EXPAND(DAEMON_USER, $with_user)
 
-CFLAGS="$CFLAGS -g -Wall -Werror -Wno-format"
+GNOME_COMPILE_WARNINGS([maximum])
 
 GTK_DOC_CHECK([1.6])
 # TODO: add --with-xsltproc argument to override PATH
diff --git a/examples/Makefile.am b/examples/Makefile.am
index fe78d51..31ee697 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -6,19 +6,19 @@ noinst_PROGRAMS = 				\
 
 list_known_gps_devices_SOURCES = list-known-gps-devices.c
 list_known_gps_devices_LDADD = $(GYPSY_LIBS) $(top_builddir)/gypsy/libgypsy.la
-list_known_gps_devices_CFLAGS = $(GYPSY_CFLAGS) -I$(top_srcdir)
+list_known_gps_devices_CFLAGS = $(GYPSY_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir)
 
 simple_gps_dbus_SOURCES = simple-gps-dbus.c
 simple_gps_dbus_LDADD = $(GYPSY_LIBS)
-simple_gps_dbus_CFLAGS = $(GYPSY_CFLAGS)
+simple_gps_dbus_CFLAGS = $(GYPSY_CFLAGS) $(WARN_CFLAGS)
 
 simple_gps_gypsy_SOURCES = simple-gps-gypsy.c
 simple_gps_gypsy_LDADD = $(GYPSY_LIBS) $(top_builddir)/gypsy/libgypsy.la
-simple_gps_gypsy_CFLAGS = $(GYPSY_CFLAGS) -I$(top_srcdir)
+simple_gps_gypsy_CFLAGS = $(GYPSY_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir)
 
 simple_gps_satellites_SOURCES = simple-gps-satellites.c
 simple_gps_satellites_LDADD = $(GYPSY_LIBS) $(top_builddir)/gypsy/libgypsy.la
-simple_gps_satellites_CFLAGS = $(GYPSY_CFLAGS) -I$(top_srcdir)
+simple_gps_satellites_CFLAGS = $(GYPSY_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir)
 
 EXTRA_DIST = \
 	simple-gps-python.py \
diff --git a/gypsy/Makefile.am b/gypsy/Makefile.am
index e008df2..bb1c827 100644
--- a/gypsy/Makefile.am
+++ b/gypsy/Makefile.am
@@ -22,6 +22,7 @@ libgypsy_la_SOURCES = 		\
 libgypsy_la_CFLAGS =		\
 	-I$(top_srcdir)		\
 	-I$(top_builddir)	\
+	$(WARN_CFLAGS)		\
 	$(GYPSY_CFLAGS)
 
 libgypsy_la_LIBADD = \
diff --git a/src/Makefile.am b/src/Makefile.am
index 84bc785..e03446d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,6 +5,7 @@ gypsy_daemon_CFLAGS =		\
 	-I$(srcdir)		\
 	-I$(top_builddir)	\
 	-DLOCALSTATEDIR=\"$(localstatedir)\"	\
+	$(WARN_CFLAGS)		\
 	$(GYPSY_CFLAGS)		\
 	$(GPSBT_CFLAGS)
 
-- 
1.8.0.2