build-sys: cleanup AM_CFLAGS usage

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am
index 08559c96980e5f570927330ff823abb137c9fdac..ed0a6e4b8a803c6bfe6d378b8c8d010bacacb658 100644 (file)
--- a/disk-utils/Makefile.am
+++ b/disk-utils/Makefile.am
@@ -15,7 +15,7 @@ mkfs_bfs_SOURCES = mkfs.bfs.c $(utils_common)
 
 mkswap_SOURCES = mkswap.c $(utils_common) ../lib/wholedisk.c
 mkswap_LDADD =
-mkswap_CFLAGS =
+mkswap_CFLAGS = $(AM_CFLAGS)
 
 usrbin_exec_PROGRAMS = isosize
 usrsbin_exec_PROGRAMS =

diff --git a/fsck/Makefile.am b/fsck/Makefile.am
index 1c88fde152dd889d33e172b693c0367a741efe05..203d36b07cd00f13e70ff7a00b6677a504e7dc91 100644 (file)
--- a/fsck/Makefile.am
+++ b/fsck/Makefile.am
@@ -6,7 +6,7 @@ dist_man_MANS = fsck.8
 fsck_SOURCES = base_device.c fsck.c fsck.h ../lib/ismounted.c \
               ../lib/fsprobe.c ../lib/canonicalize.c
 fsck_LDADD =
-fsck_CFLAGS =
+fsck_CFLAGS = $(AM_CFLAGS)
 
 if BUILD_LIBBLKID
 fsck_LDADD += $(ul_libblkid_la)

diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am
index adc6762f2d5f714e00fc6e89c0a675ab342470c5..6176ab7d949727517570ee57cff34cee2819f6a5 100644 (file)
--- a/misc-utils/Makefile.am
+++ b/misc-utils/Makefile.am
@@ -23,12 +23,12 @@ if BUILD_LIBUUID
 usrbin_exec_PROGRAMS += uuidgen
 dist_man_MANS += uuidgen.1
 uuidgen_LDADD = $(ul_libuuid_la)
-uuidgen_CFLAGS = -I$(ul_libuuid_srcdir)
+uuidgen_CFLAGS = $(AM_CFLAGS) -I$(ul_libuuid_srcdir)
 if BUILD_UUIDD
 usrsbin_exec_PROGRAMS += uuidd
 dist_man_MANS += uuidd.8
 uuidd_LDADD = $(ul_libuuid_la)
-uuidd_CFLAGS = -I$(ul_libuuid_srcdir)
+uuidd_CFLAGS = $(AM_CFLAGS) -I$(ul_libuuid_srcdir)
 endif
 endif
 
@@ -37,17 +37,17 @@ sbin_PROGRAMS += blkid findfs wipefs
 dist_man_MANS += blkid.8 findfs.8 wipefs.8
 blkid_SOURCES = blkid.c $(top_srcdir)/lib/ismounted.c
 blkid_LDADD = $(ul_libblkid_la)
-blkid_CFLAGS = -I$(ul_libblkid_incdir)
+blkid_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
 findfs_LDADD = $(ul_libblkid_la)
-findfs_CFLAGS = -I$(ul_libblkid_incdir)
+findfs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
 wipefs_LDADD = $(ul_libblkid_la)
-wipefs_CFLAGS = -I$(ul_libblkid_incdir)
+wipefs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
 if HAVE_STATIC_BLKID
 sbin_PROGRAMS += blkid.static
 blkid_static_SOURCES = $(blkid_SOURCES)
 blkid_static_LDFLAGS = -all-static
 blkid_static_LDADD = $(ul_libblkid_la)
-blkid_static_CFLAGS = -I$(ul_libblkid_incdir)
+blkid_static_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
 endif
 endif
 

diff --git a/mount/Makefile.am b/mount/Makefile.am
index ca44d00721040bd119a144a2072a23027399300c..c5f58aa3f3850173082378384f1ac199c228c68e 100644 (file)
--- a/mount/Makefile.am
+++ b/mount/Makefile.am
@@ -23,16 +23,16 @@ srcs_mount = fstab.c mount_mntent.c getusername.c lomount.c devname.c devname.h
 #    between CFLAGS and CPPFLAGS, we follow this behaviour and use CFLAGS only.
 ldadd_common =
 ldadd_static =
-cflags_common =
+cflags_common = $(AM_CFLAGS)
 ldflags_static = -all-static
 
 mount_SOURCES = mount.c $(srcs_mount) ../lib/setproctitle.c
-mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) $(cflags_common)
+mount_CFLAGS = $(SUID_CFLAGS) $(cflags_common)
 mount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
 mount_LDADD = $(ldadd_common)
 
 umount_SOURCES = umount.c $(srcs_mount)
-umount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) $(cflags_common)
+umount_CFLAGS = $(SUID_CFLAGS) $(cflags_common)
 umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
 umount_LDADD = $(ldadd_common)