diff options
| author | Stepan Kasal | 2007-05-15 20:46:00 +0200 |
|---|---|---|
| committer | Karel Zak | 2007-05-16 11:43:29 +0200 |
| commit | 8c453685a69aad1221420e710cf4d5c201ffce17 (patch) | |
| tree | 599842e67a28f36a4c5867a96f6be119e681dc3f | |
| parent | build-sys: update po/POTFILES.in (diff) | |
| download | kernel-qcow2-util-linux-8c453685a69aad1221420e710cf4d5c201ffce17.tar.gz kernel-qcow2-util-linux-8c453685a69aad1221420e710cf4d5c201ffce17.tar.xz kernel-qcow2-util-linux-8c453685a69aad1221420e710cf4d5c201ffce17.zip | |
build-sys: do not kick off AM_CFLAGS by SUID_CFLAGS
SUID_CFLAGS are not meant to override the makefile-wide AM_CFLAGS.
(We do not use AM_CFLAGS currently, but we will.)
Signed-off-by: Stepan Kasal <skasal@redhat.com>
| -rw-r--r-- | login-utils/Makefile.am | 6 | ||||
| -rw-r--r-- | misc-utils/Makefile.am | 2 | ||||
| -rw-r--r-- | mount/Makefile.am | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/login-utils/Makefile.am b/login-utils/Makefile.am index 74aa29ea3..648cf17c4 100644 --- a/login-utils/Makefile.am +++ b/login-utils/Makefile.am @@ -51,9 +51,9 @@ login_LDADD = ../lib/libsetproctitle.a newgrp_LDADD = vipw_LDADD = -chfn_CFLAGS = $(SUID_CFLAGS) -chsh_CFLAGS = $(SUID_CFLAGS) -newgrp_CFLAGS = $(SUID_CFLAGS) +chfn_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) +chsh_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) +newgrp_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) if NEED_LIBCRYPT chfn_LDADD += -lcrypt diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am index 461344d16..7775bea73 100644 --- a/misc-utils/Makefile.am +++ b/misc-utils/Makefile.am @@ -64,7 +64,7 @@ if BUILD_WRITE usrbinexec_PROGRAMS += write man_MANS += write.1 -write_CFLAGS = $(SUID_CFLAGS) +write_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) if USE_TTY_GROUP install-exec-hook:: diff --git a/mount/Makefile.am b/mount/Makefile.am index 95db3ddb2..e52ec6fa9 100644 --- a/mount/Makefile.am +++ b/mount/Makefile.am @@ -19,7 +19,7 @@ mount_SOURCES = mount.c fstab.c sundries.c xmalloc.c realpath.c mount_mntent.c \ $(MNTHDRS) mount_LDADD = $(top_srcdir)/lib/libenv.a $(top_srcdir)/lib/libsetproctitle.a -mount_CFLAGS = $(SUID_CFLAGS) +mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) umount_SOURCES = umount.c fstab.c sundries.c xmalloc.c realpath.c mount_mntent.c \ getusername.c get_label_uuid.c mount_by_label.c mount_blkid.c \ @@ -27,7 +27,7 @@ umount_SOURCES = umount.c fstab.c sundries.c xmalloc.c realpath.c mount_mntent.c $(MNTHDRS) umount_LDADD = $(top_srcdir)/lib/libenv.a -umount_CFLAGS = $(SUID_CFLAGS) +umount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) swapon_SOURCES = swapon.c xmalloc.c \ get_label_uuid.c mount_by_label.c mount_blkid.c \ |