summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStepan Kasal <skasal@redhat.com>2007-05-15 20:46:15 +0200
committerKarel Zak <kzak@redhat.com>2007-05-16 11:43:30 +0200
commit1f317686715f0e1cad9404b5c5c89f1ecac5d915 (patch)
tree710656f9d6019d304396e08b8d75b9c5c335fbc2
parent271d98e05d73269339d6dadac13bb17c0101229e (diff)
downloadutil-linux-old-1f317686715f0e1cad9404b5c5c89f1ecac5d915.tar.gz
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>
-rw-r--r--getopt/Makefile.am2
-rw-r--r--login-utils/Makefile.am2
-rw-r--r--mount/Makefile.am4
3 files changed, 4 insertions, 4 deletions
diff --git a/getopt/Makefile.am b/getopt/Makefile.am
index 319e8bfa..daad3e47 100644
--- 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 efdba27c..639db58c 100644
--- 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 90b35ed0..18a5c60e 100644
--- 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