From eff1d3b138c8a6990fa388e3cc2eb9a9760abf14 Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Thu, 26 Sep 2019 18:05:13 +0200
Subject: Use WARN_CFLAGS which are only set with -enable-compiler-warnings

MATE_COMPILE_WARNINGS is present in configure.ac but WARN_CFLAGS
variable is not used. git grep WARN_CFLAGS

It removes -enable-extra-warn=yes, since it is recommended to use
-enable-compile-warnings=maximum.

It sets -enable-compiler-warnings=yes, the default value for all
MATE packager for now.

It prints WARN_CFLAGS in summary table.
---
 src/Makefile.am | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index e17e2dd..aed9cc9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -91,7 +91,7 @@ mate_power_backlight_helper_LDADD =			\
 	-lm
 
 mate_power_backlight_helper_CFLAGS =			\
-	$(WARNINGFLAGS)					\
+	$(WARN_CFLAGS)					\
 	$(NULL)
 
 mate-power-statistics-resources.h mate-power-statistics-resources.c: $(srcdir)/../data/org.mate.power-manager.statistics.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir)/../data $(srcdir)/../data/org.mate.power-manager.statistics.gresource.xml)
@@ -120,7 +120,7 @@ mate_power_statistics_LDADD =				\
 	-lm
 
 mate_power_statistics_CFLAGS =				\
-	$(WARNINGFLAGS)					\
+	$(WARN_CFLAGS)					\
 	$(NULL)
 
 mate-power-preferences-resources.h mate-power-preferences-resources.c: $(srcdir)/../data/org.mate.power-manager.preferences.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir)/../data $(srcdir)/../data/org.mate.power-manager.preferences.gresource.xml)
@@ -147,8 +147,8 @@ mate_power_preferences_LDADD =				\
 	$(UPOWER_LIBS)					\
 	-lm
 
-mate_power_preferences_CFLAGS =			\
-	$(WARNINGFLAGS)					\
+mate_power_preferences_CFLAGS =				\
+	$(WARN_CFLAGS)					\
 	$(NULL)
 
 mate_power_manager_SOURCES =				\
@@ -166,8 +166,8 @@ mate_power_manager_SOURCES =				\
 	gpm-control.c					\
 	gpm-button.h					\
 	gpm-button.c					\
-	gpm-kbd-backlight.h 			\
-	gpm-kbd-backlight.c 			\
+	gpm-kbd-backlight.h				\
+	gpm-kbd-backlight.c				\
 	gpm-main.c					\
 	gpm-manager.h					\
 	gpm-manager.c					\
@@ -191,12 +191,12 @@ mate_power_manager_SOURCES =				\
 mate_power_manager_LDADD =				\
 	libgpmshared.a					\
 	$(GLIB_LIBS)					\
-	$(X11_LIBS)				\
+	$(X11_LIBS)					\
 	$(GSTREAMER_LIBS)				\
 	$(CAIRO_LIBS)					\
 	$(KEYRING_LIBS)					\
 	$(DBUS_LIBS)					\
-	$(X11_LIBS)						\
+	$(X11_LIBS)					\
 	$(CANBERRA_LIBS)				\
 	$(LIBNOTIFY_LIBS)				\
 	$(GPM_EXTRA_LIBS)				\
@@ -204,7 +204,7 @@ mate_power_manager_LDADD =				\
 	-lm
 
 mate_power_manager_CFLAGS =				\
-	$(WARNINGFLAGS)					\
+	$(WARN_CFLAGS)					\
 	$(NULL)
 
 if HAVE_TESTS
@@ -262,18 +262,22 @@ mate_power_self_test_LDADD =				\
 	$(GSTREAMER_LIBS)				\
 	$(UPOWER_LIBS)					\
 	$(DBUS_LIBS)					\
-	$(X11_LIBS)						\
+	$(X11_LIBS)					\
 	$(LIBNOTIFY_LIBS)				\
 	$(GPM_EXTRA_LIBS)				\
 	-lm
 
-mate_power_self_test_CFLAGS = -DEGG_TEST $(AM_CFLAGS) $(WARNINGFLAGS)
+mate_power_self_test_CFLAGS = 				\
+	-DEGG_TEST					\
+	$(AM_CFLAGS)					\
+	$(WARN_CFLAGS)					\
+	$(NULL)
 endif
 
 BUILT_SOURCES = 					\
-	org.mate.PowerManager.h			\
+	org.mate.PowerManager.h				\
 	org.mate.PowerManager.Backlight.h		\
-	org.mate.PowerManager.KbdBacklight.h \
+	org.mate.PowerManager.KbdBacklight.h		\
 	gpm-marshal.c					\
 	gpm-marshal.h					\
 	$(NULL)
@@ -301,7 +305,7 @@ org.mate.PowerManager.Backlight.h: org.mate.PowerManager.Backlight.xml
 
 org.mate.PowerManager.KbdBacklight.h: org.mate.PowerManager.KbdBacklight.xml
 	$(LIBTOOL) --mode=execute dbus-binding-tool	\
-		--prefix=gpm_kbd_backlight			\
+		--prefix=gpm_kbd_backlight		\
 		--mode=glib-server			\
 		--output=org.mate.PowerManager.KbdBacklight.h	\
 		$(srcdir)/org.mate.PowerManager.KbdBacklight.xml
-- 
cgit v1.2.1