build-sys: move -D flags to *_CPPFLAGS

Preprocessor options belong to *_CPPFLAGS; add $(AM_CPPFLAGS) as we
want to amend it, not override.

Signed-off-by: Stepan Kasal <skasal@redhat.com>

diff --git a/getopt/Makefile.am b/getopt/Makefile.am
index 319e8bfa378c9fa26a5a0b92a45fd6446aa05108..daad3e47bf30f0ec8cc661f55a43a5db7a7b92a5 100644 (file)
--- a/getopt/Makefile.am
+++ b/getopt/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/config/include-Makefile.am
 
 usrbinexec_PROGRAMS = getopt
 
-getopt_CFLAGS = -DLIBCGETOPT=1
+getopt_CPPFLAGS = -DLIBCGETOPT=1 $(AM_CPPFLAGS)
 
 man_MANS = getopt.1
 

diff --git a/login-utils/Makefile.am b/login-utils/Makefile.am
index efdba27c0b76d3b8c98e20d99df7b7f837b0d49c..639db58c6fad1105c64965404d861c76a9be76d1 100644 (file)
--- a/login-utils/Makefile.am
+++ b/login-utils/Makefile.am
@@ -132,5 +132,5 @@ endif
 
 noinst_PROGRAMS = checktty_test
 checktty_test_SOURCES = checktty.c login.h
-checktty_test_CFLAGS = -DMAIN_TEST_CHECKTTY
+checktty_test_CPPFLAGS = -DMAIN_TEST_CHECKTTY $(AM_CPPFLAGS)
 

diff --git a/mount/Makefile.am b/mount/Makefile.am
index 90b35ed009a6737e000c1e4b67c42a1f9d2ce154..18a5c60ee1c374c359aa72de4f96e8fcabf29a5a 100644 (file)
--- a/mount/Makefile.am
+++ b/mount/Makefile.am
@@ -29,7 +29,7 @@ swapon_SOURCES = swapon.c xmalloc.c \
        swap_constants.h realpath.c
 
 losetup_SOURCES = lomount.c loop.h lomount.h
-losetup_CFLAGS = -DMAIN
+losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS)
 
 mount_LDADD =
 umount_LDADD =
@@ -52,7 +52,7 @@ endif
 
 noinst_PROGRAMS = mtab_lock_test
 mtab_lock_test_SOURCES = fstab.c sundries.c xmalloc.c $(MNTHDRS)
-mtab_lock_test_CFLAGS = -DMAIN_TEST_MTABLOCK
+mtab_lock_test_CPPFLAGS = -DMAIN_TEST_MTABLOCK $(AM_CPPFLAGS)
 
 swapon.c: swapargs.h