summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--capplet/Makefile.am2
-rw-r--r--libgnomekbd/Makefile.am2
-rw-r--r--test/Makefile.am2
4 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ac2cdce..e9b3717 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-16 Frederic Crozat <fcrozat@mandriva.com>
+
+ * capplet/Makefile.am:
+ * libgnomekbd/Makefile.am:
+ * test/Makefile.am:
+ Do not hardcode -Werror in Makefile.am, better to use configure for
+ that. Fix bug #497425.
+
2009-06-29 svu
* configure.in, libgnomekbd.anjuta,
diff --git a/capplet/Makefile.am b/capplet/Makefile.am
index 703a651..f9203f6 100644
--- a/capplet/Makefile.am
+++ b/capplet/Makefile.am
@@ -11,7 +11,7 @@ Desktop_in_files = gkbd-indicator-plugins-capplet.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
gkbd_indicator_plugins_capplet_CFLAGS = \
- -I$(top_srcdir) -Wall -Werror \
+ -I$(top_srcdir) -Wall \
$(GCONF_CFLAGS) \
$(GTK_CFLAGS) \
$(LIBXKLAVIER_CFLAGS) \
diff --git a/libgnomekbd/Makefile.am b/libgnomekbd/Makefile.am
index cde0e40..fd848bd 100644
--- a/libgnomekbd/Makefile.am
+++ b/libgnomekbd/Makefile.am
@@ -1,7 +1,7 @@
lib_LTLIBRARIES = libgnomekbd.la libgnomekbdui.la
common_CFLAGS = \
- -I$(top_srcdir) -Wall -Werror \
+ -I$(top_srcdir) -Wall \
$(GDK_CFLAGS) \
$(DBUS_CFLAGS) \
$(GCONF_CFLAGS) \
diff --git a/test/Makefile.am b/test/Makefile.am
index 0904ae2..896b851 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2,7 +2,7 @@ noinst_PROGRAMS = gkbd-indicator-test \
gkbd-keyboard-drawing-test
gkbd_indicator_test_CFLAGS= \
- $(WARN_CFLAGS) -I$(top_srcdir) -Wall -Werror \
+ $(WARN_CFLAGS) -I$(top_srcdir) -Wall \
$(GTK_CFLAGS) \
$(LIBGLADE_CFLAGS) \
$(LIBXKLAVIER_CFLAGS) \