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>

diff --git a/login-utils/Makefile.am b/login-utils/Makefile.am
index 74aa29ea371a066792b5ee18f2a68a6eebc3a047..648cf17c4f27ce5e11a1a8ab4e31fbcdb4f5b2ea 100644 (file)
--- 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 461344d1659540d1190b8ab83f2d2c5acdf34343..7775bea73c0e34475d31df06b9d124a245f97fb2 100644 (file)
--- 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 95db3ddb2512e858d474a7f5a21d463ad6e65d8b..e52ec6fa9282b36d7aa92691a36ac913e46ed9f2 100644 (file)
--- 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 \