From b0b54cc582ffc4f4faac2d4ad5cf9028a9eea013 Mon Sep 17 00:00:00 2001
From: Ruediger Meier
Date: Mon, 22 Feb 2016 20:20:14 +0100
Subject: build-sys: always add AM_CFLAGS

We were missing our nice compliler warnings for many programs
and libs. See next commits how many trivial and non-trival
warnings have to be fixed.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 disk-utils/Makemodule.am           |  4 ++--
 lib/Makemodule.am                  | 28 ++++++++++++++--------------
 libblkid/samples/Makemodule.am     |  8 ++++----
 libblkid/src/Makemodule.am         |  1 +
 libfdisk/src/Makemodule.am         |  1 +
 libmount/src/Makemodule.am         |  1 +
 libsmartcols/samples/Makemodule.am |  8 ++++----
 libsmartcols/src/Makemodule.am     |  1 +
 libuuid/src/Makemodule.am          |  3 ++-
 login-utils/Makemodule.am          |  2 +-
 misc-utils/Makemodule.am           |  3 ++-
 text-utils/Makemodule.am           |  2 +-
 12 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am
index a2e1994c6..bbdef1d42 100644
--- a/disk-utils/Makemodule.am
+++ b/disk-utils/Makemodule.am
@@ -17,7 +17,7 @@ mkfs_minix_LDADD = $(LDADD) libcommon.la
 check_PROGRAMS += test_mkfs_minix
 test_mkfs_minix_SOURCES = $(mkfs_minix_SOURCES)
 test_mkfs_minix_LDADD = $(mkfs_minix_LDADD)
-test_mkfs_minix_CFLAGS = -DTEST_SCRIPT
+test_mkfs_minix_CFLAGS = $(AM_CFLAGS) -DTEST_SCRIPT
 endif
 
 
@@ -255,7 +255,7 @@ resizepart_LDADD = $(LDADD) libcommon.la
 partx_SOURCES = \
 	disk-utils/partx.c \
 	disk-utils/partx.h
-partx_CFLAGS = -I$(ul_libblkid_incdir) -I$(ul_libsmartcols_incdir)
+partx_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -I$(ul_libsmartcols_incdir)
 partx_LDADD = $(LDADD) libblkid.la libcommon.la libsmartcols.la
 
 endif # BUILD_PARTX
diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index 152190b78..94e845349 100644
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -77,51 +77,51 @@ check_PROGRAMS += \
 endif
 
 test_ttyutils_SOURCES = lib/ttyutils.c
-test_ttyutils_CFLAGS = -DTEST_PROGRAM
+test_ttyutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
 test_ttyutils_LDADD = $(LDADD) libcommon.la
 
 test_blkdev_SOURCES = lib/blkdev.c
-test_blkdev_CFLAGS = -DTEST_PROGRAM_BLKDEV
+test_blkdev_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_BLKDEV
 test_blkdev_LDADD = $(LDADD) libcommon.la
 
 test_ismounted_SOURCES = lib/ismounted.c
-test_ismounted_CFLAGS = -DTEST_PROGRAM
+test_ismounted_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
 test_ismounted_LDADD = $(LDADD) libcommon.la
 
 test_mangle_SOURCES = lib/mangle.c
-test_mangle_CFLAGS = -DTEST_PROGRAM
+test_mangle_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
 
 test_at_SOURCES = lib/at.c
-test_at_CFLAGS = -DTEST_PROGRAM_AT
+test_at_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_AT
 
 test_strutils_SOURCES = lib/strutils.c
-test_strutils_CFLAGS = -DTEST_PROGRAM
+test_strutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
 
 test_colors_SOURCES = lib/colors.c lib/color-names.c
-test_colors_CFLAGS = -DTEST_PROGRAM $(TINFO_CFLAGS)
+test_colors_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM $(TINFO_CFLAGS)
 test_colors_LDADD = $(LDADD) $(TINFO_LIBS)
 
 test_randutils_SOURCES = lib/randutils.c
-test_randutils_CFLAGS = -DTEST_PROGRAM
+test_randutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
 
 test_procutils_SOURCES = lib/procutils.c lib/at.c
-test_procutils_CFLAGS = -DTEST_PROGRAM
+test_procutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
 
 if LINUX
 test_cpuset_SOURCES = lib/cpuset.c
-test_cpuset_CFLAGS = -DTEST_PROGRAM
+test_cpuset_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
 
 test_sysfs_SOURCES = lib/sysfs.c
-test_sysfs_CFLAGS = -DTEST_PROGRAM_SYSFS
+test_sysfs_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_SYSFS
 test_sysfs_LDADD = $(LDADD) libcommon.la
 
 test_pager_SOURCES = lib/pager.c
-test_pager_CFLAGS = -DTEST_PROGRAM
+test_pager_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
 endif
 
 test_fileutils_SOURCES = lib/fileutils.c
-test_fileutils_CFLAGS = -DTEST_PROGRAM
+test_fileutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
 
 test_canonicalize_SOURCES = lib/canonicalize.c
-test_canonicalize_CFLAGS = -DTEST_PROGRAM_CANONICALIZE
+test_canonicalize_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_CANONICALIZE
 
diff --git a/libblkid/samples/Makemodule.am b/libblkid/samples/Makemodule.am
index e92049f04..e14d13fec 100644
--- a/libblkid/samples/Makemodule.am
+++ b/libblkid/samples/Makemodule.am
@@ -7,16 +7,16 @@ check_PROGRAMS += \
 
 sample_mkfs_SOURCES = libblkid/samples/mkfs.c
 sample_mkfs_LDADD = $(LDADD) libblkid.la
-sample_mkfs_CFLAGS = -I$(ul_libblkid_incdir)
+sample_mkfs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
 
 sample_partitions_SOURCES = libblkid/samples/partitions.c
 sample_partitions_LDADD = $(LDADD) libblkid.la
-sample_partitions_CFLAGS = -I$(ul_libblkid_incdir)
+sample_partitions_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
 
 sample_superblocks_SOURCES = libblkid/samples/superblocks.c
 sample_superblocks_LDADD = $(LDADD) libblkid.la
-sample_superblocks_CFLAGS = -I$(ul_libblkid_incdir)
+sample_superblocks_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
 
 sample_topology_SOURCES = libblkid/samples/topology.c
 sample_topology_LDADD = $(LDADD) libblkid.la
-sample_topology_CFLAGS = -I$(ul_libblkid_incdir)
+sample_topology_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am
index 5018de492..7d992f5c4 100644
--- a/libblkid/src/Makemodule.am
+++ b/libblkid/src/Makemodule.am
@@ -117,6 +117,7 @@ libblkid_la_DEPENDENCIES = \
 	libblkid/src/blkid.h.in
 
 libblkid_la_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(SOLIB_CFLAGS) \
 	-I$(ul_libblkid_incdir) \
 	-I$(top_srcdir)/libblkid/src
diff --git a/libfdisk/src/Makemodule.am b/libfdisk/src/Makemodule.am
index f8a5cb19c..1f607b58d 100644
--- a/libfdisk/src/Makemodule.am
+++ b/libfdisk/src/Makemodule.am
@@ -35,6 +35,7 @@ nodist_libfdisk_la_SOURCES = libfdisk/src/fdiskP.h
 libfdisk_la_LIBADD = libcommon.la libuuid.la
 
 libfdisk_la_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(SOLIB_CFLAGS) \
 	-I$(ul_libuuid_incdir) \
 	-I$(ul_libfdisk_incdir) \
diff --git a/libmount/src/Makemodule.am b/libmount/src/Makemodule.am
index 9ff15823a..460a1fc83 100644
--- a/libmount/src/Makemodule.am
+++ b/libmount/src/Makemodule.am
@@ -48,6 +48,7 @@ libmount_la_LIBADD = \
 	$(REALTIME_LIBS)
 
 libmount_la_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(SOLIB_CFLAGS) \
 	-I$(ul_libblkid_incdir) \
 	-I$(ul_libmount_incdir) \
diff --git a/libsmartcols/samples/Makemodule.am b/libsmartcols/samples/Makemodule.am
index 0a351e3d0..50c680c43 100644
--- a/libsmartcols/samples/Makemodule.am
+++ b/libsmartcols/samples/Makemodule.am
@@ -7,17 +7,17 @@ check_PROGRAMS += \
 
 sample_scols_tree_SOURCES = libsmartcols/samples/tree.c
 sample_scols_tree_LDADD = $(LDADD) libsmartcols.la libcommon.la
-sample_scols_tree_CFLAGS = -I$(ul_libsmartcols_incdir)
+sample_scols_tree_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
 
 sample_scols_title_SOURCES = libsmartcols/samples/title.c
 sample_scols_title_LDADD = $(LDADD) libsmartcols.la
-sample_scols_title_CFLAGS = -I$(ul_libsmartcols_incdir)
+sample_scols_title_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
 
 sample_scols_wrap_SOURCES = libsmartcols/samples/wrap.c
 sample_scols_wrap_LDADD = $(LDADD) libsmartcols.la
-sample_scols_wrap_CFLAGS = -I$(ul_libsmartcols_incdir)
+sample_scols_wrap_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
 
 sample_scols_continuous_SOURCES = libsmartcols/samples/continuous.c
 sample_scols_continuous_LDADD = $(LDADD) libsmartcols.la libcommon.la
-sample_scols_continuous_CFLAGS = -I$(ul_libsmartcols_incdir)
+sample_scols_continuous_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
 
diff --git a/libsmartcols/src/Makemodule.am b/libsmartcols/src/Makemodule.am
index 257d46dcb..248faa9e0 100644
--- a/libsmartcols/src/Makemodule.am
+++ b/libsmartcols/src/Makemodule.am
@@ -25,6 +25,7 @@ nodist_libsmartcols_la_SOURCES = libsmartcols/src/smartcolsP.h
 libsmartcols_la_LIBADD = libcommon.la
 
 libsmartcols_la_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(SOLIB_CFLAGS) \
 	-I$(ul_libsmartcols_incdir) \
 	-I$(top_srcdir)/libsmartcols/src
diff --git a/libuuid/src/Makemodule.am b/libuuid/src/Makemodule.am
index 0efa803c0..f2f66ba5c 100644
--- a/libuuid/src/Makemodule.am
+++ b/libuuid/src/Makemodule.am
@@ -2,7 +2,7 @@
 check_PROGRAMS += test_uuid_parser
 test_uuid_parser_SOURCES = libuuid/src/test_uuid.c
 test_uuid_parser_LDADD = $(LDADD) libuuid.la $(SOCKET_LIBS)
-test_uuid_parser_CFLAGS = -I$(ul_libuuid_incdir)
+test_uuid_parser_CFLAGS = $(AM_CFLAGS) -I$(ul_libuuid_incdir)
 
 # includes
 uuidincdir = $(includedir)/uuid
@@ -31,6 +31,7 @@ libuuid_la_DEPENDENCIES = libuuid/src/libuuid.sym
 libuuid_la_LIBADD       = $(SOCKET_LIBS)
 
 libuuid_la_CFLAGS = \
+	$(AM_CFLAGS) \
 	 $(SOLIB_CFLAGS) \
 	 -I$(ul_libuuid_incdir) \
 	 -Ilibuuid/src
diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am
index 8794c262c..502ecd503 100644
--- a/login-utils/Makemodule.am
+++ b/login-utils/Makemodule.am
@@ -31,7 +31,7 @@ endif
 
 check_PROGRAMS += test_consoles
 test_consoles_SOURCES = login-utils/sulogin-consoles.c
-test_consoles_CFLAGS = -DTEST_PROGRAM
+test_consoles_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
 test_consoles_LDADD = $(LDADD) libcommon.la
 endif # BUILD_SULOGIN
 
diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am
index 8e16b80a2..aa54919bd 100644
--- a/misc-utils/Makemodule.am
+++ b/misc-utils/Makemodule.am
@@ -20,9 +20,10 @@ usrbin_exec_PROGRAMS += logger
 dist_man_MANS += misc-utils/logger.1
 logger_SOURCES = misc-utils/logger.c lib/strutils.c lib/strv.c
 logger_LDADD = $(LDADD)
+logger_CFLAGS = $(AM_CFLAGS)
 if HAVE_SYSTEMD
 logger_LDADD += $(SYSTEMD_LIBS) $(SYSTEMD_DAEMON_LIBS) $(SYSTEMD_JOURNAL_LIBS)
-logger_CFLAGS = $(SYSTEMD_CFLAGS) $(SYSTEMD_DAEMON_CFLAGS) $(SYSTEMD_JOURNAL_CFLAGS)
+logger_CFLAGS += $(SYSTEMD_CFLAGS) $(SYSTEMD_DAEMON_CFLAGS) $(SYSTEMD_JOURNAL_CFLAGS)
 endif
 
 check_PROGRAMS += test_logger
diff --git a/text-utils/Makemodule.am b/text-utils/Makemodule.am
index 957c14370..91295bf98 100644
--- a/text-utils/Makemodule.am
+++ b/text-utils/Makemodule.am
@@ -97,7 +97,7 @@ endif
 
 check_PROGRAMS += test_more
 test_more_SOURCES = $(more_SOURCES)
-test_more_CFLAGS = -DTEST_PROGRAM
+test_more_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
 test_more_LDADD = $(more_LDADD)
 
 endif # BUILD_MORE
-- 
cgit v1.2.3-55-g7522