use MATE_COMPILE_WARNINGS from mate-common

23 files changed, 104 insertions, 199 deletions

diff --git a/.build.yml b/.build.yml
index 7f27a34..4908a26 100644
--- a/.build.yml
+++ b/.build.yml
@@ -117,7 +117,6 @@ requires:
     - x11proto-kb-dev
 
 variables:
-  - CFLAGS="-Wall -Werror=format-security -Wredundant-decls"
   - 'CHECKERS="
     -enable-checker deadcode.DeadStores
     -enable-checker alpha.deadcode.UnreachableCode
@@ -155,7 +154,7 @@ before_scripts:
 
 build_scripts:
   - ./autogen.sh
-  - scan-build $CHECKERS ./configure --prefix=/usr --enable-pulse
+  - scan-build $CHECKERS ./configure --prefix=/usr --enable-pulse --enable-compile-warnings=maximum
   - if [ $CPU_COUNT -gt 1 ]; then
   -     scan-build $CHECKERS --keep-cc -o html-report make -j $CPU_COUNT
   - else
diff --git a/acinclude.m4 b/acinclude.m4
index f2f8ec3..deebd2b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,90 +1,3 @@
-dnl EXTRA_COMPILE_WARNINGS
-dnl Turn on many useful compiler warnings
-dnl For now, only works on GCC
-AC_DEFUN([EXTRA_COMPILE_WARNINGS],[
-    dnl ******************************
-    dnl More compiler warnings
-    dnl ******************************
-
-    AC_ARG_ENABLE(compile-warnings,
-                  AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
-                                 [Turn on compiler warnings]),,
-                  [enable_compile_warnings="m4_default([$1],[yes])"])
-
-    warnCFLAGS=
-    if test "x$GCC" != xyes; then
-	enable_compile_warnings=no
-    fi
-
-    warning_flags=
-    realsave_CFLAGS="$CFLAGS"
-
-    case "$enable_compile_warnings" in
-    no)
-	warning_flags=
-	;;
-    minimum)
-	warning_flags="-Wall"
-	;;
-    yes)
-	warning_flags="-Wall -Wmissing-prototypes"
-	;;
-    maximum|error)
-	warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
-	CFLAGS="$warning_flags $CFLAGS"
-	for option in -Wno-sign-compare; do
-		SAVE_CFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS $option"
-		AC_MSG_CHECKING([whether gcc understands $option])
-		AC_TRY_COMPILE([], [],
-			has_option=yes,
-			has_option=no,)
-		CFLAGS="$SAVE_CFLAGS"
-		AC_MSG_RESULT($has_option)
-		if test $has_option = yes; then
-		  warning_flags="$warning_flags $option"
-		fi
-		unset has_option
-		unset SAVE_CFLAGS
-	done
-	unset option
-	if test "$enable_compile_warnings" = "error" ; then
-	    warning_flags="$warning_flags -Werror"
-	fi
-	;;
-    *)
-	AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
-	;;
-    esac
-    CFLAGS="$realsave_CFLAGS"
-    AC_MSG_CHECKING(what warning flags to pass to the C compiler)
-    AC_MSG_RESULT($warning_flags)
-
-    AC_ARG_ENABLE(iso-c,
-                  AC_HELP_STRING([--enable-iso-c],
-                                 [Try to warn if code is not ISO C ]),,
-                  [enable_iso_c=no])
-
-    AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
-    complCFLAGS=
-    if test "x$enable_iso_c" != "xno"; then
-	if test "x$GCC" = "xyes"; then
-	case " $CFLAGS " in
-	    *[\ \	]-ansi[\ \	]*) ;;
-	    *) complCFLAGS="$complCFLAGS -ansi" ;;
-	esac
-	case " $CFLAGS " in
-	    *[\ \	]-pedantic[\ \	]*) ;;
-	    *) complCFLAGS="$complCFLAGS -pedantic" ;;
-	esac
-	fi
-    fi
-    AC_MSG_RESULT($complCFLAGS)
-
-    WARN_CFLAGS="$warning_flags $complCFLAGS"
-    AC_SUBST(WARN_CFLAGS)
-])
-
 dnl as-ac-expand.m4 0.2.0                                   -*- autoconf -*-
 dnl autostars m4 macro for expanding directories using configure's prefix
 
diff --git a/configure.ac b/configure.ac
index d4028cd..d766c8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,8 @@ AC_INIT([mate-settings-daemon],
 AC_CONFIG_SRCDIR([mate-settings-daemon/mate-settings-manager.c])
 AC_CONFIG_MACRO_DIR([m4])
 
+MATE_COMPILE_WARNINGS
+
 AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar check-news])
 AM_MAINTAINER_MODE([enable])
 
@@ -58,8 +60,6 @@ LIBMATEKBD_REQUIRED_VERSION=1.17.0
 LIBNOTIFY_REQUIRED_VERSION=0.7.0
 LIBMATEMIXER_REQUIRED_VERSION=1.10.0
 
-EXTRA_COMPILE_WARNINGS(yes)
-
 PKG_CHECK_MODULES(SETTINGS_DAEMON,
 	glib-2.0 >= $GLIB_REQUIRED_VERSION
 	gtk+-3.0 >= $GTK_REQUIRED_VERSION
@@ -386,47 +386,6 @@ dnl - Finish
 dnl ---------------------------------------------------------------------------
 
 
-# Turn on the additional warnings last, so warnings don't affect other tests.
-
-AC_ARG_ENABLE(more-warnings,
-	[AC_HELP_STRING([--enable-more-warnings],
-	[Maximum compiler warnings])],
-	set_more_warnings="$enableval",[
-        	if test -d $srcdir/.git; then
-        		set_more_warnings=yes
-              	else
-                  	set_more_warnings=no
-              	fi
-        ])
-AC_MSG_CHECKING(for more warnings)
-if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
-        AC_MSG_RESULT(yes)
-        CFLAGS="\
-        -Wall \
-        -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
-        -Wnested-externs -Wpointer-arith \
-        -Wcast-align -Wsign-compare \
-        $CFLAGS"
-
-        for option in -Wno-strict-aliasing -Wno-sign-compare; do
-                SAVE_CFLAGS="$CFLAGS"
-                CFLAGS="$CFLAGS $option"
-                AC_MSG_CHECKING([whether gcc understands $option])
-                AC_TRY_COMPILE([], [],
-                        has_option=yes,
-                        has_option=no,)
-                if test $has_option = no; then
-                        CFLAGS="$SAVE_CFLAGS"
-                fi
-                AC_MSG_RESULT($has_option)
-                unset has_option
-                unset SAVE_CFLAGS
-        done
-        unset option
-else
-        AC_MSG_RESULT(no)
-fi
-
 #
 # Enable Debug
 #
@@ -523,6 +482,7 @@ echo "
     source code location:     ${srcdir}
     compiler:                 ${CC}
     cflags:                   ${CFLAGS}
+    warning cflags:           ${WARN_CFLAGS}
     Maintainer mode:          ${USE_MAINTAINER_MODE}
 
     dbus-1 system.d dir:      ${DBUS_SYS_DIR}
diff --git a/plugins/a11y-keyboard/Makefile.am b/plugins/a11y-keyboard/Makefile.am
index 75acaa0..c21f78e 100644
--- a/plugins/a11y-keyboard/Makefile.am
+++ b/plugins/a11y-keyboard/Makefile.am
@@ -18,13 +18,15 @@ test_a11y_preferences_dialog_SOURCES =		\
 test_a11y_preferences_dialog_CPPFLAGS = \
 	-I$(top_srcdir)/mate-settings-daemon			\
 	-DPIXMAPDIR=\""$(pkgdatadir)"\"				\
-	-DGTKBUILDERDIR=\""$(pkgdatadir)"\"				\
+	-DGTKBUILDERDIR=\""$(pkgdatadir)"\"			\
 	-DMATE_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"	\
 	$(AM_CPPFLAGS)
 
-test_a11y_preferences_dialog_CFLAGS = \
+test_a11y_preferences_dialog_CFLAGS =	\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
-	$(AM_CFLAGS)
+	$(AM_CFLAGS)			\
+	$(WARN_CFLAGS)			\
+	$(NULL)
 
 test_a11y_preferences_dialog_LDADD = \
 	$(SETTINGS_DAEMON_LIBS)			\
@@ -50,10 +52,12 @@ liba11y_keyboard_la_CPPFLAGS = \
 	-DGTKBUILDERDIR=\""$(gtkbuilderdir)"\" \
 	$(AM_CPPFLAGS)
 
-liba11y_keyboard_la_CFLAGS = \
+liba11y_keyboard_la_CFLAGS =		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(LIBNOTIFY_CFLAGS)		\
-	$(AM_CFLAGS)
+	$(AM_CFLAGS)			\
+	$(WARN_CFLAGS)			\
+	$(NULL)
 
 liba11y_keyboard_la_LDFLAGS = 		\
 	$(MSD_PLUGIN_LDFLAGS)		\
diff --git a/plugins/a11y-settings/Makefile.am b/plugins/a11y-settings/Makefile.am
index 6794dcc..bcd0d2f 100644
--- a/plugins/a11y-settings/Makefile.am
+++ b/plugins/a11y-settings/Makefile.am
@@ -14,10 +14,11 @@ liba11y_settings_la_CPPFLAGS = \
 	-DMATE_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
 
-liba11y_settings_la_CFLAGS = \
+liba11y_settings_la_CFLAGS =		\
 	$(PLUGIN_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
-	$(AM_CFLAGS)
+	$(AM_CFLAGS)			\
+	$(WARN_CFLAGS)
 
 liba11y_settings_la_LDFLAGS = 		\
 	$(MSD_PLUGIN_LDFLAGS)
diff --git a/plugins/background/Makefile.am b/plugins/background/Makefile.am
index e25f26b..d969258 100644
--- a/plugins/background/Makefile.am
+++ b/plugins/background/Makefile.am
@@ -15,10 +15,11 @@ test_background_CPPFLAGS = \
 	-DMATE_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
 
-test_background_CFLAGS = \
+test_background_CFLAGS =		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(MATE_DESKTOP_CFLAGS)		\
-	$(AM_CFLAGS)
+	$(AM_CFLAGS)			\
+	$(WARN_CFLAGS)
 
 test_background_LDADD =		\
 	$(top_builddir)/mate-settings-daemon/libmsd-profile.la	\
@@ -44,10 +45,11 @@ libbackground_la_CPPFLAGS = \
 	-DMATE_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
 
-libbackground_la_CFLAGS = \
+libbackground_la_CFLAGS =		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(MATE_DESKTOP_CFLAGS)		\
-	$(AM_CFLAGS)
+	$(AM_CFLAGS)			\
+	$(WARN_CFLAGS)
 
 libbackground_la_LDFLAGS = 		\
 	$(MSD_PLUGIN_LDFLAGS)		\
diff --git a/plugins/clipboard/Makefile.am b/plugins/clipboard/Makefile.am
index bdf49ae..e42d798 100644
--- a/plugins/clipboard/Makefile.am
+++ b/plugins/clipboard/Makefile.am
@@ -20,9 +20,10 @@ libclipboard_la_CPPFLAGS = \
 	-DMATE_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
 
-libclipboard_la_CFLAGS = \
+libclipboard_la_CFLAGS =		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
-	$(AM_CFLAGS)
+	$(AM_CFLAGS)			\
+	$(WARN_CFLAGS)
 
 libclipboard_la_LDFLAGS = 	\
 	$(MSD_PLUGIN_LDFLAGS)	\
diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
index 4cd30d8..3a44edb 100644
--- a/plugins/common/Makefile.am
+++ b/plugins/common/Makefile.am
@@ -17,7 +17,8 @@ libcommon_la_CPPFLAGS = \
 libcommon_la_CFLAGS = \
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(XINPUT_CFLAGS)		\
-	$(AM_CFLAGS)
+	$(AM_CFLAGS)			\
+	$(WARN_CFLAGS)
 
 libcommon_la_LDFLAGS = \
 	$(MSD_PLUGIN_LDFLAGS) $(XINPUT_LIBS) $(X11_LIBS)
diff --git a/plugins/datetime/Makefile.am b/plugins/datetime/Makefile.am
index fed59df..3981235 100644
--- a/plugins/datetime/Makefile.am
+++ b/plugins/datetime/Makefile.am
@@ -27,7 +27,7 @@ if HAVE_POLKIT
 BUILT_SOURCES = msd-datetime-mechanism-glue.h
 endif
 
-AM_CFLAGS = $(SETTINGS_PLUGIN_CFLAGS) $(POLKIT_CFLAGS)
+AM_CFLAGS = $(WARN_CFLAGS) $(SETTINGS_PLUGIN_CFLAGS) $(POLKIT_CFLAGS)
 msd_datetime_mechanism_LDADD = $(POLKIT_LIBS) $(SETTINGS_PLUGIN_LIBS)
 
 
diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am
index 0aaaf74..7de939e 100644
--- a/plugins/dummy/Makefile.am
+++ b/plugins/dummy/Makefile.am
@@ -12,9 +12,10 @@ libdummy_la_CPPFLAGS = \
 	-DMATE_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
 
-libdummy_la_CFLAGS = \
+libdummy_la_CFLAGS =			\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
-	$(AM_CFLAGS)
+	$(AM_CFLAGS)			\
+	$(WARN_CFLAGS)
 
 libdummy_la_LDFLAGS = 		\
 	$(MSD_PLUGIN_LDFLAGS)
diff --git a/plugins/housekeeping/Makefile.am b/plugins/housekeeping/Makefile.am
index fa422cf..2e8f5b1 100644
--- a/plugins/housekeeping/Makefile.am
+++ b/plugins/housekeeping/Makefile.am
@@ -21,7 +21,8 @@ libhousekeeping_la_CFLAGS = 		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(GIOUNIX_CFLAGS)		\
 	$(LIBNOTIFY_CFLAGS)		\
-	$(AM_CFLAGS)
+	$(AM_CFLAGS)			\
+	$(WARN_CFLAGS)
 
 libhousekeeping_la_LDFLAGS = $(MSD_PLUGIN_LDFLAGS)
 
diff --git a/plugins/keybindings/Makefile.am b/plugins/keybindings/Makefile.am
index 5bef006..57e744a 100644
--- a/plugins/keybindings/Makefile.am
+++ b/plugins/keybindings/Makefile.am
@@ -19,10 +19,11 @@ libkeybindings_la_CPPFLAGS = \
 	-DMATE_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
 
-libkeybindings_la_CFLAGS = \
+libkeybindings_la_CFLAGS =		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
-	$(DCONF_CFLAGS)	\
-	$(AM_CFLAGS)
+	$(DCONF_CFLAGS)			\
+	$(AM_CFLAGS)			\
+	$(WARN_CFLAGS)
 
 libkeybindings_la_LDFLAGS = 		\
 	$(MSD_PLUGIN_LDFLAGS)	\
diff --git a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am
index 62786b2..8905ca9 100644
--- a/plugins/keyboard/Makefile.am
+++ b/plugins/keyboard/Makefile.am
@@ -30,10 +30,12 @@ libkeyboard_la_CPPFLAGS = \
 	-DMATE_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
 
-libkeyboard_la_CFLAGS = \
+libkeyboard_la_CFLAGS =			\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(LIBMATEKBDUI_CFLAGS)		\
-	$(AM_CFLAGS)
+	$(AM_CFLAGS)			\
+	$(WARN_CFLAGS)			\
+	$(NULL)
 
 libkeyboard_la_LDFLAGS = 	\
 	$(MSD_PLUGIN_LDFLAGS)	\
diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am
index 155a253..0a45709 100644
--- a/plugins/media-keys/Makefile.am
+++ b/plugins/media-keys/Makefile.am
@@ -41,11 +41,13 @@ libmedia_keys_la_CPPFLAGS = \
 	-DMATE_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"	\
 	$(AM_CPPFLAGS)
 
-libmedia_keys_la_CFLAGS = \
+libmedia_keys_la_CFLAGS =		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
-    $(LIBMATEMIXER_CFLAGS)   \
-    $(LIBCANBERRA_CFLAGS)   \
-	$(AM_CFLAGS)
+	$(LIBMATEMIXER_CFLAGS)		\
+	$(LIBCANBERRA_CFLAGS)		\
+	$(AM_CFLAGS)			\
+	$(WARN_CFLAGS)			\
+	$(NULL)
 
 libmedia_keys_la_LDFLAGS = 		\
 	$(MSD_PLUGIN_LDFLAGS)
@@ -82,9 +84,11 @@ test_media_window_CPPFLAGS = \
 	-DMATE_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"	\
 	$(AM_CPPFLAGS)
 
-test_media_window_CFLAGS = \
+test_media_window_CFLAGS =		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
-	$(AM_CFLAGS)
+	$(AM_CFLAGS)			\
+	$(WARN_CFLAGS)			\
+	$(NULL)
 
 test_media_window_LDADD = \
 	$(top_builddir)/plugins/common/libcommon.la			\
@@ -110,11 +114,13 @@ test_media_keys_CPPFLAGS = \
 	-DMATE_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"	\
 	$(AM_CPPFLAGS)
 
-test_media_keys_CFLAGS = \
+test_media_keys_CFLAGS =		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
-    $(LIBMATEMIXER_CFLAGS)   \
-    $(LIBCANBERRA_CFLAGS)   \
-	$(AM_CFLAGS)
+	$(LIBMATEMIXER_CFLAGS)		\
+	$(LIBCANBERRA_CFLAGS)		\
+	$(AM_CFLAGS)			\
+	$(WARN_CFLAGS)			\
+	$(NULL)
 
 test_media_keys_LDADD = \
 	$(top_builddir)/mate-settings-daemon/libmsd-profile.la \
diff --git a/plugins/mouse/Makefile.am b/plugins/mouse/Makefile.am
index e10c68a..5fc0cf9 100644
--- a/plugins/mouse/Makefile.am
+++ b/plugins/mouse/Makefile.am
@@ -13,9 +13,10 @@ libmouse_la_CPPFLAGS = \
 	-DLIBEXECDIR=\""$(libexecdir)"\" \
 	$(AM_CPPFLAGS)
 
-libmouse_la_CFLAGS = \
+libmouse_la_CFLAGS =			\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
-	$(AM_CFLAGS)
+	$(AM_CFLAGS)			\
+	$(WARN_CFLAGS)
 
 libmouse_la_LDFLAGS = 		\
 	$(MSD_PLUGIN_LDFLAGS)
@@ -38,9 +39,10 @@ msd_locate_pointer_SOURCES = 	\
 	msd-timeline.h		\
 	msd-timeline.c
 
-msd_locate_pointer_CFLAGS = \
+msd_locate_pointer_CFLAGS =		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
-	$(AM_CFLAGS)
+	$(AM_CFLAGS)			\
+	$(WARN_CFLAGS)
 
 msd_locate_pointer_LDADD  = 		\
 	$(SETTINGS_PLUGIN_LIBS)		\
diff --git a/plugins/mpris/Makefile.am b/plugins/mpris/Makefile.am
index 8603ed5..f382b3d 100644
--- a/plugins/mpris/Makefile.am
+++ b/plugins/mpris/Makefile.am
@@ -12,9 +12,10 @@ libmpris_la_CPPFLAGS = \
 	-DMATE_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
 
-libmpris_la_CFLAGS = \
+libmpris_la_CFLAGS =			\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
-	$(AM_CFLAGS)
+	$(AM_CFLAGS)			\
+	$(WARN_CFLAGS)
 
 libmpris_la_LDFLAGS = 		\
 	$(MSD_PLUGIN_LDFLAGS)
diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am
index f78606a..683f806 100644
--- a/plugins/rfkill/Makefile.am
+++ b/plugins/rfkill/Makefile.am
@@ -16,11 +16,12 @@ librfkill_la_CPPFLAGS = \
 	-DLIBEXECDIR=\""$(libexecdir)"\" 		\
 	$(AM_CPPFLAGS)
 
-librfkill_la_CFLAGS = \
+librfkill_la_CFLAGS =			\
 	$(PLUGIN_CFLAGS)		\
 	$(RFKILL_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
-	$(AM_CFLAGS)
+	$(AM_CFLAGS)			\
+	$(WARN_CFLAGS)
 
 librfkill_la_LDFLAGS = 		\
 	$(MSD_PLUGIN_LDFLAGS)
diff --git a/plugins/smartcard/Makefile.am b/plugins/smartcard/Makefile.am
index e9daad7..c43b630 100644
--- a/plugins/smartcard/Makefile.am
+++ b/plugins/smartcard/Makefile.am
@@ -18,10 +18,11 @@ libsmartcard_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 libsmartcard_la_CFLAGS = \
-	$(SETTINGS_PLUGIN_CFLAGS) \
-	$(MATE_CFLAGS)	\
-	$(NSS_CFLAGS)	\
-	$(AM_CFLAGS)
+	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(MATE_CFLAGS)			\
+	$(NSS_CFLAGS)			\
+	$(AM_CFLAGS)			\
+	$(WARN_CFLAGS)
 
 libsmartcard_la_LDFLAGS = \
 	$(MSD_PLUGIN_LDFLAGS)
diff --git a/plugins/sound/Makefile.am b/plugins/sound/Makefile.am
index fea7b9f..2272ab4 100644
--- a/plugins/sound/Makefile.am
+++ b/plugins/sound/Makefile.am
@@ -14,9 +14,10 @@ libsound_la_CPPFLAGS = \
 
 libsound_la_CFLAGS = \
 	$(SETTINGS_PLUGIN_CFLAGS) \
-	$(MATE_CFLAGS)	\
-	$(PULSE_CFLAGS)	\
-	$(AM_CFLAGS)
+	$(MATE_CFLAGS) \
+	$(PULSE_CFLAGS) \
+	$(AM_CFLAGS) \
+	$(WARN_CFLAGS)
 
 libsound_la_LDFLAGS = \
 	$(MSD_PLUGIN_LDFLAGS)
diff --git a/plugins/typing-break/Makefile.am b/plugins/typing-break/Makefile.am
index a903b43..ee5602a 100644
--- a/plugins/typing-break/Makefile.am
+++ b/plugins/typing-break/Makefile.am
@@ -1,7 +1,7 @@
 NULL =
 
-plugin_LTLIBRARIES = \
-	libtyping-break.la		\
+plugin_LTLIBRARIES =		\
+	libtyping-break.la	\
 	$(NULL)
 
 libtyping_break_la_SOURCES = 		\
@@ -16,15 +16,17 @@ libtyping_break_la_CPPFLAGS = \
 	-DMATE_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
 
-libtyping_break_la_CFLAGS = \
+libtyping_break_la_CFLAGS =		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
-	$(AM_CFLAGS)
+	$(AM_CFLAGS)			\
+	$(WARN_CFLAGS)			\
+	$(NULL)
 
-libtyping_break_la_LDFLAGS = 		\
+libtyping_break_la_LDFLAGS =	\
 	$(MSD_PLUGIN_LDFLAGS)	\
 	$(NULL)
 
-libtyping_break_la_LIBADD  = 		\
+libtyping_break_la_LIBADD =	\
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(NULL)
 
diff --git a/plugins/xrandr/Makefile.am b/plugins/xrandr/Makefile.am
index d92f25f..3659b21 100644
--- a/plugins/xrandr/Makefile.am
+++ b/plugins/xrandr/Makefile.am
@@ -1,7 +1,7 @@
 icondir = $(datadir)/icons/hicolor
 context = apps
 
-BUILT_SOURCES =				\
+BUILT_SOURCES =			\
 	msd-xrandr-manager-glue.h
 
 ICON_FILES = 			\
@@ -68,7 +68,8 @@ libxrandr_la_CFLAGS =			\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(LIBNOTIFY_CFLAGS)		\
 	$(MATE_DESKTOP_CFLAGS)		\
-	$(AM_CFLAGS)
+	$(AM_CFLAGS)			\
+	$(WARN_CFLAGS)
 
 libxrandr_la_LDFLAGS = 			\
 	$(MSD_PLUGIN_LDFLAGS)
diff --git a/plugins/xrdb/Makefile.am b/plugins/xrdb/Makefile.am
index 88745ae..4e5ca26 100644
--- a/plugins/xrdb/Makefile.am
+++ b/plugins/xrdb/Makefile.am
@@ -4,8 +4,8 @@ SUBDIRS =		\
 	data		\
 	$(NULL)
 
-plugin_LTLIBRARIES = \
-	libxrdb.la		\
+plugin_LTLIBRARIES =	\
+	libxrdb.la	\
 	$(NULL)
 
 libxrdb_la_SOURCES = 		\
@@ -21,9 +21,11 @@ libxrdb_la_CPPFLAGS = \
 	-DMATE_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
 
-libxrdb_la_CFLAGS = \
+libxrdb_la_CFLAGS =			\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
-	$(AM_CFLAGS)
+	$(AM_CFLAGS)			\
+	$(WARN_CFLAGS)			\
+	$(NULL)
 
 libxrdb_la_LDFLAGS = 		\
 	$(MSD_PLUGIN_LDFLAGS)	\
diff --git a/plugins/xsettings/Makefile.am b/plugins/xsettings/Makefile.am
index 6f8e00d..493c59b 100644
--- a/plugins/xsettings/Makefile.am
+++ b/plugins/xsettings/Makefile.am
@@ -1,10 +1,10 @@
 NULL =
 
-plugin_LTLIBRARIES = \
+plugin_LTLIBRARIES =		\
 	libxsettings.la		\
 	$(NULL)
 
-libxsettings_la_SOURCES = 	\
+libxsettings_la_SOURCES =	\
 	msd-xsettings-plugin.h	\
 	msd-xsettings-plugin.c	\
 	msd-xsettings-manager.h	\
@@ -15,8 +15,8 @@ libxsettings_la_SOURCES = 	\
 	xsettings-manager.c	\
 	fontconfig-monitor.h	\
 	fontconfig-monitor.c	\
-	wm-common.h	\
-	wm-common.c	\
+	wm-common.h		\
+	wm-common.c		\
 	$(NULL)
 
 libxsettings_la_CPPFLAGS = \
@@ -24,10 +24,12 @@ libxsettings_la_CPPFLAGS = \
 	-DMATE_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
 
-libxsettings_la_CFLAGS = \
+libxsettings_la_CFLAGS =		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(FONTCONFIG_CFLAGS)		\
-	$(AM_CFLAGS)
+	$(AM_CFLAGS)			\
+	$(WARN_CFLAGS)			\
+	$(NULL)
 
 libxsettings_la_LDFLAGS = 	\
 	$(MSD_PLUGIN_LDFLAGS)	\
@@ -39,7 +41,7 @@ libxsettings_la_LIBADD  = 	\
 	$(NULL)
 
 plugin_in_files = 		\
-	xsettings.mate-settings-plugin.desktop.in	\
+	xsettings.mate-settings-plugin.desktop.in \
 	$(NULL)
 
 plugin_DATA = $(plugin_in_files:.mate-settings-plugin.desktop.in=.mate-settings-plugin)