diff options
| author | Karel Zak <kzak@redhat.com> | 2009-11-09 16:45:50 +0100 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2009-11-09 16:45:50 +0100 |
| commit | bf12cd21d19df347065f0fcd63dff4f6966ecee1 (patch) | |
| tree | 8bdebb4cb5bab68b8f5774a1185086399ce2a281 | |
| parent | 0f6f03e628346cf3b90e13f6e6615d68b51be086 (diff) | |
| download | util-linux-old-bf12cd21d19df347065f0fcd63dff4f6966ecee1.tar.gz | |
build-sys: cleanup AM_CFLAGS usage
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | disk-utils/Makefile.am | 2 | ||||
| -rw-r--r-- | fsck/Makefile.am | 2 | ||||
| -rw-r--r-- | misc-utils/Makefile.am | 12 | ||||
| -rw-r--r-- | mount/Makefile.am | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am index 08559c96..ed0a6e4b 100644 --- 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 1c88fde1..203d36b0 100644 --- 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 adc6762f..6176ab7d 100644 --- 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 ca44d007..c5f58aa3 100644 --- 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) |