aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-01-26 13:36:57 -0600
committerTed Gould <ted@gould.cx>2012-01-26 13:36:57 -0600
commit4eae3efbe5c3aa84035b2ade9ceedd68b7b3e895 (patch)
tree12e30622f365a6901573a2a79c475f1f28ab5d99
parentd0065933d25307a95644e3ab984de0f4f848d6ad (diff)
downloadlibdbusmenu-4eae3efbe5c3aa84035b2ade9ceedd68b7b3e895.tar.gz
libdbusmenu-4eae3efbe5c3aa84035b2ade9ceedd68b7b3e895.tar.bz2
libdbusmenu-4eae3efbe5c3aa84035b2ade9ceedd68b7b3e895.zip
Move the no-error on deprications into the Makefiles so it's always after the -Wall
-rw-r--r--configure.ac2
-rw-r--r--libdbusmenu-glib/Makefile.am4
-rw-r--r--libdbusmenu-gtk/Makefile.am5
3 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 13efd3c..fd69595 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,8 +23,6 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums])
-CFLAGS="$CFLAGS -Wno-error=deprecated-declarations"
-
###########################
# GTK Doc
###########################
diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am
index 591bf30..83b2e7b 100644
--- a/libdbusmenu-glib/Makefile.am
+++ b/libdbusmenu-glib/Makefile.am
@@ -62,7 +62,9 @@ libdbusmenu_glib_la_LDFLAGS = \
-export-symbols-regex "^[^_].*"
libdbusmenu_glib_la_CFLAGS = \
- $(DBUSMENUGLIB_CFLAGS) -Wall -Werror -DG_DISABLE_DEPRECATED -DG_LOG_DOMAIN="\"LIBDBUSMENU-GLIB\""
+ $(DBUSMENUGLIB_CFLAGS) \
+ -Wall -Werror -Wno-error=deprecated-declarations \
+ -DG_LOG_DOMAIN="\"LIBDBUSMENU-GLIB\""
libdbusmenu_glib_la_LIBADD = \
$(DBUSMENUGLIB_LIBS)
diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am
index b4564d1..9f297f5 100644
--- a/libdbusmenu-gtk/Makefile.am
+++ b/libdbusmenu-gtk/Makefile.am
@@ -62,7 +62,10 @@ libdbusmenu_gtk_la_LDFLAGS = \
-export-symbols-regex "^[^_].*"
libdbusmenu_gtk_la_CFLAGS = \
- $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir) -Wall -Werror -DG_DISABLE_DEPRECATED -DG_LOG_DOMAIN="\"LIBDBUSMENU-GTK\""
+ $(DBUSMENUGTK_CFLAGS) \
+ -I$(top_srcdir) \
+ -Wall -Werror -Wno-error=deprecated-declarations \
+ -DG_LOG_DOMAIN="\"LIBDBUSMENU-GTK\""
libdbusmenu_gtk_la_LIBADD = \
../libdbusmenu-glib/libdbusmenu-glib.la \