summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>1997-10-25 10:10:19 +0000
committerlukem <lukem@NetBSD.org>1997-10-25 10:10:19 +0000
commitda49bfcda78283800f0da0a8a17f43a31275a581 (patch)
tree168aa071111be342f41bc63dcd81e9ae7aab750c /gnu
parentc4c746f8314b0f4716823e4ee1d2ad569c394127 (diff)
use CPPFLAGS instead of CFLAGS
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/Makefile.inc2
-rw-r--r--gnu/usr.bin/bc/Makefile4
-rw-r--r--gnu/usr.bin/cpio/Makefile4
-rw-r--r--gnu/usr.bin/dc/Makefile4
-rw-r--r--gnu/usr.bin/diff/Makefile4
-rw-r--r--gnu/usr.bin/diff3/Makefile4
-rw-r--r--gnu/usr.bin/gas/Makefile6
-rw-r--r--gnu/usr.bin/gas/config/Makefile.i3864
-rw-r--r--gnu/usr.bin/gas/config/Makefile.icm32164
-rw-r--r--gnu/usr.bin/gas/config/Makefile.m68k4
-rw-r--r--gnu/usr.bin/gas/config/Makefile.ns32k4
-rw-r--r--gnu/usr.bin/gas/config/Makefile.powerpc4
-rw-r--r--gnu/usr.bin/gas/config/Makefile.sparc4
-rw-r--r--gnu/usr.bin/gas/config/Makefile.vax2
-rw-r--r--gnu/usr.bin/gawk/Makefile4
-rw-r--r--gnu/usr.bin/gcc/Makefile.cc14
-rw-r--r--gnu/usr.bin/gcc/cc/Makefile4
-rw-r--r--gnu/usr.bin/gcc/common/Makefile4
-rw-r--r--gnu/usr.bin/gcc/cpp/Makefile4
-rw-r--r--gnu/usr.bin/gcc/g++/Makefile4
-rw-r--r--gnu/usr.bin/gcc/gcc2netbsd18
-rw-r--r--gnu/usr.bin/gcc/libgcc/Makefile4
-rw-r--r--gnu/usr.bin/gcc/libobjc/Makefile6
-rw-r--r--gnu/usr.bin/gdb/Makefile6
-rw-r--r--gnu/usr.bin/grep/Makefile4
-rw-r--r--gnu/usr.bin/groff/Makefile.cfg4
-rw-r--r--gnu/usr.bin/groff/addftinfo/Makefile4
-rw-r--r--gnu/usr.bin/groff/eqn/Makefile4
-rw-r--r--gnu/usr.bin/groff/grodvi/Makefile4
-rw-r--r--gnu/usr.bin/groff/groff/Makefile4
-rw-r--r--gnu/usr.bin/groff/grolj4/Makefile4
-rw-r--r--gnu/usr.bin/groff/grops/Makefile4
-rw-r--r--gnu/usr.bin/groff/grotty/Makefile4
-rw-r--r--gnu/usr.bin/groff/hpftodit/Makefile4
-rw-r--r--gnu/usr.bin/groff/indxbib/Makefile4
-rw-r--r--gnu/usr.bin/groff/libbib/Makefile4
-rw-r--r--gnu/usr.bin/groff/libdriver/Makefile4
-rw-r--r--gnu/usr.bin/groff/libgroff/Makefile4
-rw-r--r--gnu/usr.bin/groff/lkbib/Makefile4
-rw-r--r--gnu/usr.bin/groff/lookbib/Makefile4
-rw-r--r--gnu/usr.bin/groff/pic/Makefile4
-rw-r--r--gnu/usr.bin/groff/refer/Makefile4
-rw-r--r--gnu/usr.bin/groff/soelim/Makefile4
-rw-r--r--gnu/usr.bin/groff/tbl/Makefile4
-rw-r--r--gnu/usr.bin/groff/tfmtodit/Makefile4
-rw-r--r--gnu/usr.bin/groff/troff/Makefile4
-rw-r--r--gnu/usr.bin/groff/xditview/Makefile4
-rw-r--r--gnu/usr.bin/gzip/Makefile6
-rw-r--r--gnu/usr.bin/ld/Makefile.inc4
-rw-r--r--gnu/usr.bin/ld/rtld/Makefile4
-rw-r--r--gnu/usr.bin/rcs/Makefile.inc4
-rw-r--r--gnu/usr.bin/rcs/lib/Makefile6
-rw-r--r--gnu/usr.bin/sdiff/Makefile4
-rw-r--r--gnu/usr.bin/tar/Makefile16
54 files changed, 124 insertions, 124 deletions
diff --git a/gnu/usr.bin/Makefile.inc b/gnu/usr.bin/Makefile.inc
index e4db03485b2..4075a081880 100644
--- a/gnu/usr.bin/Makefile.inc
+++ b/gnu/usr.bin/Makefile.inc
@@ -1,3 +1,3 @@
-# $Id: Makefile.inc,v 1.2 1993/08/02 17:49:12 mycroft Exp $
+# $NetBSD: Makefile.inc,v 1.3 1997/10/25 10:10:19 lukem Exp $
BINDIR?= /usr/bin
diff --git a/gnu/usr.bin/bc/Makefile b/gnu/usr.bin/bc/Makefile
index 40d5bebc0ae..876870c4bd4 100644
--- a/gnu/usr.bin/bc/Makefile
+++ b/gnu/usr.bin/bc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 1997/10/23 22:25:06 christos Exp $
+# $NetBSD: Makefile,v 1.17 1997/10/25 10:10:23 lukem Exp $
PROG= bc
-CFLAGS+=-D_POSIX_SOURCE -I. -I${.CURDIR}
+CPPFLAGS+=-D_POSIX_SOURCE -I. -I${.CURDIR}
LFLAGS+=-I8
SRCS= bc.y execute.c getopt.c getopt1.c global.c load.c main.c number.c \
scan.l storage.c util.c
diff --git a/gnu/usr.bin/cpio/Makefile b/gnu/usr.bin/cpio/Makefile
index 88157c21669..4e24c6ad948 100644
--- a/gnu/usr.bin/cpio/Makefile
+++ b/gnu/usr.bin/cpio/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 1997/03/24 22:06:09 christos Exp $
+# $NetBSD: Makefile,v 1.5 1997/10/25 10:10:25 lukem Exp $
PROG= cpio
-CFLAGS+= -I${.CURDIR} -DRETSIGTYPE=void -DHAVE_SYS_MTIO_H=1 -DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DHAVE_FCNTL_H=1 -DHAVE_UTIME_H=1 -DHAVE_STRERROR=1 -DHAVE_VPRINTF=1 -DDIRENT=1
+CPPFLAGS+= -I${.CURDIR} -DRETSIGTYPE=void -DHAVE_SYS_MTIO_H=1 -DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DHAVE_FCNTL_H=1 -DHAVE_UTIME_H=1 -DHAVE_STRERROR=1 -DHAVE_VPRINTF=1 -DDIRENT=1
SRCS = copyin.c copyout.c copypass.c defer.c dstring.c fnmatch.c global.c \
main.c tar.c util.c error.c filemode.c getopt.c getopt1.c version.c \
diff --git a/gnu/usr.bin/dc/Makefile b/gnu/usr.bin/dc/Makefile
index 356897961bd..7aa14ac7278 100644
--- a/gnu/usr.bin/dc/Makefile
+++ b/gnu/usr.bin/dc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 1997/05/05 16:24:38 christos Exp $
+# $NetBSD: Makefile,v 1.5 1997/10/25 10:10:28 lukem Exp $
PROG= dc
-CFLAGS+=-D_POSIX_SOURCE -I${.CURDIR} -I${.CURDIR}/../bc
+CPPFLAGS+=-D_POSIX_SOURCE -I${.CURDIR} -I${.CURDIR}/../bc
SRCS= array.c dc.c eval.c misc.c numeric.c stack.c string.c \
number.c getopt.c getopt1.c
diff --git a/gnu/usr.bin/diff/Makefile b/gnu/usr.bin/diff/Makefile
index 993e8bc4532..7b10534882e 100644
--- a/gnu/usr.bin/diff/Makefile
+++ b/gnu/usr.bin/diff/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 1997/03/24 22:06:10 christos Exp $
+# $NetBSD: Makefile,v 1.11 1997/10/25 10:10:30 lukem Exp $
PROG= diff
SRCS= diff.c analyze.c cmpbuf.c io.c context.c ed.c normal.c util.c dir.c \
regex.c side.c ifdef.c version.c getopt.c getopt1.c
-CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR} -DPR_PROGRAM=\"/usr/bin/pr\"
+CPPFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR} -DPR_PROGRAM=\"/usr/bin/pr\"
LDADD+= -lgnumalloc
DPADD+= ${LIBGNUMALLOC}
diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile
index 7e5a8bb110f..cfac721af69 100644
--- a/gnu/usr.bin/diff3/Makefile
+++ b/gnu/usr.bin/diff3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 1997/03/24 22:06:12 christos Exp $
+# $NetBSD: Makefile,v 1.9 1997/10/25 10:10:32 lukem Exp $
PROG= diff3
SRCS= diff3.c getopt.c getopt1.c version.c
-CFLAGS+= -I$(.CURDIR)/../diff \
+CPPFLAGS+= -I$(.CURDIR)/../diff \
-DHAVE_CONFIG_H -DDIFF_PROGRAM=\"/usr/bin/diff\"
LDADD+= -lgnumalloc
diff --git a/gnu/usr.bin/gas/Makefile b/gnu/usr.bin/gas/Makefile
index 1e447094c7e..65334eb2f67 100644
--- a/gnu/usr.bin/gas/Makefile
+++ b/gnu/usr.bin/gas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 1997/09/19 01:02:08 jeremy Exp $
+# $NetBSD: Makefile,v 1.25 1997/10/25 10:10:35 lukem Exp $
# @(#)Makefile 6.1 (Berkeley) 3/3/91
TARGET_MACHINE_ARCH?= $(MACHINE_ARCH)
@@ -22,7 +22,7 @@ gas_objformat=aout
.endif
.if ($(TARGET_MACHINE_ARCH) != $(MACHINE_ARCH))
-CFLAGS+= -DCROSS_COMPILE
+CPPFLAGS+= -DCROSS_COMPILE
.endif
ADDINCLUDE=-I${.OBJDIR}
@@ -34,7 +34,7 @@ SRCS+= app.c as.c atof-generic.c bignum-copy.c \
listing.c messages.c obstack.c output-file.c read.c subsegs.c \
symbols.c version.c write.c xmalloc.c xrealloc.c \
obj-$(gas_objformat).c
-CFLAGS+= -I$(.CURDIR) ${ADDINCLUDE} -I$(.CURDIR)/config \
+CPPFLAGS+= -I$(.CURDIR) ${ADDINCLUDE} -I$(.CURDIR)/config \
-DOLD_GAS -DSIGTY=void -Derror=as_fatal \
-DNETBSD_AOUT
#LDADD+= -lgnumalloc
diff --git a/gnu/usr.bin/gas/config/Makefile.i386 b/gnu/usr.bin/gas/config/Makefile.i386
index 305d09845a7..e5a49dbda7e 100644
--- a/gnu/usr.bin/gas/config/Makefile.i386
+++ b/gnu/usr.bin/gas/config/Makefile.i386
@@ -1,5 +1,5 @@
+# $NetBSD: Makefile.i386,v 1.5 1997/10/25 10:10:38 lukem Exp $
# from: @(#)Makefile.i386 6.1 (Berkeley) 3/3/91
-# $Id: Makefile.i386,v 1.4 1993/12/19 04:36:19 davidb Exp $
-CFLAGS+= -DNON_BROKEN_WORDS -DPIC
+CPPFLAGS+= -DNON_BROKEN_WORDS -DPIC
SRCS+= tc-i386.c atof-ieee.c
diff --git a/gnu/usr.bin/gas/config/Makefile.icm3216 b/gnu/usr.bin/gas/config/Makefile.icm3216
index fe64932d668..e96a2aae8df 100644
--- a/gnu/usr.bin/gas/config/Makefile.icm3216
+++ b/gnu/usr.bin/gas/config/Makefile.icm3216
@@ -1,7 +1,7 @@
-# $Id: Makefile.icm3216,v 1.1 1993/12/19 08:42:08 davidb Exp $
+# $NetBSD: Makefile.icm3216,v 1.2 1997/10/25 10:10:39 lukem Exp $
SRCS+= tc-ns32k.c atof-ns32k.c
-CFLAGS+= -DNS32032 -DNS32081
+CPPFLAGS+= -DNS32032 -DNS32081
gas_target= ns32k
diff --git a/gnu/usr.bin/gas/config/Makefile.m68k b/gnu/usr.bin/gas/config/Makefile.m68k
index 95095edc21a..ee64347622b 100644
--- a/gnu/usr.bin/gas/config/Makefile.m68k
+++ b/gnu/usr.bin/gas/config/Makefile.m68k
@@ -1,5 +1,5 @@
+# $NetBSD: Makefile.m68k,v 1.6 1997/10/25 10:10:40 lukem Exp $
# from: @(#)Makefile.hp300 6.1 (Berkeley) 3/3/91
-# $Id: Makefile.m68k,v 1.5 1993/12/19 07:32:22 mycroft Exp $
-CFLAGS+= -DPIC
+CPPFLAGS+= -DPIC
SRCS+= tc-m68k.c atof-ieee.c
diff --git a/gnu/usr.bin/gas/config/Makefile.ns32k b/gnu/usr.bin/gas/config/Makefile.ns32k
index 592392429f8..cc151783ff2 100644
--- a/gnu/usr.bin/gas/config/Makefile.ns32k
+++ b/gnu/usr.bin/gas/config/Makefile.ns32k
@@ -1,4 +1,4 @@
-# $Id: Makefile.ns32k,v 1.2 1996/04/05 16:21:14 phil Exp $
+# $NetBSD: Makefile.ns32k,v 1.3 1997/10/25 10:10:42 lukem Exp $
-CFLAGS+= -DPIC -DNS32532 -DNS32381
+CPPFLAGS+= -DPIC -DNS32532 -DNS32381
SRCS+= tc-ns32k.c atof-ieee.c
diff --git a/gnu/usr.bin/gas/config/Makefile.powerpc b/gnu/usr.bin/gas/config/Makefile.powerpc
index 733771e9706..36d0d9acf8f 100644
--- a/gnu/usr.bin/gas/config/Makefile.powerpc
+++ b/gnu/usr.bin/gas/config/Makefile.powerpc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.powerpc,v 1.1 1996/11/03 18:02:42 ws Exp $
+# $NetBSD: Makefile.powerpc,v 1.2 1997/10/25 10:10:44 lukem Exp $
-CFLAGS+= -DNON_BROKEN_WORDS -DPIC
+CPPFLAGS+= -DNON_BROKEN_WORDS -DPIC
SRCS+= tc-powerpc.c atof-ieee.c
diff --git a/gnu/usr.bin/gas/config/Makefile.sparc b/gnu/usr.bin/gas/config/Makefile.sparc
index 8b5a5580040..a171492732e 100644
--- a/gnu/usr.bin/gas/config/Makefile.sparc
+++ b/gnu/usr.bin/gas/config/Makefile.sparc
@@ -1,5 +1,5 @@
+# $NetBSD: Makefile.sparc,v 1.3 1997/10/25 10:10:46 lukem Exp $
# from: @(#)Makefile.i386 6.1 (Berkeley) 3/3/91
-# $Id: Makefile.sparc,v 1.2 1993/12/19 07:32:23 mycroft Exp $
-CFLAGS+= -DNON_BROKEN_WORDS -DPIC
+CPPFLAGS+= -DNON_BROKEN_WORDS -DPIC
SRCS+= tc-sparc.c atof-ieee.c
diff --git a/gnu/usr.bin/gas/config/Makefile.vax b/gnu/usr.bin/gas/config/Makefile.vax
index f62b087d3df..71435b0fecc 100644
--- a/gnu/usr.bin/gas/config/Makefile.vax
+++ b/gnu/usr.bin/gas/config/Makefile.vax
@@ -1,4 +1,4 @@
+# $NetBSD: Makefile.vax,v 1.4 1997/10/25 10:10:47 lukem Exp $
# from: @(#)Makefile.vax 6.1 (Berkeley) 3/3/91
-# $Id: Makefile.vax,v 1.3 1993/10/02 20:58:23 pk Exp $
SRCS+= tc-vax.c atof-vax.c
diff --git a/gnu/usr.bin/gawk/Makefile b/gnu/usr.bin/gawk/Makefile
index 4145ad0d55e..8b234577a1c 100644
--- a/gnu/usr.bin/gawk/Makefile
+++ b/gnu/usr.bin/gawk/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 1997/03/24 22:06:14 christos Exp $
+# $NetBSD: Makefile,v 1.7 1997/10/25 10:10:49 lukem Exp $
PROG= awk
SRCS= main.c eval.c builtin.c msg.c iop.c io.c field.c array.c \
node.c version.c re.c awk.c regex.c dfa.c \
getopt.c getopt1.c
-CFLAGS+= -DGAWK
+CPPFLAGS+= -DGAWK
LDADD= -lm -lgnumalloc
DPADD= ${LIBM} ${LIBGNUMALLOC}
CLEANFILES+= awk.c y.tab.h
diff --git a/gnu/usr.bin/gcc/Makefile.cc1 b/gnu/usr.bin/gcc/Makefile.cc1
index 100fd4550e7..bc197fa242b 100644
--- a/gnu/usr.bin/gcc/Makefile.cc1
+++ b/gnu/usr.bin/gcc/Makefile.cc1
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cc1,v 1.6 1997/10/18 06:21:29 lukem Exp $
+# $NetBSD: Makefile.cc1,v 1.7 1997/10/25 10:10:52 lukem Exp $
NOMAN=
@@ -7,7 +7,7 @@ BINDIR= /usr/libexec
COMMON!=cd $(.CURDIR)/../common; \
printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
-CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../common -I${.CURDIR}/../arch \
+CPPFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../common -I${.CURDIR}/../arch \
-I${.CURDIR}/../arch/$(MACHINE_ARCH) -I$(COMMON)
YFLAGS=
diff --git a/gnu/usr.bin/gcc/cc/Makefile b/gnu/usr.bin/gcc/cc/Makefile
index 0efe083fe92..2c9ef12f7bf 100644
--- a/gnu/usr.bin/gcc/cc/Makefile
+++ b/gnu/usr.bin/gcc/cc/Makefile
@@ -1,5 +1,5 @@
# from: @(#)Makefile 6.2 (Berkeley) 3/25/91
-# $NetBSD: Makefile,v 1.3 1997/06/23 13:25:45 mrg Exp $
+# $NetBSD: Makefile,v 1.4 1997/10/25 10:10:59 lukem Exp $
.if (${MACHINE_ARCH} == "i386") || \
(${MACHINE_ARCH} == "m68k") || \
@@ -11,7 +11,7 @@
PROG= gcc
SRCS= gcc.c obstack.c version.c
BINDIR= /usr/bin
-CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../common -I${.CURDIR}/../arch \
+CPPFLAGS+=-I${.CURDIR} -I${.CURDIR}/../common -I${.CURDIR}/../arch \
-I${.CURDIR}/../arch/$(MACHINE_ARCH) \
-DMD_EXEC_PREFIX=\"/usr/libexec/\" \
-DMD_STARTFILE_PREFIX=\"/usr/lib/\"
diff --git a/gnu/usr.bin/gcc/common/Makefile b/gnu/usr.bin/gcc/common/Makefile
index 849d691b516..8ce2e2799ee 100644
--- a/gnu/usr.bin/gcc/common/Makefile
+++ b/gnu/usr.bin/gcc/common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1997/05/31 21:21:29 cjs Exp $
+# $NetBSD: Makefile,v 1.13 1997/10/25 10:11:01 lukem Exp $
LIB= cc1
@@ -9,7 +9,7 @@ NOPROFILE=
COMMON!=cd $(.CURDIR)/../common; \
printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
-CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../arch \
+CPPFLAGS+=-I${.CURDIR} -I${.CURDIR}/../arch \
-I${.CURDIR}/../arch/$(MACHINE_ARCH) -I$(COMMON)
MD= ${.CURDIR}/../arch/${MACHINE_ARCH}/${MACHINE_ARCH}.md
diff --git a/gnu/usr.bin/gcc/cpp/Makefile b/gnu/usr.bin/gcc/cpp/Makefile
index 38d420ec4ae..d7fe8ae741c 100644
--- a/gnu/usr.bin/gcc/cpp/Makefile
+++ b/gnu/usr.bin/gcc/cpp/Makefile
@@ -1,5 +1,5 @@
# from: @(#)Makefile 6.4 (Berkeley) 2/21/91
-# $NetBSD: Makefile,v 1.6 1997/06/23 13:25:46 mrg Exp $
+# $NetBSD: Makefile,v 1.7 1997/10/25 10:11:04 lukem Exp $
.if (${MACHINE_ARCH} == "i386") || \
(${MACHINE_ARCH} == "m68k") || \
@@ -11,7 +11,7 @@
PROG= cpp
BINDIR= /usr/libexec
SRCS= cccp.c cexp.c obstack.c version.c
-CFLAGS+=-I. -I$(.CURDIR) -I$(.CURDIR)/../common -I$(.CURDIR)/../arch \
+CPPFLAGS+=-I. -I$(.CURDIR) -I$(.CURDIR)/../common -I$(.CURDIR)/../arch \
-I$(.CURDIR)/../arch/$(MACHINE_ARCH) \
-DGCC_INCLUDE_DIR=\"\" \
-DTOOL_INCLUDE_DIR=\"\" \
diff --git a/gnu/usr.bin/gcc/g++/Makefile b/gnu/usr.bin/gcc/g++/Makefile
index 34c0896816d..19939283887 100644
--- a/gnu/usr.bin/gcc/g++/Makefile
+++ b/gnu/usr.bin/gcc/g++/Makefile
@@ -1,5 +1,5 @@
# from: @(#)Makefile 6.2 (Berkeley) 3/25/91
-# $NetBSD: Makefile,v 1.6 1997/06/23 13:25:48 mrg Exp $
+# $NetBSD: Makefile,v 1.7 1997/10/25 10:11:07 lukem Exp $
.if (${MACHINE_ARCH} == "i386") || \
(${MACHINE_ARCH} == "m68k") || \
@@ -11,7 +11,7 @@
PROG= g++
SRCS= g++.c obstack.c version.c
BINDIR= /usr/bin
-CFLAGS+=-I$(.CURDIR) -I$(.CURDIR)/../common \
+CPPFLAGS+=-I$(.CURDIR) -I$(.CURDIR)/../common \
-I$(.CURDIR)/../arch -I$(.CURDIR)/../arch/$(MACHINE_ARCH) \
-DGCC_NAME=\"/usr/bin/cc\"
LDADD+= -lgnumalloc
diff --git a/gnu/usr.bin/gcc/gcc2netbsd b/gnu/usr.bin/gcc/gcc2netbsd
index 87003887e4f..e913b02ac2c 100644
--- a/gnu/usr.bin/gcc/gcc2netbsd
+++ b/gnu/usr.bin/gcc/gcc2netbsd
@@ -1,6 +1,6 @@
#!/usr/gnu/bin/perl
#
-# $NetBSD: gcc2netbsd,v 1.28 1997/10/24 21:25:46 is Exp $
+# $NetBSD: gcc2netbsd,v 1.29 1997/10/25 10:10:55 lukem Exp $
#
# Perl script to convert a standard distribution directory for gcc into
# a NetBSD source tree.
@@ -492,7 +492,7 @@ BINDIR= /usr/libexec
COMMON!=cd $(.CURDIR)/../common; \
printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
-CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../common -I${.CURDIR}/../arch \
+CPPFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../common -I${.CURDIR}/../arch \
-I${.CURDIR}/../arch/$(MACHINE_ARCH) -I$(COMMON)
YFLAGS=
@@ -513,7 +513,7 @@ NOPROFILE=
COMMON!=cd $(.CURDIR)/../common; \
printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
-CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../arch \
+CPPFLAGS+=-I${.CURDIR} -I${.CURDIR}/../arch \
-I${.CURDIR}/../arch/$(MACHINE_ARCH) -I$(COMMON)
MD= ${.CURDIR}/../arch/${MACHINE_ARCH}/${MACHINE_ARCH}.md
@@ -561,7 +561,7 @@ libinstall::
PROG= gcc
%% srcs cc
BINDIR= /usr/bin
-CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../common -I${.CURDIR}/../arch \
+CPPFLAGS+=-I${.CURDIR} -I${.CURDIR}/../common -I${.CURDIR}/../arch \
-I${.CURDIR}/../arch/$(MACHINE_ARCH) \
-DMD_EXEC_PREFIX=\"/usr/libexec/\" \
-DMD_STARTFILE_PREFIX=\"/usr/lib/\"
@@ -629,7 +629,7 @@ CLEANFILES+= objc-parse.c
PROG= cpp
BINDIR= /usr/libexec
%% srcs cpp
-CFLAGS+=-I. -I$(.CURDIR) -I$(.CURDIR)/../common -I$(.CURDIR)/../arch \
+CPPFLAGS+=-I. -I$(.CURDIR) -I$(.CURDIR)/../common -I$(.CURDIR)/../arch \
-I$(.CURDIR)/../arch/$(MACHINE_ARCH) \
-DGCC_INCLUDE_DIR=\"\" \
-DTOOL_INCLUDE_DIR=\"\" \
@@ -667,7 +667,7 @@ MLINKS= cpp.1 cccp.1 cpp.1 gcpp.1
PROG= g++
%% srcs g++
BINDIR= /usr/bin
-CFLAGS+=-I$(.CURDIR) -I$(.CURDIR)/../common \
+CPPFLAGS+=-I$(.CURDIR) -I$(.CURDIR)/../common \
-I$(.CURDIR)/../arch -I$(.CURDIR)/../arch/$(MACHINE_ARCH) \
-DGCC_NAME=\"/usr/bin/cc\"
LDADD+= -lgnumalloc
@@ -689,7 +689,7 @@ LIB= gcc
NOPROFILE=
NOPIC=
-CFLAGS+=-I${.CURDIR}/../common -I${.CURDIR}/../arch \
+CPPFLAGS+=-I${.CURDIR}/../common -I${.CURDIR}/../arch \
-I${.CURDIR}/../arch/${MACHINE_ARCH}
#LIB1OBJS= _mulsi3.o _udivsi3.o _divsi3.o _umodsi3.o _modsi3.o _lshrsi3.o \
@@ -747,9 +747,9 @@ NOPIC=
.SUFFIXES: .o .m
-.m.o: ; ${CC} -c ${CFLAGS} -o ${.TARGET} ${.IMPSRC}
+.m.o: ; ${CC} -c ${CFLAGS} ${CPPFLAGS} -o ${.TARGET} ${.IMPSRC}
-CFLAGS+=-I${.CURDIR}/../common -I${.CURDIR}/../arch \
+CPPFLAGS+=-I${.CURDIR}/../common -I${.CURDIR}/../arch \
-I${.CURDIR}/../arch/${MACHINE_ARCH}
diff --git a/gnu/usr.bin/gcc/libgcc/Makefile b/gnu/usr.bin/gcc/libgcc/Makefile
index 003f1176eff..38ca80a7cd0 100644
--- a/gnu/usr.bin/gcc/libgcc/Makefile
+++ b/gnu/usr.bin/gcc/libgcc/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 1996/11/11 01:06:54 mycroft Exp $
+# $NetBSD: Makefile,v 1.4 1997/10/25 10:11:10 lukem Exp $
LIB= gcc
NOPROFILE=
NOPIC=
-CFLAGS+=-I${.CURDIR}/../common -I${.CURDIR}/../arch \
+CPPFLAGS+=-I${.CURDIR}/../common -I${.CURDIR}/../arch \
-I${.CURDIR}/../arch/${MACHINE_ARCH}
#LIB1OBJS= _mulsi3.o _udivsi3.o _divsi3.o _umodsi3.o _modsi3.o _lshrsi3.o \
diff --git a/gnu/usr.bin/gcc/libobjc/Makefile b/gnu/usr.bin/gcc/libobjc/Makefile
index 05647edbebe..4828d24fd69 100644
--- a/gnu/usr.bin/gcc/libobjc/Makefile
+++ b/gnu/usr.bin/gcc/libobjc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1997/10/22 12:57:07 is Exp $
+# $NetBSD: Makefile,v 1.4 1997/10/25 10:11:15 lukem Exp $
LIB= objc
INCSDIR=/usr/include/objc
@@ -9,9 +9,9 @@ NOPIC=
.SUFFIXES: .o .m
-.m.o: ; ${CC} -c ${CFLAGS} -o ${.TARGET} ${.IMPSRC}
+.m.o: ; ${CC} -c ${CPPFLAGS} -o ${.TARGET} ${.IMPSRC}
-CFLAGS+=-I${.CURDIR}/../common -I${.CURDIR}/../arch \
+CPPFLAGS+=-I${.CURDIR}/../common -I${.CURDIR}/../arch \
-I${.CURDIR}/../arch/${MACHINE_ARCH}
diff --git a/gnu/usr.bin/gdb/Makefile b/gnu/usr.bin/gdb/Makefile
index f83eec1c801..17af5486e02 100644
--- a/gnu/usr.bin/gdb/Makefile
+++ b/gnu/usr.bin/gdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1997/10/18 18:37:37 gwr Exp $
+# $NetBSD: Makefile,v 1.11 1997/10/25 10:11:18 lukem Exp $
PROG= gdb
@@ -12,7 +12,7 @@ srcdir= $(dist)/gdb
TARGET_ARCH?=$(MACHINE_ARCH)
# Debugging?
-# CFLAGS=-g
+# CPPFLAGS=-g
# Find out where libreadline.a lives.
RL_CURDIR=$(TOP)/lib/readline
@@ -38,7 +38,7 @@ INCLS+= -I$(dist)/include
# KERNEL_DEBUG no longer used. See ADDITIONAL_OPTIONS*
DEFS= -DNO_MMALLOC
-CFLAGS+= $(INCLS) $(DEFS)
+CPPFLAGS+= $(INCLS) $(DEFS)
.include "_$(TARGET_ARCH).mk"
diff --git a/gnu/usr.bin/grep/Makefile b/gnu/usr.bin/grep/Makefile
index d01f70d8afd..f40d847a131 100644
--- a/gnu/usr.bin/grep/Makefile
+++ b/gnu/usr.bin/grep/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 1997/03/24 22:06:22 christos Exp $
+# $NetBSD: Makefile,v 1.8 1997/10/25 10:11:22 lukem Exp $
PROG= grep
SRCS= dfa.c grep.c getopt.c kwset.c obstack.c regex.c search.c
-CFLAGS+=-DGREP -DHAVE_STRING_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_UNISTD_H=1 \
+CPPFLAGS+=-DGREP -DHAVE_STRING_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_UNISTD_H=1 \
-DHAVE_GETPAGESIZE=1 -DHAVE_MEMCHR=1 -DHAVE_STRERROR=1 \
-DHAVE_VALLOC=1
diff --git a/gnu/usr.bin/groff/Makefile.cfg b/gnu/usr.bin/groff/Makefile.cfg
index 68dabac3aa7..aa818e7499f 100644
--- a/gnu/usr.bin/groff/Makefile.cfg
+++ b/gnu/usr.bin/groff/Makefile.cfg
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cfg,v 1.19 1997/10/18 05:58:23 lukem Exp $
+# $NetBSD: Makefile.cfg,v 1.20 1997/10/25 10:11:26 lukem Exp $
.if defined(PROG)
LDADD+= -lgnumalloc
@@ -21,7 +21,7 @@ LIBBIB!=cd $(.CURDIR)/../libbib; \
printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/libbib.a\n" | ${MAKE} -s -f-
.endif
-CFLAGS+= -DHAVE_UNISTD_H=1\
+CPPFLAGS+= -DHAVE_UNISTD_H=1\
-DHAVE_DIRENT_H=1\
-DHAVE_LIMITS_H=1\
-DHAVE_STDLIB_H=1\
diff --git a/gnu/usr.bin/groff/addftinfo/Makefile b/gnu/usr.bin/groff/addftinfo/Makefile
index 2e227fd069e..3c17e88a58b 100644
--- a/gnu/usr.bin/groff/addftinfo/Makefile
+++ b/gnu/usr.bin/groff/addftinfo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 1997/10/18 05:58:25 lukem Exp $
+# $NetBSD: Makefile,v 1.5 1997/10/25 10:11:29 lukem Exp $
PROG= addftinfo
SRCS= addftinfo.cc guess.cc
-CFLAGS+= -I$(.CURDIR)/../include
+CPPFLAGS+= -I$(.CURDIR)/../include
LDADD+= $(LIBGROFF)
DPADD+= $(LIBGROFF)
diff --git a/gnu/usr.bin/groff/eqn/Makefile b/gnu/usr.bin/groff/eqn/Makefile
index 8bbdc718c28..eb178fc5707 100644
--- a/gnu/usr.bin/groff/eqn/Makefile
+++ b/gnu/usr.bin/groff/eqn/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.11 1997/10/18 05:58:51 lukem Exp $
+# $NetBSD: Makefile,v 1.12 1997/10/25 10:11:33 lukem Exp $
PROG= eqn
SRCS= main.cc lex.cc box.cc limit.cc list.cc over.cc text.cc\
script.cc mark.cc other.cc delim.cc sqrt.cc pile.cc special.cc\
eqn.cc
-CFLAGS+= -I. -I$(.CURDIR)/../include
+CPPFLAGS+= -I. -I$(.CURDIR)/../include
LDADD+= $(LIBGROFF)
DPADD+= $(LIBGROFF)
diff --git a/gnu/usr.bin/groff/grodvi/Makefile b/gnu/usr.bin/groff/grodvi/Makefile
index 623eec51131..e0d9817c310 100644
--- a/gnu/usr.bin/groff/grodvi/Makefile
+++ b/gnu/usr.bin/groff/grodvi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 1997/10/18 05:58:53 lukem Exp $
+# $NetBSD: Makefile,v 1.6 1997/10/25 10:11:37 lukem Exp $
PROG= grodvi
SRCS= dvi.cc
-CFLAGS+= -I$(.CURDIR)/../include
+CPPFLAGS+= -I$(.CURDIR)/../include
LDADD+= $(LIBDRIVER) $(LIBGROFF) -lm
DPADD+= $(LIBDRIVER) $(LIBGROFF) $(LIBM)
diff --git a/gnu/usr.bin/groff/groff/Makefile b/gnu/usr.bin/groff/groff/Makefile
index ed3cb66d0b7..e0a75480929 100644
--- a/gnu/usr.bin/groff/groff/Makefile
+++ b/gnu/usr.bin/groff/groff/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 1997/10/18 05:58:55 lukem Exp $
+# $NetBSD: Makefile,v 1.8 1997/10/25 10:11:41 lukem Exp $
PROG= groff
SRCS= groff.cc pipeline.c
-CFLAGS+= -I$(.CURDIR)/../include
+CPPFLAGS+= -I$(.CURDIR)/../include
LDADD+= $(LIBGROFF) -lm
DPADD+= $(LIBGROFF) $(LIBM)
diff --git a/gnu/usr.bin/groff/grolj4/Makefile b/gnu/usr.bin/groff/grolj4/Makefile
index 87e8bae8547..24ee2f985bb 100644
--- a/gnu/usr.bin/groff/grolj4/Makefile
+++ b/gnu/usr.bin/groff/grolj4/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 1997/10/18 05:58:57 lukem Exp $
+# $NetBSD: Makefile,v 1.3 1997/10/25 10:11:46 lukem Exp $
PROG= grolj4
SRCS= lj4.cc
-CFLAGS+= -I$(.CURDIR)/../include
+CPPFLAGS+= -I$(.CURDIR)/../include
LDADD+= $(LIBDRIVER) $(LIBGROFF) -lm
DPADD+= $(LIBDRIVER) $(LIBGROFF) $(LIBM)
diff --git a/gnu/usr.bin/groff/grops/Makefile b/gnu/usr.bin/groff/grops/Makefile
index 229cdfabedd..806a728f9a4 100644
--- a/gnu/usr.bin/groff/grops/Makefile
+++ b/gnu/usr.bin/groff/grops/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 1997/10/18 05:58:58 lukem Exp $
+# $NetBSD: Makefile,v 1.9 1997/10/25 10:11:49 lukem Exp $
PROG= grops
SRCS= ps.cc psrm.cc
-CFLAGS+= -I$(.CURDIR)/../include
+CPPFLAGS+= -I$(.CURDIR)/../include
LDADD+= $(LIBDRIVER) $(LIBGROFF) -lm
DPADD+= $(LIBDRIVER) $(LIBGROFF) $(LIBM)
diff --git a/gnu/usr.bin/groff/grotty/Makefile b/gnu/usr.bin/groff/grotty/Makefile
index a0570b552d8..02274c1abb9 100644
--- a/gnu/usr.bin/groff/grotty/Makefile
+++ b/gnu/usr.bin/groff/grotty/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 1997/10/18 05:59:00 lukem Exp $
+# $NetBSD: Makefile,v 1.9 1997/10/25 10:11:53 lukem Exp $
PROG= grotty
SRCS= tty.cc
-CFLAGS+= -I$(.CURDIR)/../include
+CPPFLAGS+= -I$(.CURDIR)/../include
LDADD+= $(LIBDRIVER) $(LIBGROFF) -lm
DPADD+= $(LIBDRIVER) $(LIBGROFF) $(LIBM)
diff --git a/gnu/usr.bin/groff/hpftodit/Makefile b/gnu/usr.bin/groff/hpftodit/Makefile
index 83986c982e6..bccfd259aa3 100644
--- a/gnu/usr.bin/groff/hpftodit/Makefile
+++ b/gnu/usr.bin/groff/hpftodit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 1997/10/18 05:59:02 lukem Exp $
+# $NetBSD: Makefile,v 1.3 1997/10/25 10:11:56 lukem Exp $
PROG= hpftodit
SRCS= hpftodit.cc
-CFLAGS+= -I$(.CURDIR)/../include
+CPPFLAGS+= -I$(.CURDIR)/../include
LDADD+= $(LIBGROFF) -lm
DPADD+= $(LIBGROFF) $(LIBM)
diff --git a/gnu/usr.bin/groff/indxbib/Makefile b/gnu/usr.bin/groff/indxbib/Makefile
index 69684201f29..84a1978f837 100644
--- a/gnu/usr.bin/groff/indxbib/Makefile
+++ b/gnu/usr.bin/groff/indxbib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 1997/10/18 05:59:04 lukem Exp $
+# $NetBSD: Makefile,v 1.9 1997/10/25 10:11:59 lukem Exp $
PROG= indxbib
SRCS= indxbib.cc dirnamemax.c signal.c
-CFLAGS+= -I$(.CURDIR)/../include
+CPPFLAGS+= -I$(.CURDIR)/../include
LDADD+= $(LIBBIB) $(LIBGROFF) -lm
DPADD+= $(LIBBIB) $(LIBGROFF) $(LIBM)
diff --git a/gnu/usr.bin/groff/libbib/Makefile b/gnu/usr.bin/groff/libbib/Makefile
index 6ad8a0dc3e4..3efc0b7336b 100644
--- a/gnu/usr.bin/groff/libbib/Makefile
+++ b/gnu/usr.bin/groff/libbib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 1997/10/18 05:59:06 lukem Exp $
+# $NetBSD: Makefile,v 1.9 1997/10/25 10:12:02 lukem Exp $
LIB= bib
SRCS= common.cc index.cc linear.cc search.cc map.c
-CFLAGS+= -I$(.CURDIR)/../include
+CPPFLAGS+= -I$(.CURDIR)/../include
NOMAN= noman
NOPROFILE= noprofile
diff --git a/gnu/usr.bin/groff/libdriver/Makefile b/gnu/usr.bin/groff/libdriver/Makefile
index d1c4f0fe364..21f683a68e8 100644
--- a/gnu/usr.bin/groff/libdriver/Makefile
+++ b/gnu/usr.bin/groff/libdriver/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 1997/10/18 05:59:08 lukem Exp $
+# $NetBSD: Makefile,v 1.11 1997/10/25 10:12:06 lukem Exp $
LIB= driver
SRCS= input.cc printer.cc
-CFLAGS+= -I$(.CURDIR)/../include
+CPPFLAGS+= -I$(.CURDIR)/../include
NOMAN= noman
NOPROFILE= noprofile
diff --git a/gnu/usr.bin/groff/libgroff/Makefile b/gnu/usr.bin/groff/libgroff/Makefile
index 8894552d2ed..004661eec0f 100644
--- a/gnu/usr.bin/groff/libgroff/Makefile
+++ b/gnu/usr.bin/groff/libgroff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1997/10/18 05:59:10 lukem Exp $
+# $NetBSD: Makefile,v 1.11 1997/10/25 10:12:09 lukem Exp $
LIB= groff
SRCS= assert.cc change_lf.cc cmap.cc cset.cc device.cc errarg.cc\
@@ -7,7 +7,7 @@ SRCS= assert.cc change_lf.cc cmap.cc cset.cc device.cc errarg.cc\
progname.cc ptable.cc searchpath.cc string.cc strsave.cc\
tmpfile.cc illegal.cc version.cc
SRCS+= iftoa.c itoa.c matherr.c
-CFLAGS+= -I$(.CURDIR)/../include
+CPPFLAGS+= -I$(.CURDIR)/../include
NOMAN= noman
NOPROFILE= noprofile
diff --git a/gnu/usr.bin/groff/lkbib/Makefile b/gnu/usr.bin/groff/lkbib/Makefile
index f21470e77ee..65486ccf339 100644
--- a/gnu/usr.bin/groff/lkbib/Makefile
+++ b/gnu/usr.bin/groff/lkbib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 1997/10/18 05:59:12 lukem Exp $
+# $NetBSD: Makefile,v 1.6 1997/10/25 10:12:12 lukem Exp $
PROG= lkbib
SRCS= lkbib.cc
-CFLAGS+= -I$(.CURDIR)/../include
+CPPFLAGS+= -I$(.CURDIR)/../include
LDADD+= $(LIBBIB) $(LIBGROFF) -lm
DPADD+= $(LIBBIB) $(LIBGROFF) $(LIBM)
diff --git a/gnu/usr.bin/groff/lookbib/Makefile b/gnu/usr.bin/groff/lookbib/Makefile
index d034d2b49ef..3b7a99d913d 100644
--- a/gnu/usr.bin/groff/lookbib/Makefile
+++ b/gnu/usr.bin/groff/lookbib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 1997/10/18 05:59:15 lukem Exp $
+# $NetBSD: Makefile,v 1.6 1997/10/25 10:12:17 lukem Exp $
PROG= lookbib
SRCS= lookbib.cc
-CFLAGS+= -I$(.CURDIR)/../include
+CPPFLAGS+= -I$(.CURDIR)/../include
LDADD+= $(LIBBIB) $(LIBGROFF) -lm
DPADD+= $(LIBBIB) $(LIBGROFF) $(LIBM)
diff --git a/gnu/usr.bin/groff/pic/Makefile b/gnu/usr.bin/groff/pic/Makefile
index 21d5ca53d9a..cdcf06ca27c 100644
--- a/gnu/usr.bin/groff/pic/Makefile
+++ b/gnu/usr.bin/groff/pic/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 1997/10/18 05:59:24 lukem Exp $
+# $NetBSD: Makefile,v 1.11 1997/10/25 10:12:19 lukem Exp $
PROG= pic
SRCS= lex.cc main.cc object.cc common.cc troff.cc tex.cc pic.cc
-CFLAGS+= -I. -I$(.CURDIR)/../include
+CPPFLAGS+= -I. -I$(.CURDIR)/../include
LDADD+= $(LIBGROFF) -lm
DPADD+= $(LIBGROFF) $(LIBM)
diff --git a/gnu/usr.bin/groff/refer/Makefile b/gnu/usr.bin/groff/refer/Makefile
index 43ae00fb2ee..23d91a3459d 100644
--- a/gnu/usr.bin/groff/refer/Makefile
+++ b/gnu/usr.bin/groff/refer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 1997/10/18 05:59:28 lukem Exp $
+# $NetBSD: Makefile,v 1.7 1997/10/25 10:12:22 lukem Exp $
PROG= refer
SRCS= command.cc ref.cc refer.cc token.cc label.cc
-CFLAGS+= -I. -I$(.CURDIR)/../include
+CPPFLAGS+= -I. -I$(.CURDIR)/../include
LDADD+= $(LIBBIB) $(LIBGROFF) -lm
DPADD+= $(LIBBIB) $(LIBGROFF) $(LIBM)
diff --git a/gnu/usr.bin/groff/soelim/Makefile b/gnu/usr.bin/groff/soelim/Makefile
index adea587e127..4e3200a6ea4 100644
--- a/gnu/usr.bin/groff/soelim/Makefile
+++ b/gnu/usr.bin/groff/soelim/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 1997/10/18 05:59:30 lukem Exp $
+# $NetBSD: Makefile,v 1.5 1997/10/25 10:12:24 lukem Exp $
PROG= soelim
SRCS= soelim.cc
-CFLAGS+= -I$(.CURDIR)/../include
+CPPFLAGS+= -I$(.CURDIR)/../include
LDADD+= $(LIBGROFF)
DPADD+= $(LIBGROFF)
diff --git a/gnu/usr.bin/groff/tbl/Makefile b/gnu/usr.bin/groff/tbl/Makefile
index c6a3144ad55..b5b29e30133 100644
--- a/gnu/usr.bin/groff/tbl/Makefile
+++ b/gnu/usr.bin/groff/tbl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 1997/10/18 05:59:31 lukem Exp $
+# $NetBSD: Makefile,v 1.8 1997/10/25 10:12:27 lukem Exp $
PROG= tbl
SRCS= main.cc table.cc
-CFLAGS+= -I$(.CURDIR)/../include
+CPPFLAGS+= -I$(.CURDIR)/../include
LDADD+= $(LIBGROFF) -lm
DPADD+= $(LIBGROFF) $(LIBM)
diff --git a/gnu/usr.bin/groff/tfmtodit/Makefile b/gnu/usr.bin/groff/tfmtodit/Makefile
index 11cd20a0c4a..5305d0f9b98 100644
--- a/gnu/usr.bin/groff/tfmtodit/Makefile
+++ b/gnu/usr.bin/groff/tfmtodit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 1997/10/18 05:59:33 lukem Exp $
+# $NetBSD: Makefile,v 1.6 1997/10/25 10:12:30 lukem Exp $
PROG= tfmtodit
SRCS= tfmtodit.cc
-CFLAGS+= -I$(.CURDIR)/../include
+CPPFLAGS+= -I$(.CURDIR)/../include
LDADD+= $(LIBGROFF) -lm
DPADD+= $(LIBGROFF) $(LIBM)
diff --git a/gnu/usr.bin/groff/troff/Makefile b/gnu/usr.bin/groff/troff/Makefile
index e885f6fd07a..f48d1939c30 100644
--- a/gnu/usr.bin/groff/troff/Makefile
+++ b/gnu/usr.bin/groff/troff/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 1997/10/18 05:59:35 lukem Exp $
+# $NetBSD: Makefile,v 1.14 1997/10/25 10:12:32 lukem Exp $
PROG= troff
SRCS= env.cc node.cc input.cc div.cc symbol.cc dictionary.cc reg.cc \
number.cc majorminor.cc
-CFLAGS+= -I$(.CURDIR)/../include
+CPPFLAGS+= -I$(.CURDIR)/../include
LDADD+= $(LIBGROFF) -lm
DPADD+= $(LIBGROFF) $(LIBM)
diff --git a/gnu/usr.bin/groff/xditview/Makefile b/gnu/usr.bin/groff/xditview/Makefile
index a7fe208fadd..bae7e96d001 100644
--- a/gnu/usr.bin/groff/xditview/Makefile
+++ b/gnu/usr.bin/groff/xditview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1997/10/18 05:59:37 lukem Exp $
+# $NetBSD: Makefile,v 1.8 1997/10/25 10:12:35 lukem Exp $
.if exists(/usr/X11)
XINCDIR= /usr/X11/include
@@ -21,7 +21,7 @@ XLIBDIR= /usr/X386/lib
BINDIR= /usr/bin
PROG= gxditview
-CFLAGS+= -I$(XINCDIR) -DFONTPATH=\"/usr/share/groff_font\"
+CPPFLAGS+= -I$(XINCDIR) -DFONTPATH=\"/usr/share/groff_font\"
SRCS+= xditview.c Dvi.c draw.c font.c lex.c page.c parse.c \
XFontName.c DviChar.c device.c
LDADD+= -L$(XLIBDIR) -lXaw -lXmu -lXt -lXext -lX11 -lm
diff --git a/gnu/usr.bin/gzip/Makefile b/gnu/usr.bin/gzip/Makefile
index 57059e25f5f..90736c3b20b 100644
--- a/gnu/usr.bin/gzip/Makefile
+++ b/gnu/usr.bin/gzip/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.19 1997/03/24 22:06:35 christos Exp $
+# $NetBSD: Makefile,v 1.20 1997/10/25 10:12:38 lukem Exp $
PROG= gzip
SRCS= gzip.c zip.c deflate.c trees.c bits.c unzip.c inflate.c util.c \
crypt.c lzw.c unlzw.c unlzh.c unpack.c getopt.c
MAN= gzexe.1 gzip.1 zdiff.1 zforce.1 zgrep.1 zmore.1 znew.1
-CFLAGS+=-DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DDIRENT=1
+CPPFLAGS+=-DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DDIRENT=1
.if (${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "i386")
SRCS+= match.S
-CFLAGS+=-DASMV
+CPPFLAGS+=-DASMV
.endif
LDSTATIC= -static
diff --git a/gnu/usr.bin/ld/Makefile.inc b/gnu/usr.bin/ld/Makefile.inc
index f31028e187b..93c541cca82 100644
--- a/gnu/usr.bin/ld/Makefile.inc
+++ b/gnu/usr.bin/ld/Makefile.inc
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.1 1997/04/16 16:49:29 christos Exp $
+# $NetBSD: Makefile.inc,v 1.2 1997/10/25 10:12:41 lukem Exp $
-CFLAGS += -I$(.CURDIR)/../common -I$(.CURDIR)/../arch/$(MACHINE_ARCH)
+CPPFLAGS += -I$(.CURDIR)/../common -I$(.CURDIR)/../arch/$(MACHINE_ARCH)
.PATH: $(.CURDIR)/../common $(.CURDIR)/../arch/$(MACHINE_ARCH)
diff --git a/gnu/usr.bin/ld/rtld/Makefile b/gnu/usr.bin/ld/rtld/Makefile
index 21bd2989a1d..ced44dbc1fe 100644
--- a/gnu/usr.bin/ld/rtld/Makefile
+++ b/gnu/usr.bin/ld/rtld/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 1997/07/14 02:56:54 christos Exp $
+# $NetBSD: Makefile,v 1.22 1997/10/25 10:12:46 lukem Exp $
.if (${MACHINE_ARCH} == "i386") || \
(${MACHINE_ARCH} == "m68k") || \
@@ -10,7 +10,7 @@ PROG= ld.so
SRCS= mdprologue.S rtld.c malloc.c shlib.c etc.c md.c vfprintf.c
CLIB= ${.CURDIR}/../../../../lib/libc
PICFLAG=-fpic -fno-function-cse
-CFLAGS+=$(PICFLAG) -DRTLD -DLIBC_SCCS -I${CLIB}/include
+CPPFLAGS+=$(PICFLAG) -DRTLD -DLIBC_SCCS -I${CLIB}/include
ASFLAGS+=-k
LDFLAGS+=-Bshareable -Bsymbolic -assert nosymbolic
.if defined(DESTDIR)
diff --git a/gnu/usr.bin/rcs/Makefile.inc b/gnu/usr.bin/rcs/Makefile.inc
index 14ad27b3df5..eb8aafa2dec 100644
--- a/gnu/usr.bin/rcs/Makefile.inc
+++ b/gnu/usr.bin/rcs/Makefile.inc
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.8 1997/10/18 04:42:04 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.9 1997/10/25 10:12:48 lukem Exp $
LIBRCS!=cd $(.CURDIR)/../lib; \
printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/librcs.a\n" | ${MAKE} -s -f-
-CFLAGS+=-I${.CURDIR}/../lib
+CPPFLAGS+=-I${.CURDIR}/../lib
LDADD= ${LIBRCS} -lgnumalloc
DPADD= ${LIBRCS} ${LIBGNUMALLOC}
diff --git a/gnu/usr.bin/rcs/lib/Makefile b/gnu/usr.bin/rcs/lib/Makefile
index 1221a8b86e7..186afd92328 100644
--- a/gnu/usr.bin/rcs/lib/Makefile
+++ b/gnu/usr.bin/rcs/lib/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.12 1997/06/23 13:31:52 mrg Exp $
+# $NetBSD: Makefile,v 1.13 1997/10/25 10:12:51 lukem Exp $
# Define FSYNC_ALL to get slower but safer writes in case of crashes in
# the middle of CVS/RCS changes
-CFLAGS+=-DFSYNC_ALL
+CPPFLAGS+=-DFSYNC_ALL
# If you wish to use a different Id token in addition to Id,
# uncomment the following line and edit to taste.
-#CFLAGS+=-DLOCALID=\"Foo\"
+#CPPFLAGS+=-DLOCALID=\"Foo\"
LIB= rcs
SRCS= maketime.c merger.c partime.c rcsedit.c rcsfcmp.c rcsfnms.c rcsgen.c \
diff --git a/gnu/usr.bin/sdiff/Makefile b/gnu/usr.bin/sdiff/Makefile
index b2fc5b79a67..08b6393d04d 100644
--- a/gnu/usr.bin/sdiff/Makefile
+++ b/gnu/usr.bin/sdiff/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 1997/03/24 22:06:49 christos Exp $
+# $NetBSD: Makefile,v 1.8 1997/10/25 10:12:54 lukem Exp $
PROG= sdiff
SRCS= sdiff.c getopt.c getopt1.c version.c
-CFLAGS+= -I$(.CURDIR)/../diff \
+CPPFLAGS+= -I$(.CURDIR)/../diff \
-DHAVE_CONFIG_H -DDIFF_PROGRAM=\"/usr/bin/diff\"
LDADD+= -lgnumalloc
diff --git a/gnu/usr.bin/tar/Makefile b/gnu/usr.bin/tar/Makefile
index 76098a475d4..ff07d8a1b2a 100644
--- a/gnu/usr.bin/tar/Makefile
+++ b/gnu/usr.bin/tar/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.14 1997/03/24 22:06:52 christos Exp $
+# $NetBSD: Makefile,v 1.15 1997/10/25 10:12:56 lukem Exp $
PROG= tar
SRCS= buffer.c create.c diffarch.c extract.c fnmatch.c getdate.y \
getoldopt.c getopt.c getopt1.c gnu.c list.c mangle.c names.c port.c \
regex.c rtapelib.c tar.c update.c version.c
-CFLAGS+= -DRETSIGTYPE=void -DDIRENT=1 -DHAVE_SYS_MTIO_H=1 -DHAVE_UNISTD_H=1
-CFLAGS+= -DHAVE_GETGRGID=1 -DHAVE_GETPWUID=1 -DHAVE_STRING_H=1
-CFLAGS+= -DHAVE_LIMITS_H=1 -DHAVE_STRSTR=1 -DHAVE_VALLOC=1 -DHAVE_MKDIR=1
-CFLAGS+= -DHAVE_MKNOD=1 -DHAVE_RENAME=1 -DHAVE_FTRUNCATE=1 -DHAVE_GETCWD=1
-CFLAGS+= -DHAVE_VPRINTF=1 -DNEEDPAD -I${.CURDIR}
-CFLAGS+= -DDEF_AR_FILE=\"/dev/rst0\" -DDEFBLOCKING=20
-CFLAGS+= -DSTDC_HEADERS
+CPPFLAGS+= -DRETSIGTYPE=void -DDIRENT=1 -DHAVE_SYS_MTIO_H=1 -DHAVE_UNISTD_H=1
+CPPFLAGS+= -DHAVE_GETGRGID=1 -DHAVE_GETPWUID=1 -DHAVE_STRING_H=1
+CPPFLAGS+= -DHAVE_LIMITS_H=1 -DHAVE_STRSTR=1 -DHAVE_VALLOC=1 -DHAVE_MKDIR=1
+CPPFLAGS+= -DHAVE_MKNOD=1 -DHAVE_RENAME=1 -DHAVE_FTRUNCATE=1 -DHAVE_GETCWD=1
+CPPFLAGS+= -DHAVE_VPRINTF=1 -DNEEDPAD -I${.CURDIR}
+CPPFLAGS+= -DDEF_AR_FILE=\"/dev/rst0\" -DDEFBLOCKING=20
+CPPFLAGS+= -DSTDC_HEADERS
LDSTATIC= -static
LDADD+= -lgnumalloc