From a785186446de785d1b8b5e1b59973d6e0d7ecd17 Mon Sep 17 00:00:00 2001
From: Michal Privoznik <mprivozn@redhat.com>
Date: Thu, 16 Nov 2017 14:35:12 +0100
Subject: [PATCH] tools: Enable warnings for more binaries/libs

Because WARN_CFLAGS and COVERAGE_CFLAGS are not set globally, we
rely on each binary built to include WARN_CFLAGS/COVERAGE_CFLAGS.
But it is easy to forget those - e.g. libvirt_shell.la. However,
don't enable WARN_FLAGS (i.e. don't include AM_CFLAGS) for
wireshark plugin - parts of that code are generated and trigger
some warnings.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
---
 tools/Makefile.am | 40 ++++++++++++++--------------------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/tools/Makefile.am b/tools/Makefile.am
index ac1c97115f..fbc73a7c33 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -25,6 +25,13 @@ INCLUDES = \
 
 WARN_CFLAGS += $(STRICT_FRAME_LIMIT_CFLAGS)
 
+AM_CFLAGS = \
+	$(WARN_CFLAGS) \
+	$(COVERAGE_CFLAGS) \
+	$(PIE_CFLAGS) \
+	$(LIBXML_CFLAGS) \
+	$(NULL)
+
 AM_LDFLAGS = \
 	$(RELRO_LDFLAGS) \
 	$(NO_INDIRECT_LDFLAGS) \
@@ -122,9 +129,7 @@ virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile
 noinst_LTLIBRARIES = libvirt_shell.la
 libvirt_shell_la_CFLAGS = \
 		$(AM_CFLAGS) \
-		$(PIE_CFLAGS) \
 		$(READLINE_CFLAGS) \
-		$(LIBXML_CFLAGS) \
 		$(NULL)
 libvirt_shell_la_LDFLAGS = \
 		$(AM_LDFLAGS) \
@@ -182,10 +187,7 @@ virt_host_validate_LDADD = \
 		$(NULL)
 
 virt_host_validate_CFLAGS = \
-		$(LIBXML_CFLAGS) \
-		$(WARN_CFLAGS) \
-		$(PIE_CFLAGS) \
-		$(COVERAGE_CFLAGS) \
+		$(AM_CFLAGS) \
 		$(NULL)
 
 # Since virt-login-shell will be setuid, we must do everything
@@ -208,10 +210,8 @@ virt_login_shell_LDADD = \
 
 virt_login_shell_CFLAGS = \
 		-DLIBVIRT_SETUID_RPC_CLIENT \
-		$(LIBXML_CFLAGS) \
-		$(WARN_CFLAGS) \
-		$(PIE_CFLAGS) \
-		$(COVERAGE_CFLAGS)
+		$(AM_CFLAGS) \
+		$(NULL)
 
 virsh_SOURCES = \
 		virsh.c virsh.h \
@@ -241,10 +241,7 @@ virsh_LDADD = \
 		../src/libvirt-qemu.la \
 		libvirt_shell.la
 virsh_CFLAGS = \
-		$(WARN_CFLAGS) \
-		$(PIE_CFLAGS) \
-		$(COVERAGE_CFLAGS) \
-		$(LIBXML_CFLAGS) \
+		$(AM_CFLAGS) \
 		$(READLINE_CFLAGS)
 
 virt_admin_SOURCES = \
@@ -263,10 +260,7 @@ virt_admin_LDADD = \
 		$(LIBXML_LIBS) \
 		$(NULL)
 virt_admin_CFLAGS = \
-		$(WARN_CFLAGS) \
-		$(PIE_CFLAGS) \
-		$(COVERAGE_CFLAGS) \
-		$(LIBXML_CFLAGS) \
+		$(AM_CFLAGS) \
 		$(READLINE_CFLAGS)
 BUILT_SOURCES =
 
@@ -502,10 +496,7 @@ nss_libnss_libvirt_impl_la_SOURCES = \
 nss_libnss_libvirt_impl_la_CFLAGS = \
 	-DLIBVIRT_NSS \
 	$(AM_CFLAGS) \
-	$(WARN_CFLAGS) \
-	$(PIE_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	$(LIBXML_CFLAGS)
+	$(NULL)
 
 nss_libnss_libvirt_impl_la_LIBADD = \
 	../gnulib/lib/libgnu.la \
@@ -532,10 +523,7 @@ nss_libnss_libvirt_guest_impl_la_CFLAGS = \
 	-DLIBVIRT_NSS \
 	-DLIBVIRT_NSS_GUEST \
 	$(AM_CFLAGS) \
-	$(WARN_CFLAGS) \
-	$(PIE_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	$(LIBXML_CFLAGS)
+	$(NULL)
 
 nss_libnss_libvirt_guest_impl_la_LIBADD = \
 	../gnulib/lib/libgnu.la \
-- 
GitLab