use CPPFLAGS instead of CFLAGS

1997-10-25 06:57:53 +00:00 · 1997-10-25 06:57:53 +00:00 · 0a94f4f077
commit 0a94f4f077
parent 3dd557ba9c
59 changed files with 151 additions and 153 deletions
--- a/usr.sbin/amd/amd2netbsd
+++ b/usr.sbin/amd/amd2netbsd
@ -1,6 +1,6 @@
 #!/usr/local/bin/perl
 #
-#	$NetBSD: amd2netbsd,v 1.9 1997/10/18 06:42:30 lukem Exp $
+#	$NetBSD: amd2netbsd,v 1.10 1997/10/25 06:57:53 lukem Exp $
 #
 #  Perl script to convert a standard distribution directory for am-utils into
 #	a NetBSD source tree.
@ -332,7 +332,7 @@ all-amd all-amq all-hlfsd all-fixmount all-fsinfo all-mk-amd-map \
 WARNS ?= 1
 LIBAMU != cd ${.CURDIR}/../libamu;\
    printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
-CFLAGS += -I${.CURDIR}/../include -I${.CURDIR} -I${LIBAMU} -I. -DHAVE_CONFIG_H
+CPPFLAGS += -I${.CURDIR}/../include -I${.CURDIR} -I${LIBAMU} -I. -DHAVE_CONFIG_H
 LDADD += -L${LIBAMU} -lamu -lrpcsvc -ll
 DPADD += ${LIBAMU}/libamu.a ${LIBRPCSVC} ${LIBL}

--- a/usr.sbin/bootp/bootpd/Makefile
+++ b/usr.sbin/bootp/bootpd/Makefile
@ -1,9 +1,9 @@
 # bootpd/Makefile
-# $NetBSD: Makefile,v 1.3 1997/10/18 04:36:50 lukem Exp $
+# $NetBSD: Makefile,v 1.4 1997/10/25 06:57:55 lukem Exp $

 WARNS?=	0
 PROG=	bootpd
-CFLAGS+= -DETC_ETHERS -DSYSLOG -DDEBUG -DVEND_CMU
+CPPFLAGS+= -DETC_ETHERS -DSYSLOG -DDEBUG -DVEND_CMU

 SRCS=	bootpd.c dovend.c readfile.c hash.c dumptab.c \
 	 lookup.c getif.c hwaddr.c report.c tzone.c
--- a/usr.sbin/bootpd/Makefile
+++ b/usr.sbin/bootpd/Makefile
@ -1,9 +1,9 @@
 # bootpd/Makefile
-# $NetBSD: Makefile,v 1.3 1997/10/18 04:36:50 lukem Exp $
+# $NetBSD: Makefile,v 1.4 1997/10/25 06:57:55 lukem Exp $

 WARNS?=	0
 PROG=	bootpd
-CFLAGS+= -DETC_ETHERS -DSYSLOG -DDEBUG -DVEND_CMU
+CPPFLAGS+= -DETC_ETHERS -DSYSLOG -DDEBUG -DVEND_CMU

 SRCS=	bootpd.c dovend.c readfile.c hash.c dumptab.c \
 	 lookup.c getif.c hwaddr.c report.c tzone.c
--- a/usr.sbin/bootpef/Makefile
+++ b/usr.sbin/bootpef/Makefile
@ -1,10 +1,10 @@
 # bootpef/Makefile
-# $NetBSD: Makefile,v 1.6 1997/10/18 04:37:09 lukem Exp $
+# $NetBSD: Makefile,v 1.7 1997/10/25 06:57:56 lukem Exp $

 WARNS?=	0
 PROG=	bootpef
 SRCDIR= ${.CURDIR}/../bootpd
-CFLAGS+= -DETC_ETHERS -DDEBUG -I${SRCDIR}
+CPPFLAGS+= -DETC_ETHERS -DDEBUG -I${SRCDIR}
 .PATH: ${SRCDIR}

 SRCS=	bootpef.c dovend.c readfile.c hash.c dumptab.c \
--- a/usr.sbin/bootpgw/Makefile
+++ b/usr.sbin/bootpgw/Makefile
@ -1,10 +1,10 @@
 # bootpgw/Makefile
-# $NetBSD: Makefile,v 1.5 1997/10/18 04:37:11 lukem Exp $
+# $NetBSD: Makefile,v 1.6 1997/10/25 06:57:57 lukem Exp $

 WARNS?=	0
 PROG=	bootpgw
 SRCDIR= ${.CURDIR}/../bootpd
-CFLAGS+= -DSYSLOG -DDEBUG -I${SRCDIR}
+CPPFLAGS+= -DSYSLOG -DDEBUG -I${SRCDIR}
 .PATH: ${SRCDIR}

 SRCS=	bootpgw.c getif.c hwaddr.c report.c
--- a/usr.sbin/bootptest/Makefile
+++ b/usr.sbin/bootptest/Makefile
@ -1,10 +1,10 @@
 # bootptest/Makefile
-# $NetBSD: Makefile,v 1.7 1997/10/18 04:37:15 lukem Exp $
+# $NetBSD: Makefile,v 1.8 1997/10/25 06:57:58 lukem Exp $

 WARNS?=	0
 PROG=	bootptest
 SRCDIR= ${.CURDIR}/../bootpd
-CFLAGS+= -I${SRCDIR}
+CPPFLAGS+= -I${SRCDIR}
 .PATH: ${SRCDIR}

 SRCS=	bootptest.c print-bootp.c getif.c getether.c report.c
--- a/usr.sbin/dhcp/Makefile.inc
+++ b/usr.sbin/dhcp/Makefile.inc
@ -37,7 +37,7 @@ WARNS?=	0
 COBJDIR!=cd $(.CURDIR)/../common; \
 	printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-

-CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../includes
+CPPFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../includes
 LDADD=  ${COBJDIR}/libdhcp.a          
 DPADD=  ${COBJDIR}/libdhcp.a          

--- a/usr.sbin/grfconfig/Makefile
+++ b/usr.sbin/grfconfig/Makefile
@ -1,8 +1,8 @@
-#   $NetBSD: Makefile,v 1.4 1997/10/17 05:58:23 lukem Exp $
+#   $NetBSD: Makefile,v 1.5 1997/10/25 06:58:00 lukem Exp $

 .if ${MACHINE} == "amiga"
 PROG=		grfconfig
-CFLAGS+=	-I${.CURDIR}/../../sys/arch -D${MACHINE}
+CPPFLAGS+=	-I${.CURDIR}/../../sys/arch -D${MACHINE}
 .endif

 MAN=	grfconfig.8
--- a/usr.sbin/grfinfo/Makefile
+++ b/usr.sbin/grfinfo/Makefile
@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.4 1997/06/23 04:51:26 mrg Exp $
+#	$NetBSD: Makefile,v 1.5 1997/10/25 06:58:02 lukem Exp $

 .if ${MACHINE} == "hp300"
 PROG=	grfinfo
-CFLAGS+= -I${.CURDIR}/../../sys/arch/hp300
+CPPFLAGS+= -I${.CURDIR}/../../sys/arch/hp300
 .endif

 MAN=	grfinfo.1
--- a/usr.sbin/gspa/gspa/Makefile
+++ b/usr.sbin/gspa/gspa/Makefile
@ -1,7 +1,7 @@
-#	$NetBSD: Makefile,v 1.3 1996/02/06 18:30:58 jtc Exp $
+#	$NetBSD: Makefile,v 1.4 1997/10/25 06:58:03 lukem Exp $

 PROG=	gspa
-CFLAGS+=-I. -I${.CURDIR}
+CPPFLAGS+=-I. -I${.CURDIR}
 HDRS=	gsp_ass.h gsp_code.h
 SRCS=	gspa.c gsp_out.c gsp_sym.c gsp_lex.c gsp_act.c gsp_eval.c \
 	gsp_inst.c gsp_pseu.c gsp_gram.c
--- a/usr.sbin/hilinfo/Makefile
+++ b/usr.sbin/hilinfo/Makefile
@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.3 1997/06/24 07:55:11 mikel Exp $
+#	$NetBSD: Makefile,v 1.4 1997/10/25 06:58:04 lukem Exp $

 .if ${MACHINE} == "hp300"
 PROG=	hilinfo
-CFLAGS+= -I${.CURDIR}/../../sys/arch/hp300
+CPPFLAGS+= -I${.CURDIR}/../../sys/arch/hp300
 .else
 NOOBJ=
 .endif
--- a/usr.sbin/htable/Makefile
+++ b/usr.sbin/htable/Makefile
@ -1,11 +1,10 @@
 #	from: @(#)Makefile	5.12 (Berkeley) 7/1/90
-#	$NetBSD: Makefile,v 1.5 1997/10/17 08:00:23 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 1997/10/25 06:58:05 lukem Exp $

 PROG=	htable
 SRCS=	htable.c parse.c scan.c
 MAN=	htable.8
-CFLAGS+=-I. -I${.CURDIR}
-CPPFLAGS+=-DYY_NO_UNPUT
+CPPFLAGS+=-DYY_NO_UNPUT -I. -I${.CURDIR}
 LDADD+=	-ll
 DPADD+=	${LIBL}
 CLEANFILES+=parse.c scan.c y.tab.h
--- a/usr.sbin/inetd/Makefile
+++ b/usr.sbin/inetd/Makefile
@ -1,13 +1,13 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$NetBSD: Makefile,v 1.13 1997/10/18 06:42:49 lukem Exp $
+#	$NetBSD: Makefile,v 1.14 1997/10/25 06:58:06 lukem Exp $

 PROG=	inetd
 MAN=	inetd.8
 MLINKS=	inetd.8 inetd.conf.5

-CFLAGS+=-DLIBWRAP
+CPPFLAGS+=-DLIBWRAP
 # Use LIBWRAP_INTERNAL for libwrap checking of inetd's `internal' services.
-#CFLAGS+=-DLIBWRAP_INTERNAL
+#CPPFLAGS+=-DLIBWRAP_INTERNAL
 LDADD+= -lwrap
 DPADD+= ${LIBWRAP}

--- a/usr.sbin/iostat/Makefile
+++ b/usr.sbin/iostat/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 1997/05/08 21:12:14 gwr Exp $
+#	$NetBSD: Makefile,v 1.16 1997/10/25 06:58:07 lukem Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93

 PROG=	iostat
@ -6,7 +6,7 @@ MAN=	iostat.8

 .PATH:	${.CURDIR}/../../usr.bin/vmstat

-CFLAGS+=-I${.CURDIR}/../../usr.bin/vmstat
+CPPFLAGS+=-I${.CURDIR}/../../usr.bin/vmstat

 # dkstats.c pulled in from ../../usr.bin/vmstat
 SRCS=	dkstats.c iostat.c
--- a/usr.sbin/ipf/ipfilter2netbsd
+++ b/usr.sbin/ipf/ipfilter2netbsd
@ -1,6 +1,6 @@
 #! /bin/sh
 #
-#	$NetBSD: ipfilter2netbsd,v 1.10 1997/09/21 16:34:31 veego Exp $
+#	$NetBSD: ipfilter2netbsd,v 1.11 1997/10/25 06:58:08 lukem Exp $
 #
 # Copyright (c) 1996 Matthew R. Green
 # All rights reserved.
@ -67,7 +67,7 @@ cd $d/src/usr.sbin/ipf

 echo creating main Makefile
 cat > Makefile<<'__eof_makefile'
-#	$NetBSD: ipfilter2netbsd,v 1.10 1997/09/21 16:34:31 veego Exp $
+#	$NetBSD: ipfilter2netbsd,v 1.11 1997/10/25 06:58:08 lukem Exp $

 SUBDIR=		ipf ipfstat ipmon ipnat ipftest ipsend iptest
 .if make(install)
@ -83,7 +83,7 @@ cd $d/src/usr.sbin/ipf

 echo creating main Makefile.inc
 cat > Makefile.inc<<'__eof_makefile'
-#	$NetBSD: ipfilter2netbsd,v 1.10 1997/09/21 16:34:31 veego Exp $
+#	$NetBSD: ipfilter2netbsd,v 1.11 1997/10/25 06:58:08 lukem Exp $

 WARNS?=	1

@ -105,7 +105,7 @@ mv ipf.1 ipf.8

 echo creating Makefile
 cat > Makefile<<'__eof_makefile'
-#	$NetBSD: ipfilter2netbsd,v 1.10 1997/09/21 16:34:31 veego Exp $
+#	$NetBSD: ipfilter2netbsd,v 1.11 1997/10/25 06:58:08 lukem Exp $

 PROG=	ipf
 SRCS=	ipf.c parse.c opt.c
@ -132,12 +132,12 @@ cd $d/src/usr.sbin/ipf/ipfstat

 echo creating Makefile
 cat > Makefile<<'__eof_makefile'
-#	$NetBSD: ipfilter2netbsd,v 1.10 1997/09/21 16:34:31 veego Exp $
+#	$NetBSD: ipfilter2netbsd,v 1.11 1997/10/25 06:58:08 lukem Exp $

 PROG=	ipfstat
 SRCS=	kmem.c fils.c opt.c parse.c
 MAN=	ipfstat.8
-CFLAGS+=-I${.CURDIR}/../ipf
+CPPFLAGS+=-I${.CURDIR}/../ipf

 .PATH: ${.CURDIR}/../ipf
 .include <bsd.prog.mk>
@ -156,12 +156,12 @@ cd $d/src/usr.sbin/ipf/ipftest

 echo creating Makefile
 cat > Makefile<<'__eof_makefile'
-#	$NetBSD: ipfilter2netbsd,v 1.10 1997/09/21 16:34:31 veego Exp $
+#	$NetBSD: ipfilter2netbsd,v 1.11 1997/10/25 06:58:08 lukem Exp $

 PROG=	ipftest
 SRCS=	ipt.c ipft_sn.c ipft_ef.c ipft_td.c ipft_pc.c opt.c ipft_tx.c misc.c ip_frag.c ip_state.c ip_nat.c ipft_hx.c ip_fil.c fil.c parse.c ip_proxy.c ip_auth.c
 NOMAN=	yes
-CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../ipf
+CPPFLAGS+=-I${.CURDIR} -I${.CURDIR}/../ipf

 .PATH: ${.CURDIR}/../ipf ${.CURDIR}/../../../sys/netinet
 .include <bsd.prog.mk>
@ -181,11 +181,11 @@ cd $d/src/usr.sbin/ipf/ipmon

 echo creating Makefile
 cat > Makefile<<'__eof_makefile'
-#	$NetBSD: ipfilter2netbsd,v 1.10 1997/09/21 16:34:31 veego Exp $
+#	$NetBSD: ipfilter2netbsd,v 1.11 1997/10/25 06:58:08 lukem Exp $

 PROG=	ipmon
 MAN=	ipmon.8
-CFLAGS+=-DLOGFAC=LOG_LOCAL0 -I${.CURDIR}/../ipf
+CPPFLAGS+=-DLOGFAC=LOG_LOCAL0 -I${.CURDIR}/../ipf

 .PATH: ${.CURDIR}/../ipf
 .include <bsd.prog.mk>
@ -206,13 +206,13 @@ mv ipnat.1 ipnat.8

 echo creating Makefile
 cat > Makefile<<'__eof_makefile'
-#	$NetBSD: ipfilter2netbsd,v 1.10 1997/09/21 16:34:31 veego Exp $
+#	$NetBSD: ipfilter2netbsd,v 1.11 1997/10/25 06:58:08 lukem Exp $

 PROG=	ipnat
 SRCS=	kmem.c ipnat.c
 MAN=	ipnat.8 ipnat.4 ipnat.5
 MLINKS=	ipnat.5 ipnat.conf.5
-CFLAGS+=-I${.CURDIR}/../ipf -I${.CURDIR}/../ipfstat
+CPPFLAGS+=-I${.CURDIR}/../ipf -I${.CURDIR}/../ipfstat

 .PATH: ${.CURDIR}/../ipf ${.CURDIR}/../ipfstat
 .include <bsd.prog.mk>
@ -231,12 +231,12 @@ cd $d/src/usr.sbin/ipf/ipresend

 echo creating Makefile
 cat > Makefile<<'__eof_makefile'
-#	$NetBSD: ipfilter2netbsd,v 1.10 1997/09/21 16:34:31 veego Exp $
+#	$NetBSD: ipfilter2netbsd,v 1.11 1997/10/25 06:58:08 lukem Exp $

 PROG=	ipresend
 SRCS=	ipresend.c ip.c resend.c opt.c ipft_ef.c ipft_hx.c ipft_sn.c ipft_td.c ipft_tx.c sbpf.c 44arp.c
 MAN=	ipresend.1
-CFLAGS+=-I${.CURDIR}/../ipfstat -I${.CURDIR}/../ipsend -I${.CURDIR}/../ipftest -I${.CURDIR}/../ipf
+CPPFLAGS+=-I${.CURDIR}/../ipfstat -I${.CURDIR}/../ipsend -I${.CURDIR}/../ipftest -I${.CURDIR}/../ipf

 .PATH: ${.CURDIR}/../ipf ${.CURDIR}/../ipfstat ${.CURDIR}/../ipsend ${.CURDIR}/../ipftest
 .include <bsd.prog.mk>
@ -258,11 +258,11 @@ cd $d/src/usr.sbin/ipf/ipsend

 echo creating Makefile
 cat > Makefile<<'__eof_makefile'
-#	$NetBSD: ipfilter2netbsd,v 1.10 1997/09/21 16:34:31 veego Exp $
+#	$NetBSD: ipfilter2netbsd,v 1.11 1997/10/25 06:58:08 lukem Exp $

 PROG=	ipsend
 SRCS=	ipsend.c ip.c ipsopt.c 44arp.c sbpf.c iplang_l.l iplang_y.y
-CFLAGS+=-I${.CURDIR}/../ipftest -I${.CURDIR}/../ipf -I.
+CPPFLAGS+=-I${.CURDIR}/../ipftest -I${.CURDIR}/../ipf -I.
 LDADD=	-ll
 DPADD=	${LIBL}

@ -287,12 +287,12 @@ cd $d/src/usr.sbin/ipf/iptest

 echo creating Makefile
 cat > Makefile<<'__eof_makefile'
-#	$NetBSD: ipfilter2netbsd,v 1.10 1997/09/21 16:34:31 veego Exp $
+#	$NetBSD: ipfilter2netbsd,v 1.11 1997/10/25 06:58:08 lukem Exp $

 PROG=	iptest
 SRCS=	iptest.c iptests.c ip.c sbpf.c 44arp.c sock.c
 MAN=	iptest.1
-CFLAGS+=-I${.CURDIR}/../ipsend -I${.CURDIR}/../ipftest -I${.CURDIR}/../ipf
+CPPFLAGS+=-I${.CURDIR}/../ipsend -I${.CURDIR}/../ipftest -I${.CURDIR}/../ipf

 .PATH: ${.CURDIR}/../ipf ${.CURDIR}/../ipsend
 .include <bsd.prog.mk>
@ -309,7 +309,7 @@ cd $d/src/usr.sbin/ipf/rules

 echo creating Makefile
 cat > Makefile<<'__eof_makefile'
-#	$NetBSD: ipfilter2netbsd,v 1.10 1997/09/21 16:34:31 veego Exp $
+#	$NetBSD: ipfilter2netbsd,v 1.11 1997/10/25 06:58:08 lukem Exp $

 FILESDIR= /usr/share/samples/ipf

@ -343,7 +343,7 @@ cd $d/src/sys/lkm/netinet/if_ipl

 echo creating Makefile
 cat > Makefile<<'__eof_makefile'
-#	$NetBSD: ipfilter2netbsd,v 1.10 1997/09/21 16:34:31 veego Exp $
+#	$NetBSD: ipfilter2netbsd,v 1.11 1997/10/25 06:58:08 lukem Exp $

 .include "../Makefile.inc"

@ -370,7 +370,7 @@ find $d -name '*.[chly]' -print | while read c; do
 	< $c > /tmp/ipf2n$$ && mv /tmp/ipf2n$$ $c && echo transformed $c
 	sed 1q < $c | grep '\$NetBSD' || (
 cat <<'__eof_header'
-/*	$NetBSD: ipfilter2netbsd,v 1.10 1997/09/21 16:34:31 veego Exp $	*/
+/*	$NetBSD: ipfilter2netbsd,v 1.11 1997/10/25 06:58:08 lukem Exp $	*/

 __eof_header
 cat $c
--- a/usr.sbin/ipf/ipfstat/Makefile
+++ b/usr.sbin/ipf/ipfstat/Makefile
@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.10 1997/09/21 18:01:10 veego Exp $
+#	$NetBSD: Makefile,v 1.11 1997/10/25 06:58:09 lukem Exp $

 PROG=	ipfstat
 SRCS=	kmem.c fils.c opt.c parse.c
 MAN=	ipfstat.8
-CFLAGS+=-I${.CURDIR}/../ipf
+CPPFLAGS+=-I${.CURDIR}/../ipf

 .PATH: ${.CURDIR}/../ipf
 .include <bsd.prog.mk>
--- a/usr.sbin/ipf/ipftest/Makefile
+++ b/usr.sbin/ipf/ipftest/Makefile
@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.11 1997/09/21 18:01:40 veego Exp $
+#	$NetBSD: Makefile,v 1.12 1997/10/25 06:58:10 lukem Exp $

 PROG=	ipftest
 SRCS=	ipt.c ipft_sn.c ipft_ef.c ipft_td.c ipft_pc.c opt.c ipft_tx.c misc.c ip_frag.c ip_state.c ip_nat.c ipft_hx.c ip_fil.c fil.c parse.c ip_proxy.c ip_auth.c
 NOMAN=	yes
-CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../ipf
+CPPFLAGS+=-I${.CURDIR} -I${.CURDIR}/../ipf

 .PATH: ${.CURDIR}/../ipf ${.CURDIR}/../../../sys/netinet
 .include <bsd.prog.mk>
--- a/usr.sbin/ipf/ipmon/Makefile
+++ b/usr.sbin/ipf/ipmon/Makefile
@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.12 1997/09/21 18:01:47 veego Exp $
+#	$NetBSD: Makefile,v 1.13 1997/10/25 06:58:11 lukem Exp $

 PROG=	ipmon
 MAN=	ipmon.8
-CFLAGS+=-DLOGFAC=LOG_LOCAL0 -I${.CURDIR}/../ipf
+CPPFLAGS+=-DLOGFAC=LOG_LOCAL0 -I${.CURDIR}/../ipf

 .PATH: ${.CURDIR}/../ipf
 .include <bsd.prog.mk>
--- a/usr.sbin/ipf/ipnat/Makefile
+++ b/usr.sbin/ipf/ipnat/Makefile
@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.10 1997/09/21 18:01:53 veego Exp $
+#	$NetBSD: Makefile,v 1.11 1997/10/25 06:58:13 lukem Exp $

 PROG=	ipnat
 SRCS=	kmem.c ipnat.c
 MAN=	ipnat.8 ipnat.4 ipnat.5
 MLINKS=	ipnat.5 ipnat.conf.5
-CFLAGS+=-I${.CURDIR}/../ipf -I${.CURDIR}/../ipfstat
+CPPFLAGS+=-I${.CURDIR}/../ipf -I${.CURDIR}/../ipfstat

 .PATH: ${.CURDIR}/../ipf ${.CURDIR}/../ipfstat
 .include <bsd.prog.mk>
--- a/usr.sbin/ipf/ipresend/Makefile
+++ b/usr.sbin/ipf/ipresend/Makefile
@ -1,9 +1,11 @@
-#	$NetBSD: Makefile,v 1.10 1997/09/21 18:01:59 veego Exp $
+#	$NetBSD: Makefile,v 1.11 1997/10/25 06:58:15 lukem Exp $

 PROG=	ipresend
 SRCS=	ipresend.c ip.c resend.c opt.c ipft_ef.c ipft_hx.c ipft_sn.c ipft_td.c ipft_tx.c sbpf.c 44arp.c
 MAN=	ipresend.1
-CFLAGS+=-I${.CURDIR}/../ipfstat -I${.CURDIR}/../ipsend -I${.CURDIR}/../ipftest -I${.CURDIR}/../ipf
+CPPFLAGS+=-I${.CURDIR}/../ipf -I${.CURDIR}/../ipfstat
+CPPFLAGS+=-I${.CURDIR}/../ipsend -I${.CURDIR}/../ipftest

-.PATH: ${.CURDIR}/../ipf ${.CURDIR}/../ipfstat ${.CURDIR}/../ipsend ${.CURDIR}/../ipftest
+.PATH: ${.CURDIR}/../ipf ${.CURDIR}/../ipfstat
+.PATH: ${.CURDIR}/../ipsend ${.CURDIR}/../ipftest
 .include <bsd.prog.mk>
--- a/usr.sbin/ipf/ipsend/Makefile
+++ b/usr.sbin/ipf/ipsend/Makefile
@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.9 1997/09/21 18:02:04 veego Exp $
+#	$NetBSD: Makefile,v 1.10 1997/10/25 06:58:16 lukem Exp $

 PROG=	ipsend
 SRCS=	ipsend.c ip.c ipsopt.c 44arp.c sbpf.c iplang_l.l iplang_y.y
-CFLAGS+=-I${.CURDIR}/../ipftest -I${.CURDIR}/../ipf -I.
+CPPFLAGS+=-I${.CURDIR}/../ipftest -I${.CURDIR}/../ipf -I.
 LDADD=	-ll
 DPADD=	${LIBL}

--- a/usr.sbin/ipf/iptest/Makefile
+++ b/usr.sbin/ipf/iptest/Makefile
@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.10 1997/09/21 18:02:19 veego Exp $
+#	$NetBSD: Makefile,v 1.11 1997/10/25 06:58:17 lukem Exp $

 PROG=	iptest
 SRCS=	iptest.c iptests.c ip.c sbpf.c 44arp.c sock.c
 MAN=	iptest.1
-CFLAGS+=-I${.CURDIR}/../ipsend -I${.CURDIR}/../ipftest -I${.CURDIR}/../ipf
+CPPFLAGS+=-I${.CURDIR}/../ipsend -I${.CURDIR}/../ipftest -I${.CURDIR}/../ipf

 .PATH: ${.CURDIR}/../ipf ${.CURDIR}/../ipsend
 .include <bsd.prog.mk>
--- a/usr.sbin/iteconfig/Makefile
+++ b/usr.sbin/iteconfig/Makefile
@ -1,8 +1,8 @@
-#   $NetBSD: Makefile,v 1.5 1997/06/23 14:15:33 mrg Exp $
+#   $NetBSD: Makefile,v 1.6 1997/10/25 06:58:18 lukem Exp $

 .if ${MACHINE} == "atari" || ${MACHINE} == "amiga"
 PROG=iteconfig
-CFLAGS+=-I${.CURDIR}/../../sys/arch -D${MACHINE}
+CPPFLAGS+=-I${.CURDIR}/../../sys/arch -D${MACHINE}
 .endif

 MAN=	iteconfig.8
--- a/usr.sbin/lpr/Makefile.inc
+++ b/usr.sbin/lpr/Makefile.inc
@ -1,8 +1,8 @@
-#	$NetBSD: Makefile.inc,v 1.3 1997/10/18 06:42:51 lukem Exp $
+#	$NetBSD: Makefile.inc,v 1.4 1997/10/25 06:58:19 lukem Exp $

 LIBCOMMON != cd ${.CURDIR}/../common_source;\
    printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
-CFLAGS+=-I${.CURDIR}/../common_source
+CPPFLAGS+=-I${.CURDIR}/../common_source
 DPADD+=	${LIBCOMMON}/libcommon.a
 LDADD+=	-L${LIBCOMMON} -lcommon

--- a/usr.sbin/map-mbone/Makefile
+++ b/usr.sbin/map-mbone/Makefile
@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.4 1997/05/08 21:12:30 gwr Exp $
+#	$NetBSD: Makefile,v 1.5 1997/10/25 06:58:20 lukem Exp $
 #	from: Id: Makefile,v 1.5 1993/06/24 05:11:16 deering Exp

 .PATH: ${.CURDIR}/../mrouted
-CFLAGS+= -I${.CURDIR}/../mrouted
+CPPFLAGS+= -I${.CURDIR}/../mrouted

 PROG=	map-mbone
 SRCS=	igmp.c inet.c kern.c mapper.c
--- a/usr.sbin/mopd/Makefile.inc
+++ b/usr.sbin/mopd/Makefile.inc
@ -1,8 +1,8 @@
-#	$NetBSD: Makefile.inc,v 1.7 1997/10/18 06:42:52 lukem Exp $
+#	$NetBSD: Makefile.inc,v 1.8 1997/10/25 06:58:22 lukem Exp $

 LIBCOMMON != cd ${.CURDIR}/../common;\
    printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
-CFLAGS+=-I${.CURDIR}/../common
+CPPFLAGS+=-I${.CURDIR}/../common
 DPADD+=	${LIBKVM} ${LIBCOMMON}/libcommon.a
 LDADD+=	-lkvm -L${LIBCOMMON} -lcommon

--- a/usr.sbin/mrinfo/Makefile
+++ b/usr.sbin/mrinfo/Makefile
@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.5 1997/05/08 21:12:31 gwr Exp $
+#	$NetBSD: Makefile,v 1.6 1997/10/25 06:58:23 lukem Exp $
 #	from: Id: Makefile,v 1.5 1993/06/24 05:11:16 deering Exp

 .PATH: ${.CURDIR}/../mrouted
-CFLAGS+= -I${.CURDIR}/../mrouted
+CPPFLAGS+= -I${.CURDIR}/../mrouted

 PROG=	mrinfo
 SRCS=	igmp.c inet.c kern.c mrinfo.c
--- a/usr.sbin/mtrace/Makefile
+++ b/usr.sbin/mtrace/Makefile
@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.5 1997/05/08 21:12:32 gwr Exp $
+#	$NetBSD: Makefile,v 1.6 1997/10/25 06:58:24 lukem Exp $
 #	from: Id: Makefile,v 1.5 1993/06/24 05:11:16 deering Exp

 .PATH: ${.CURDIR}/../mrouted
-CFLAGS+= -I${.CURDIR}/../mrouted
+CPPFLAGS+= -I${.CURDIR}/../mrouted

 PROG=	mtrace
 SRCS=	igmp.c inet.c kern.c mtrace.c
--- a/usr.sbin/mtree/Makefile
+++ b/usr.sbin/mtree/Makefile
@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.11 1997/10/17 05:24:29 mrg Exp $
+#	$NetBSD: Makefile,v 1.12 1997/10/25 06:58:25 lukem Exp $
 #	from: @(#)Makefile	8.2 (Berkeley) 4/27/95

 PROG=	mtree
-#CFLAGS+=-DDEBUG
+#CPPFLAGS+=-DDEBUG
 MAN=	mtree.8
 SRCS=	compare.c crc.c create.c misc.c mtree.c spec.c verify.c
 .PATH:	${.CURDIR}/../../usr.bin/cksum
--- a/usr.sbin/named/dig/Makefile
+++ b/usr.sbin/named/dig/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 1997/07/23 04:12:37 mrg Exp $
+#	$NetBSD: Makefile,v 1.8 1997/10/25 06:58:26 lukem Exp $
 # from: $Id: Makefile,v 8.1 1994/12/15 06:23:45 vixie Exp 

 .PATH:	${.CURDIR}/../nslookup \
@ -8,7 +8,7 @@
 PROG=	dig
 SRCS=	dig.c list.c subr.c debug.c send.c  gethnamaddr.c res_init.c \
 	res_mkquery.c res_query.c res_send.c
-CFLAGS+=	-I${.CURDIR}/.. -I${.CURDIR}/../../../lib/libc/include -DDEBUG
+CPPFLAGS+=	-I${.CURDIR}/.. -I${.CURDIR}/../../../lib/libc/include -DDEBUG

 .include "../../Makefile.inc"
 .include <bsd.prog.mk>
--- a/usr.sbin/named/named-xfer/Makefile
+++ b/usr.sbin/named/named-xfer/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 1997/05/08 21:12:38 gwr Exp $
+#	$NetBSD: Makefile,v 1.7 1997/10/25 06:58:27 lukem Exp $
 # from: $Id: Makefile,v 8.2 1995/12/31 23:28:01 vixie Exp 

 .PATH:	${.CURDIR}/../named \
@ -6,7 +6,7 @@

 PROG=	named-xfer
 SRCS=	named-xfer.c db_glue.c storage.c version.c
-CFLAGS+=	-I${.CURDIR}/../named
+CPPFLAGS+=	-I${.CURDIR}/../named
 MAN=	named-xfer.8
 BINDIR=	/usr/libexec

--- a/usr.sbin/named/nslookup/Makefile
+++ b/usr.sbin/named/nslookup/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 1997/05/08 21:12:41 gwr Exp $
+#	$NetBSD: Makefile,v 1.7 1997/10/25 06:58:28 lukem Exp $
 # from: $Id: Makefile,v 8.1 1994/12/15 06:23:48 vixie Exp 

 .PATH:	${.CURDIR}/../nslookup \
@ -6,7 +6,7 @@

 PROG=	nslookup
 SRCS=	main.c getinfo.c debug.c send.c skip.c list.c subr.c commands.l
-CFLAGS+= ${INCLUDE}
+CPPFLAGS+= ${INCLUDE}
 DPADD=	${LIBL}
 LDADD=	-ll
 CLEANFILES+=	commands.c lex.yy.c lex.yy.o
--- a/usr.sbin/pkg_install/Makefile.inc
+++ b/usr.sbin/pkg_install/Makefile.inc
@ -1,10 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.4 1997/10/17 14:53:18 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.5 1997/10/25 06:58:29 lukem Exp $
 # Original from Freebsd, no rcs id.

 LIBINSTALL != cd ${.CURDIR}/../lib;\
    printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
-CFLAGS+=-I${.CURDIR}/../lib
-CPPFLAGS+=${DEBUG}
+CPPFLAGS+=-I${.CURDIR}/../lib ${DEBUG}
 DPADD+=	${LIBINSTALL}/libinstall.a
 LDADD+=	-L${LIBINSTALL} -linstall

--- a/usr.sbin/pppd/pppd/Makefile
+++ b/usr.sbin/pppd/pppd/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.21 1997/10/17 12:07:39 lukem Exp $
+#	$NetBSD: Makefile,v 1.22 1997/10/25 06:58:30 lukem Exp $

 PCAPDIR=${.CURDIR}/../../../lib/libpcap

@ -13,6 +13,6 @@ BINOWN=	root

 LDADD=	-lpcap -lcrypt -lutil
 DPADD=	${LIBPCAP} ${LIBCRYPT} ${LIBUTIL}
-CFLAGS+= -I. -DHAVE_PATHS_H -I${PCAPDIR} -DPPP_FILTER -DCBCP_SUPPORT
+CPPFLAGS+= -I. -DHAVE_PATHS_H -I${PCAPDIR} -DPPP_FILTER -DCBCP_SUPPORT

 .include <bsd.prog.mk>
--- a/usr.sbin/pstat/Makefile
+++ b/usr.sbin/pstat/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 1997/07/14 08:33:35 thorpej Exp $
+#	$NetBSD: Makefile,v 1.8 1997/10/25 06:58:31 lukem Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93

 SRCS=	pstat.c swaplist.c
@ -9,7 +9,7 @@ BINMODE=2555
 DPADD=	${LIBKVM}
 LDADD=	-lkvm

-CFLAGS+=-I${.CURDIR}/../../sbin/swapctl
+CPPFLAGS+=-I${.CURDIR}/../../sbin/swapctl

 .PATH: ${.CURDIR}/../../sbin/swapctl

--- a/usr.sbin/pwd_mkdb/Makefile
+++ b/usr.sbin/pwd_mkdb/Makefile
@ -1,16 +1,16 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$NetBSD: Makefile,v 1.11 1997/10/18 04:37:49 lukem Exp $
+#	$NetBSD: Makefile,v 1.12 1997/10/25 06:58:32 lukem Exp $

 PROG=	pwd_mkdb
 SRCS=	pwd_mkdb.c getpwent.c
 MAN=	pwd_mkdb.8
 LDADD+=	-lutil
 DPADD+=	${LIBUTIL}
-CFLAGS+=	-I${.CURDIR}/../../lib/libc/include
+CPPFLAGS+=	-I${.CURDIR}/../../lib/libc/include

 .PATH:	${.CURDIR}/../../lib/libc/gen

 .include <bsd.prog.mk>

 getpwent.o: getpwent.c
-	${CC} ${CFLAGS} ${CPPFLAGS} -UYP -c ${.IMPSRC}
+	${COMPILE.c} -UYP ${.IMPSRC}
--- a/usr.sbin/quotacheck/Makefile
+++ b/usr.sbin/quotacheck/Makefile
@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.12 1997/10/18 06:42:54 lukem Exp $
+#	$NetBSD: Makefile,v 1.13 1997/10/25 06:58:34 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93

 PROG=	quotacheck
 SRCS=	quotacheck.c fsutil.c preen.c
 MAN=	quotacheck.8
-CFLAGS+=-I${.CURDIR}/../../sbin/fsck
+CPPFLAGS+=-I${.CURDIR}/../../sbin/fsck
 .PATH:	${.CURDIR}/../../sbin/fsck

 .include <bsd.prog.mk>
--- a/usr.sbin/rarpd/Makefile
+++ b/usr.sbin/rarpd/Makefile
@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.5 1997/06/21 14:23:57 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 1997/10/25 06:58:35 lukem Exp $

 PROG=	rarpd
 MAN=	rarpd.8

 # Uncomment the following to require a boot file in TFTP_DIR
 # to exist for a rarp reply to be sent.
-# CFLAGS+=-DREQUIRE_TFTPBOOT -DTFTP_DIR=\"/tftpboot\"
+# CPPFLAGS+=-DREQUIRE_TFTPBOOT -DTFTP_DIR=\"/tftpboot\"


 .include <bsd.prog.mk>
--- a/usr.sbin/rpc.bootparamd/Makefile
+++ b/usr.sbin/rpc.bootparamd/Makefile
@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.14 1997/10/17 15:59:05 lukem Exp $
+#	$NetBSD: Makefile,v 1.15 1997/10/25 06:58:36 lukem Exp $

 PROG=	rpc.bootparamd
 SRCS=	bootparamd.c bootparam_prot_svc.c
 MAN=	bootparams.5 rpc.bootparamd.8
 MLINKS=	rpc.bootparamd.8 bootparamd.8
-CFLAGS+=-DYP
+CPPFLAGS+=-DYP

 DPADD=	${LIBRPCSVC}
 LDADD=	-lrpcsvc
--- a/usr.sbin/rpc.lockd/Makefile
+++ b/usr.sbin/rpc.lockd/Makefile
@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.5 1997/10/18 04:01:10 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 1997/10/25 06:58:37 lukem Exp $

 PROG=	rpc.lockd
 SRCS=	nlm_prot_svc.c lockd.c lock_proc.c
 MAN=	rpc.lockd.8
 MLINKS=	rpc.lockd.8 lockd.8

-CFLAGS+= -I.
+CPPFLAGS+= -I.

 DPADD=	${LIBRPCSVC}
 LDADD=	-lrpcsvc
--- a/usr.sbin/rpc.pcnfsd/Makefile
+++ b/usr.sbin/rpc.pcnfsd/Makefile
@ -1,10 +1,9 @@
-#	$NetBSD: Makefile,v 1.5 1997/10/18 06:42:55 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 1997/10/25 06:58:38 lukem Exp $

-WARNS?=	0
 PROG=	rpc.pcnfsd
 MAN=	pcnfsd.8
 MLINKS= pcnfsd.8 rpc.pcnfsd.8
-CFLAGS += -DUSER_CACHE -DWTMP -DUSE_YP -I${.OBJDIR}
+CPPFLAGS += -DUSER_CACHE -DWTMP -DUSE_YP -I${.OBJDIR}

 SRCS=	pcnfsd_v1.c pcnfsd_v2.c pcnfsd_misc.c \
 	pcnfsd_cache.c pcnfsd_print.c pcnfsd_svc.c pcnfsd_xdr.c
--- a/usr.sbin/rpc.pcnfsd/Makefile.clnt
+++ b/usr.sbin/rpc.pcnfsd/Makefile.clnt
@ -1,8 +1,8 @@
-#	$NetBSD: Makefile.clnt,v 1.3 1995/07/25 22:20:19 gwr Exp $
+#	$NetBSD: Makefile.clnt,v 1.4 1997/10/25 06:58:39 lukem Exp $

 #	This Makefile builds a client used for testing.

-CFLAGS += -DUSER_CACHE -DWTMP -DUSE_YP -I${.OBJDIR}
+CPPFLAGS += -DUSER_CACHE -DWTMP -DUSE_YP -I${.OBJDIR}

 PROG=	clnt.pcnfsd
 SRCS=	pcnfsd_test.c pcnfsd_clnt.c pcnfsd_xdr.c
--- a/usr.sbin/rpc.statd/Makefile
+++ b/usr.sbin/rpc.statd/Makefile
@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.5 1997/10/17 16:02:51 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 1997/10/25 06:58:40 lukem Exp $

 PROG=	rpc.statd
 SRCS=	sm_inter_svc.c statd.c stat_proc.c
 MAN=	rpc.statd.8
 MLINKS=	rpc.statd.8 statd.8

-CFLAGS+= -I.
+CPPFLAGS+= -I.

 DPADD=	${LIBRPCSVC}
 LDADD=	-lrpcsvc
--- a/usr.sbin/sendmail/mailstats/Makefile
+++ b/usr.sbin/sendmail/mailstats/Makefile
@ -2,6 +2,6 @@

 PROG=	mailstats
 MAN=	mailstats.8
-CFLAGS+=-I${.CURDIR}/../src
+CPPFLAGS+=-I${.CURDIR}/../src

 .include <bsd.prog.mk>
--- a/usr.sbin/sendmail/makemap/Makefile
+++ b/usr.sbin/sendmail/makemap/Makefile
@ -2,7 +2,7 @@

 PROG=	makemap
 MAN=	makemap.8
-CFLAGS+=-I${.CURDIR}/../src -DNEWDB -DNOT_SENDMAIL
+CPPFLAGS+=-I${.CURDIR}/../src -DNEWDB -DNOT_SENDMAIL

 SRCS=	makemap.c safefile.c

--- a/usr.sbin/sendmail/praliases/Makefile
+++ b/usr.sbin/sendmail/praliases/Makefile
@ -2,6 +2,6 @@

 PROG=	praliases
 MAN=	praliases.8
-CFLAGS+=-I${.CURDIR}/../src
+CPPFLAGS+=-I${.CURDIR}/../src

 .include <bsd.prog.mk>
--- a/usr.sbin/sendmail/smrsh/Makefile
+++ b/usr.sbin/sendmail/smrsh/Makefile
@ -3,7 +3,7 @@
 BINDIR=	/usr/libexec
 PROG=	smrsh
 MAN=	smrsh.8
-CFLAGS+=-I${.CURDIR}/../src -DNDBM -DNEWDB
-CFLAGS+=-DCMDDIR=\"/usr/libexec/sm.bin\"
+CPPFLAGS+=-I${.CURDIR}/../src -DNDBM -DNEWDB
+CPPFLAGS+=-DCMDDIR=\"/usr/libexec/sm.bin\"

 .include <bsd.prog.mk>
--- a/usr.sbin/sendmail/src/Makefile
+++ b/usr.sbin/sendmail/src/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.32 1997/07/13 20:42:17 cjs Exp $
+#	$NetBSD: Makefile,v 1.33 1997/10/25 06:58:47 lukem Exp $
 #
 #  NetBSD Makefile
 #
@ -24,7 +24,7 @@ PROG=	sendmail
 # spiral snail, but it will work.
 DBMDEF=	-DNEWDB -DNIS

-CFLAGS+=-I${.CURDIR} ${DBMDEF} -DNETISO -DTCPWRAPPERS
+CPPFLAGS+=-I${.CURDIR} ${DBMDEF} -DNETISO -DTCPWRAPPERS
 LDADD+=-lwrap
 DPADD+=${LIBWRAP}

--- a/usr.sbin/sup/Makefile.inc
+++ b/usr.sbin/sup/Makefile.inc
@ -1,7 +1,7 @@
-#	$NetBSD: Makefile.inc,v 1.2 1997/10/08 18:59:38 veego Exp $
+#	$NetBSD: Makefile.inc,v 1.3 1997/10/25 06:58:48 lukem Exp $

-CFLAGS+=-UCMUCS -UCMU -UMACH -DVAR_TMP -DHAS_DAEMON -DHAS_POSIX_DIR
-CFLAGS+=-I${.CURDIR}/../source -I${.CURDIR}/../lib -I${.CURDIR}/../sys
+CPPFLAGS+=-UCMUCS -UCMU -UMACH -DVAR_TMP -DHAS_DAEMON -DHAS_POSIX_DIR
+CPPFLAGS+=-I${.CURDIR}/../source -I${.CURDIR}/../lib -I${.CURDIR}/../sys

 LIBSUPDIR != cd ${.CURDIR}/../lib;\
    printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
--- a/usr.sbin/tcpdump/Makefile
+++ b/usr.sbin/tcpdump/Makefile
@ -1,13 +1,13 @@
-#	$NetBSD: Makefile,v 1.9 1997/10/18 06:43:03 lukem Exp $	
+#	$NetBSD: Makefile,v 1.10 1997/10/25 06:58:49 lukem Exp $	

 PROG=	tcpdump
 MAN=	tcpdump.8 

-CFLAGS+=-DHAVE_FCNTL_H=1 -DHAVE_MALLOC_H=1 -DHAVE_MEMORY_H=1
-CFLAGS+=-DTIME_WITH_SYS_TIME=1 -DHAVE_NET_SLIP_H=1 -DHAVE_VFPRINTF=1
-CFLAGS+=-DHAVE_STRCASECMP=1 -DHAVE_ETHER_NTOA=1 -DHAVE_SETLINEBUF=1
-CFLAGS+=-DRETSIGTYPE=void -DRETSIGVAL= -DHAVE_SIGACTION=1
-CFLAGS+=-DHAVE_SOCKADDR_SA_LEN=1 -DHAVE_FDDI
+CPPFLAGS+=-DHAVE_FCNTL_H=1 -DHAVE_MALLOC_H=1 -DHAVE_MEMORY_H=1
+CPPFLAGS+=-DTIME_WITH_SYS_TIME=1 -DHAVE_NET_SLIP_H=1 -DHAVE_VFPRINTF=1
+CPPFLAGS+=-DHAVE_STRCASECMP=1 -DHAVE_ETHER_NTOA=1 -DHAVE_SETLINEBUF=1
+CPPFLAGS+=-DRETSIGTYPE=void -DRETSIGVAL= -DHAVE_SIGACTION=1
+CPPFLAGS+=-DHAVE_SOCKADDR_SA_LEN=1 -DHAVE_FDDI

 LDADD+=	-lpcap -ll
 DPADD+=	${LIBPCAP} ${LIBL}
--- a/usr.sbin/tcpdump/tcpd2netbsd
+++ b/usr.sbin/tcpdump/tcpd2netbsd
@ -1,6 +1,6 @@
 #!/usr/local/bin/perl
 #
-#	$NetBSD: tcpd2netbsd,v 1.1 1997/10/03 20:04:32 christos Exp $
+#	$NetBSD: tcpd2netbsd,v 1.2 1997/10/25 06:58:50 lukem Exp $
 #
 #  Perl script to convert a standard distribution directory for tcpdump into
 #	a NetBSD source tree.
@ -271,11 +271,11 @@ WARNS?=	1
 PROG=	tcpdump
 %% man

-CFLAGS+=-DHAVE_FCNTL_H=1 -DHAVE_MALLOC_H=1 -DHAVE_MEMORY_H=1
-CFLAGS+=-DTIME_WITH_SYS_TIME=1 -DHAVE_NET_SLIP_H=1 -DHAVE_VFPRINTF=1
-CFLAGS+=-DHAVE_STRCASECMP=1 -DHAVE_ETHER_NTOA=1 -DHAVE_SETLINEBUF=1
-CFLAGS+=-DRETSIGTYPE=void -DRETSIGVAL= -DHAVE_SIGACTION=1
-CFLAGS+=-DHAVE_SOCKADDR_SA_LEN=1 -DHAVE_FDDI
+CPPFLAGS+=-DHAVE_FCNTL_H=1 -DHAVE_MALLOC_H=1 -DHAVE_MEMORY_H=1
+CPPFLAGS+=-DTIME_WITH_SYS_TIME=1 -DHAVE_NET_SLIP_H=1 -DHAVE_VFPRINTF=1
+CPPFLAGS+=-DHAVE_STRCASECMP=1 -DHAVE_ETHER_NTOA=1 -DHAVE_SETLINEBUF=1
+CPPFLAGS+=-DRETSIGTYPE=void -DRETSIGVAL= -DHAVE_SIGACTION=1
+CPPFLAGS+=-DHAVE_SOCKADDR_SA_LEN=1 -DHAVE_FDDI

 LDADD+=	-lpcap -ll
 DPADD+=	${LIBPCAP} ${LIBL}
--- a/usr.sbin/traceroute/Makefile
+++ b/usr.sbin/traceroute/Makefile
@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.7 1997/10/18 06:43:04 lukem Exp $	
+#	$NetBSD: Makefile,v 1.8 1997/10/25 06:58:51 lukem Exp $	

 PROG=	traceroute
 MAN=	traceroute.8 

-CFLAGS+=-DHAVE_MALLOC_H=1 -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SOCKIO_H=1
-CFLAGS+=-DHAVE_STRERROR=1 -DHAVE_SETLINEBUF=1 -DHAVE_SOCKADDR_SA_LEN=1 
+CPPFLAGS+=-DHAVE_MALLOC_H=1 -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SOCKIO_H=1
+CPPFLAGS+=-DHAVE_STRERROR=1 -DHAVE_SETLINEBUF=1 -DHAVE_SOCKADDR_SA_LEN=1 

 BINOWN= root
 BINMODE=4555
--- a/usr.sbin/traceroute/trrt2netbsd
+++ b/usr.sbin/traceroute/trrt2netbsd
@ -1,6 +1,6 @@
 #!/usr/local/bin/perl
 #
-#	$NetBSD: trrt2netbsd,v 1.1 1997/10/04 16:33:04 christos Exp $
+#	$NetBSD: trrt2netbsd,v 1.2 1997/10/25 06:58:52 lukem Exp $
 #
 #  Perl script to convert a standard distribution directory for traceroute into
 #	a NetBSD source tree.
@ -254,8 +254,8 @@ WARNS?=	1
 PROG=	traceroute
 %% man

-CFLAGS+=-DHAVE_MALLOC_H=1 -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SOCKIO_H=1
-CFLAGS+=-DHAVE_STRERROR=1 -DHAVE_SETLINEBUF=1 -DHAVE_SOCKADDR_SA_LEN=1 
+CPPFLAGS+=-DHAVE_MALLOC_H=1 -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SOCKIO_H=1
+CPPFLAGS+=-DHAVE_STRERROR=1 -DHAVE_SETLINEBUF=1 -DHAVE_SOCKADDR_SA_LEN=1 

 BINOWN= root
 BINMODE=4555
--- a/usr.sbin/videomode/Makefile
+++ b/usr.sbin/videomode/Makefile
@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.3 1997/06/24 08:01:39 mikel Exp $
+#	$NetBSD: Makefile,v 1.4 1997/10/25 06:58:53 lukem Exp $

 .if ${MACHINE} == "amiga"
 PROG=videomode
-CFLAGS+=-I${.CURDIR}/../../sys/arch -D${MACHINE}
+CPPFLAGS+=-I${.CURDIR}/../../sys/arch -D${MACHINE}
 .else
 NOOBJ=	noobj
 .endif
--- a/usr.sbin/xntp/Makefile.inc
+++ b/usr.sbin/xntp/Makefile.inc
@ -1,7 +1,7 @@
-#	$NetBSD: Makefile.inc,v 1.5 1997/10/17 14:34:38 lukem Exp $
+#	$NetBSD: Makefile.inc,v 1.6 1997/10/25 06:58:54 lukem Exp $

 WARNS?=	0
-CFLAGS += -I${.CURDIR}/../include -DHAVE_CONFIG_H
+CPPFLAGS += -I${.CURDIR}/../include -DHAVE_CONFIG_H
 LDADD += -lntp
 DPADD += ${LIBNTP}

--- a/usr.sbin/xntp/xntp2netbsd
+++ b/usr.sbin/xntp/xntp2netbsd
@ -1,6 +1,6 @@
 #!/usr/local/bin/perl
 #
-#	$NetBSD: xntp2netbsd,v 1.10 1997/10/17 14:34:44 lukem Exp $
+#	$NetBSD: xntp2netbsd,v 1.11 1997/10/25 06:58:55 lukem Exp $
 #
 #  Perl script to convert a standard distribution directory for xntp into
 #	a NetBSD source tree.
@ -264,7 +264,7 @@ SUBDIR= ntpdate ntpq ntptime ntptrace xntpd xntpdc
 %% file usr.sbin/xntp/Makefile.inc
 %% NetBSD #
 WARNS?=	0
-CFLAGS += -I${.CURDIR}/../include -DHAVE_CONFIG_H
+CPPFLAGS += -I${.CURDIR}/../include -DHAVE_CONFIG_H
 LDADD += -lntp
 DPADD += ${LIBNTP}

@ -326,7 +326,7 @@ LIB=	ntp
 %% srcs libntp
 SRCS += version.c

-CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR}/../../usr.sbin/xntp/include
+CPPFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR}/../../usr.sbin/xntp/include

 .include <bsd.lib.mk>
 %% file domestic/lib/libntp/Makefile
@ -336,7 +336,7 @@ LIB=	ntp
 %% srcs libntp
 SRCS += version.c

-CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR}/../../../usr.sbin/xntp/include
+CPPFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR}/../../../usr.sbin/xntp/include
 .PATH: ${.CURDIR}/../../../lib/libntp

 .include <bsd.lib.mk>
--- a/usr.sbin/ypbind/Makefile
+++ b/usr.sbin/ypbind/Makefile
@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.13 1997/10/18 06:43:09 lukem Exp $
+#	$NetBSD: Makefile,v 1.14 1997/10/25 06:58:56 lukem Exp $
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90

 PROG=	ypbind
 MAN=	ypbind.8
-CFLAGS+=-DHEURISTIC
+CPPFLAGS+=-DHEURISTIC

 .include <bsd.prog.mk>
--- a/usr.sbin/ypserv/Makefile.inc
+++ b/usr.sbin/ypserv/Makefile.inc
@ -1,8 +1,8 @@
-#	$NetBSD: Makefile.inc,v 1.3 1997/10/18 06:43:11 lukem Exp $
+#	$NetBSD: Makefile.inc,v 1.4 1997/10/25 06:58:57 lukem Exp $

 LIBCOMMON != cd ${.CURDIR}/../common;\
    printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
-CFLAGS+=-I${.CURDIR}/../common
+CPPFLAGS+=-I${.CURDIR}/../common
 DPADD+=	${LIBCOMMON}/libcommon.a
 LDADD+=	-L${LIBCOMMON} -lcommon

--- a/usr.sbin/ypserv/ypserv/Makefile
+++ b/usr.sbin/ypserv/ypserv/Makefile
@ -1,10 +1,9 @@
-#	$NetBSD: Makefile,v 1.7 1997/10/15 05:01:07 lukem Exp $
+#	$NetBSD: Makefile,v 1.8 1997/10/25 06:58:59 lukem Exp $

 PROG=	ypserv
 SRCS=	acl.c gram.c scan.c ypserv.c ypserv_proc.c ypserv_db.c ypserv_xdr.c
 MAN=	ypserv.acl.5 securenet.5 ypserv.8
-CFLAGS+=-I.
-CPPFLAGS+=-DYY_NO_UNPUT -DOPTIMIZE_DB
+CPPFLAGS+=-DYY_NO_UNPUT -DOPTIMIZE_DB -I.

 CLEANFILES+= gram.c scan.c y.tab.h