From 558d72128ee2cfe2aa3aa300fa7fd3c2c3223de1 Mon Sep 17 00:00:00 2001
From: mycroft <mycroft@NetBSD.org>
Date: Mon, 12 Aug 1996 00:51:24 +0000
Subject: [PATCH] Put  into .  Remove hooks for `config-dependent' and
 `device-driver' flags.

---
 sys/arch/alpha/conf/Makefile.alpha     |  27 +++++++++--------------
 sys/arch/amiga/conf/Makefile.amiga     |  27 +++++++++--------------
 sys/arch/arm32/conf/Makefile.arm32     |  29 ++++++++++---------------
 sys/arch/atari/conf/Makefile.atari     |  27 +++++++++--------------
 sys/arch/hp300/conf/Makefile.hp300     |  27 +++++++++--------------
 sys/arch/i386/conf/Makefile.i386       |  27 +++++++++--------------
 sys/arch/mac68k/conf/Makefile.mac68k   |  27 +++++++++--------------
 sys/arch/mvme68k/conf/Makefile.mvme68k |  27 +++++++++--------------
 sys/arch/pc532/conf/Makefile.pc532     |  26 ++++++++--------------
 sys/arch/pica/conf/Makefile.pica       |  27 +++++++++--------------
 sys/arch/pmax/conf/Makefile.pmax       |  29 ++++++++++---------------
 sys/arch/sparc/conf/Makefile.sparc     | Bin 4776 -> 4435 bytes
 sys/arch/sun3/conf/Makefile.sun3       |  27 +++++++++--------------
 sys/arch/vax/conf/Makefile.vax         |  23 +++++++-------------
 sys/arch/x68k/conf/Makefile.x68k       |  27 +++++++++--------------
 15 files changed, 139 insertions(+), 238 deletions(-)

diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha
index d8b4e16bbf7a..b383bd9c8acf 100644
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.alpha,v 1.20 1996/08/10 06:07:57 mycroft Exp $
+#	$NetBSD: Makefile.alpha,v 1.21 1996/08/12 00:51:24 mycroft Exp $
 
 # Makefile for NetBSD
 #
@@ -32,7 +32,8 @@ S!=	cd ../../../..; pwd
 ALPHA=	$S/arch/alpha
 
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
-CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dalpha
+CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
+		-Dalpha
 CWARNFLAGS=	-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes
 CFLAGS=		${DEBUG} ${CWARNFLAGS} -O2 -mno-fp-regs
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
@@ -54,21 +55,13 @@ LIBCOMPAT=	${COMPATLIB}
 LIBCOMPAT=	${COMPATLIB_PROF}
 .endif
 
-# compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}
-# where TYPE is NORMAL, DRIVER, or PROFILE}; SUFFIX is the file suffix,
-# capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file
-# is marked as config-dependent.
+# compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
+# HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
 
 NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NORMAL_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
-DRIVER_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-DRIVER_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
 NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
-NORMAL_S_C=	${CC} ${AFLAGS} ${CPPFLAGS} ${PARAM} -c $<
 
-HOSTED_C_C=	${NORMAL_C_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
+HOSTED_C=	${NORMAL_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
 
 %OBJS
 
@@ -108,14 +101,14 @@ genassym: genassym.o
 	${CC} -o $@ genassym.o
 
 genassym.o: ${ALPHA}/alpha/genassym.c
-	${HOSTED_C_C}
+	${HOSTED_C}
 
 param.c: $S/conf/param.c
 	rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
-	${NORMAL_C_C}
+	${NORMAL_C}
 
 ioconf.o: ioconf.c
 	${NORMAL_C}
@@ -130,7 +123,7 @@ clean::
 	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
 
 lint:
-	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
+	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
 	    ${ALPHA}/alpha/Locore.c ${CFILES} ${ALPHA}/alpha/swapgeneric.c \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'
@@ -153,7 +146,7 @@ depend:: .depend
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${ALPHA}/alpha/locore.s
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${ALPHA}/alpha/genassym.c
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${ALPHA}/alpha/genassym.c
 
 
 # depend on root or device configuration
diff --git a/sys/arch/amiga/conf/Makefile.amiga b/sys/arch/amiga/conf/Makefile.amiga
index 4eed982ba88a..135e0cf2d16e 100644
--- a/sys/arch/amiga/conf/Makefile.amiga
+++ b/sys/arch/amiga/conf/Makefile.amiga
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.amiga,v 1.47 1996/08/10 06:08:15 mycroft Exp $
+#	$NetBSD: Makefile.amiga,v 1.48 1996/08/12 00:51:27 mycroft Exp $
 
 # Makefile for NetBSD
 #
@@ -32,7 +32,8 @@ S!=	cd ../../../..; pwd
 AMIGA=	$S/arch/amiga
 
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
-CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dmc68020 -Damiga
+CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
+		-Dmc68020 -Damiga
 CWARNFLAGS=	-Werror -Wall -Wstrict-prototypes
 .if empty(IDENT:M-DM68060)
 CMACHFLAGS=	-m68020
@@ -65,21 +66,13 @@ LIBCOMPAT=	${COMPATLIB_PROF}
 ### for the Motorola 68060 Software Support Package
 .include "$S/arch/m68k/060sp/Makefile.inc"
 
-# compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}
-# where TYPE is NORMAL, DRIVER, or PROFILE}; SUFFIX is the file suffix,
-# capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file
-# is marked as config-dependent.
+# compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
+# HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
 
 NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NORMAL_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
-DRIVER_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-DRIVER_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
 NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
-NORMAL_S_C=	${CC} ${AFLAGS} ${CPPFLAGS} ${PARAM} -c $<
 
-HOSTED_C_C=	${NORMAL_C_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
+HOSTED_C=	${NORMAL_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
 
 .SUFFIXES: .o .g
 
@@ -125,14 +118,14 @@ genassym: genassym.o
 	${CC} -o $@ genassym.o
 
 genassym.o: ${AMIGA}/amiga/genassym.c
-	${HOSTED_C_C}
+	${HOSTED_C}
 
 param.c: $S/conf/param.c
 	rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
-	${NORMAL_C_C}
+	${NORMAL_C}
 
 ioconf.o: ioconf.c
 	${NORMAL_C}
@@ -147,7 +140,7 @@ clean::
 	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
 
 lint:
-	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
+	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
 	    ${AMIGA}/amiga/Locore.c ${CFILES} ${AMIGA}/amiga/swapgeneric.c \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'
@@ -170,7 +163,7 @@ depend:: .depend
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AMIGA}/amiga/locore.s
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${AMIGA}/amiga/genassym.c
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${AMIGA}/amiga/genassym.c
 
 
 # depend on root or device configuration
diff --git a/sys/arch/arm32/conf/Makefile.arm32 b/sys/arch/arm32/conf/Makefile.arm32
index 3d5e724f5514..7e7aaf29c55e 100644
--- a/sys/arch/arm32/conf/Makefile.arm32
+++ b/sys/arch/arm32/conf/Makefile.arm32
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.arm32,v 1.14 1996/08/10 06:08:26 mycroft Exp $
+#	$NetBSD: Makefile.arm32,v 1.15 1996/08/12 00:51:29 mycroft Exp $
 
 # Makefile for NetBSD
 #
@@ -32,7 +32,8 @@ S!=	cd ../../../..; pwd
 ARM32=	$S/arch/arm32
 
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
-CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Darm32
+CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
+		-Darm32
 CWARNFLAGS=	-Werror
 CFLAGS=		${DEBUG} ${CWARNFLAGS} -O2 
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
@@ -54,21 +55,13 @@ LIBCOMPAT=	${COMPATLIB}
 LIBCOMPAT=	${COMPATLIB_PROF}
 .endif
 
-# compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}
-# where TYPE is NORMAL, DRIVER, or PROFILE}; SUFFIX is the file suffix,
-# capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file
-# is marked as config-dependent.
+# compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
+# HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
 
 NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NORMAL_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
-DRIVER_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-DRIVER_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
 NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
-NORMAL_S_C=	${CC} ${AFLAGS} ${CPPFLAGS} ${PARAM} -c $<
 
-HOSTED_C_C=	${NORMAL_C_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
+HOSTED_C=	${NORMAL_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
 
 %OBJS
 
@@ -108,14 +101,14 @@ genassym: genassym.o
 	${CC} -o $@ genassym.o
 
 genassym.o: ${ARM32}/arm32/genassym.c
-	${HOSTED_C_C}
+	${HOSTED_C}
 
 param.c: $S/conf/param.c
 	rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
-	${NORMAL_C_C}
+	${NORMAL_C}
 
 ioconf.o: ioconf.c
 	${NORMAL_C}
@@ -130,7 +123,7 @@ clean::
 	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
 
 lint:
-	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
+	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
 	    ${ARM32}/arm32/Locore.c ${CFILES} ${ARM32}/arm32/swapgeneric.c \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'
@@ -154,7 +147,7 @@ depend:: .depend
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} modedefs.c
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${ARM32}/arm32/genassym.c
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${ARM32}/arm32/genassym.c
 
 
 # depend on root or device configuration
@@ -183,6 +176,6 @@ makemodes: makemodes.o
 	${CC} -o $@ makemodes.o
 
 makemodes.o: ${ARM32}/arm32/makemodes.c
-	${NORMAL_C_C}
+	${NORMAL_C}
 
 %RULES
diff --git a/sys/arch/atari/conf/Makefile.atari b/sys/arch/atari/conf/Makefile.atari
index d2d17964b305..15146f985d75 100644
--- a/sys/arch/atari/conf/Makefile.atari
+++ b/sys/arch/atari/conf/Makefile.atari
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.atari,v 1.20 1996/08/10 06:08:41 mycroft Exp $
+#	$NetBSD: Makefile.atari,v 1.21 1996/08/12 00:51:31 mycroft Exp $
 
 # Makefile for NetBSD
 #
@@ -32,7 +32,8 @@ S!=	cd ../../../..; pwd
 ATARI=	$S/arch/atari
 
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
-CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dmc68020 -Datari
+CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
+		-Dmc68020 -Datari
 CWARNFLAGS=	-Werror
 CFLAGS=		${DEBUG} ${CWARNFLAGS} -O2 -msoft-float -mc68020
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
@@ -57,21 +58,13 @@ LIBCOMPAT=	${COMPATLIB_PROF}
 ### for the Motorola 68040 Floating Point Software Product
 .include "$S/arch/m68k/fpsp/Makefile.inc"
 
-# compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}
-# where TYPE is NORMAL, DRIVER, or PROFILE}; SUFFIX is the file suffix,
-# capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file
-# is marked as config-dependent.
+# compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
+# HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
 
 NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NORMAL_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
-DRIVER_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-DRIVER_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
 NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
-NORMAL_S_C=	${CC} ${AFLAGS} ${CPPFLAGS} ${PARAM} -c $<
 
-HOSTED_C_C=	${NORMAL_C_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
+HOSTED_C=	${NORMAL_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
 
 %OBJS
 
@@ -111,14 +104,14 @@ genassym: genassym.o
 	${CC} -o $@ genassym.o
 
 genassym.o: ${ATARI}/atari/genassym.c
-	${HOSTED_C_C}
+	${HOSTED_C}
 
 param.c: $S/conf/param.c
 	rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
-	${NORMAL_C_C}
+	${NORMAL_C}
 
 ioconf.o: ioconf.c
 	${NORMAL_C}
@@ -133,7 +126,7 @@ clean::
 	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
 
 lint:
-	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
+	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
 	    ${ATARI}/atari/Locore.c ${CFILES} ${ATARI}/atari/swapgeneric.c \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'
@@ -156,7 +149,7 @@ depend:: .depend
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${ATARI}/atari/locore.s
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${ATARI}/atari/genassym.c
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${ATARI}/atari/genassym.c
 
 
 # depend on root or device configuration
diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300
index 24a492725d89..f6aa52965451 100644
--- a/sys/arch/hp300/conf/Makefile.hp300
+++ b/sys/arch/hp300/conf/Makefile.hp300
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.hp300,v 1.41 1996/08/10 06:08:51 mycroft Exp $
+#	$NetBSD: Makefile.hp300,v 1.42 1996/08/12 00:51:35 mycroft Exp $
 
 # Makefile for NetBSD
 #
@@ -32,7 +32,8 @@ S!=	cd ../../../..; pwd
 HP300=	$S/arch/hp300
 
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
-CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dmc68020 -Dhp300 -DFPCOPROC
+CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
+		-Dmc68020 -Dhp300 -DFPCOPROC
 CWARNFLAGS=	-Werror
 CFLAGS=		${DEBUG} ${CWARNFLAGS} -O2 -msoft-float
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
@@ -57,21 +58,13 @@ LIBCOMPAT=	${COMPATLIB_PROF}
 ### for the Motorola 68040 Floating Point Software Product
 .include "$S/arch/m68k/fpsp/Makefile.inc"
 
-# compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}
-# where TYPE is NORMAL, DRIVER, or PROFILE}; SUFFIX is the file suffix,
-# capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file
-# is marked as config-dependent.
+# compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
+# HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
 
 NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NORMAL_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
-DRIVER_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-DRIVER_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
 NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
-NORMAL_S_C=	${CC} ${AFLAGS} ${CPPFLAGS} ${PARAM} -c $<
 
-HOSTED_C_C=	${NORMAL_C_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
+HOSTED_C=	${NORMAL_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
 
 %OBJS
 
@@ -111,14 +104,14 @@ genassym: genassym.o
 	${CC} -o $@ genassym.o
 
 genassym.o: ${HP300}/hp300/genassym.c
-	${HOSTED_C_C}
+	${HOSTED_C}
 
 param.c: $S/conf/param.c
 	rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
-	${NORMAL_C_C}
+	${NORMAL_C}
 
 ioconf.o: ioconf.c
 	${NORMAL_C}
@@ -133,7 +126,7 @@ clean::
 	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
 
 lint:
-	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
+	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
 	    ${HP300}/hp300/Locore.c ${CFILES} ${HP300}/hp300/swapgeneric.c \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'
@@ -158,7 +151,7 @@ depend:: .depend
 	-if test -n "${SFILES}"; then \
 		${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}; \
 	fi
-	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${HP300}/hp300/genassym.c
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${HP300}/hp300/genassym.c
 
 
 # depend on root or device configuration
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index 74583b89009f..13947b450406 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.i386,v 1.70 1996/08/10 08:40:53 mycroft Exp $
+#	$NetBSD: Makefile.i386,v 1.71 1996/08/12 00:51:40 mycroft Exp $
 
 # Makefile for NetBSD
 #
@@ -32,7 +32,8 @@ S!=	cd ../../../..; pwd
 I386=	$S/arch/i386
 
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
-CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Di386
+CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
+		-Di386
 CWARNFLAGS=	-Werror -Wreturn-type
 CFLAGS=		${DEBUG} ${CWARNFLAGS} -O2 
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
@@ -54,21 +55,13 @@ LIBCOMPAT=	${COMPATLIB}
 LIBCOMPAT=	${COMPATLIB_PROF}
 .endif
 
-# compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}
-# where TYPE is NORMAL, DRIVER, or PROFILE; SUFFIX is the file suffix,
-# capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file
-# is marked as config-dependent.
+# compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
+# HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
 
 NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NORMAL_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
-DRIVER_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-DRIVER_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
 NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
-NORMAL_S_C=	${CC} ${AFLAGS} ${CPPFLAGS} ${PARAM} -c $<
 
-HOSTED_C_C=	${NORMAL_C_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
+HOSTED_C=	${NORMAL_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
 
 %OBJS
 
@@ -108,14 +101,14 @@ genassym: genassym.o
 	${CC} -o $@ genassym.o
 
 genassym.o: ${I386}/i386/genassym.c
-	${HOSTED_C_C}
+	${HOSTED_C}
 
 param.c: $S/conf/param.c
 	rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
-	${NORMAL_C_C}
+	${NORMAL_C}
 
 ioconf.o: ioconf.c
 	${NORMAL_C}
@@ -130,7 +123,7 @@ clean::
 	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
 
 lint:
-	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
+	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
 	    ${I386}/i386/Locore.c ${CFILES} ${I386}/i386/swapgeneric.c \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'
@@ -153,7 +146,7 @@ depend:: .depend
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${I386}/i386/locore.s
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${I386}/i386/genassym.c
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${I386}/i386/genassym.c
 
 
 # depend on root or device configuration
diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k
index 41004178a4a5..2f509c876f9a 100644
--- a/sys/arch/mac68k/conf/Makefile.mac68k
+++ b/sys/arch/mac68k/conf/Makefile.mac68k
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.mac68k,v 1.40 1996/08/10 06:09:07 mycroft Exp $
+#	$NetBSD: Makefile.mac68k,v 1.41 1996/08/12 00:51:44 mycroft Exp $
 
 # Makefile for NetBSD
 #
@@ -32,7 +32,8 @@ S!=	cd ../../../..; pwd
 MAC68K=	$S/arch/mac68k
 
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
-CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dmc68020 -Dmac68k
+CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
+		-Dmc68020 -Dmac68k
 CWARNFLAGS=	-Wall -Wstrict-prototypes -Wmissing-prototypes -Wno-uninitialized
 CFLAGS=		${DEBUG} ${CWARNFLAGS} -O -msoft-float
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
@@ -57,21 +58,13 @@ LIBCOMPAT=${COMPATLIB_PROF}
 ### for the Motorola 68040 Floating Point Software Product
 .include "$S/arch/m68k/fpsp/Makefile.inc"
 
-# compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}
-# where TYPE is NORMAL, DRIVER, or PROFILE}; SUFFIX is the file suffix,
-# capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file
-# is marked as config-dependent.
+# compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
+# HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
 
 NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NORMAL_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
-DRIVER_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-DRIVER_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
 NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
-NORMAL_S_C=	${CC} ${AFLAGS} ${CPPFLAGS} ${PARAM} -c $<
 
-HOSTED_C_C=	${NORMAL_C_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
+HOSTED_C=	${NORMAL_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
 
 %OBJS
 
@@ -111,14 +104,14 @@ genassym: genassym.o
 	${CC} -o $@ genassym.o
 
 genassym.o: ${MAC68K}/mac68k/genassym.c
-	${HOSTED_C_C}
+	${HOSTED_C}
 
 param.c: $S/conf/param.c
 	rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
-	${NORMAL_C_C}
+	${NORMAL_C}
 
 ioconf.o: ioconf.c
 	${NORMAL_C}
@@ -133,7 +126,7 @@ clean::
 	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
 
 lint:
-	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
+	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
 	    ${MAC68K}/mac68k/Locore.c ${CFILES} ${MAC68K}/mac68k/swapgeneric.c \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'
@@ -156,7 +149,7 @@ depend:: .depend
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${MAC68K}/mac68k/locore.s
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${MAC68K}/mac68k/genassym.c
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${MAC68K}/mac68k/genassym.c
 
 
 # depend on root or device configuration
diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k
index 4275861123f3..6dbdca60d6db 100644
--- a/sys/arch/mvme68k/conf/Makefile.mvme68k
+++ b/sys/arch/mvme68k/conf/Makefile.mvme68k
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.mvme68k,v 1.13 1996/08/10 06:09:16 mycroft Exp $
+#	$NetBSD: Makefile.mvme68k,v 1.14 1996/08/12 00:51:48 mycroft Exp $
 
 # Makefile for NetBSD
 #
@@ -32,7 +32,8 @@ S!=	cd ../../../..; pwd
 MVME68K=$S/arch/mvme68k
 
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
-CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dmc68020 -Dmvme68k -DFPCOPROC
+CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
+		-Dmc68020 -Dmvme68k -DFPCOPROC
 CWARNFLAGS=	-Werror
 CFLAGS=		${DEBUG} ${CWARNFLAGS} -O2 -msoft-float
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
@@ -57,21 +58,13 @@ LIBCOMPAT=    ${COMPATLIB_PROF}
 ### for the Motorola 68040 Floating Point Software Product
 .include "$S/arch/m68k/fpsp/Makefile.inc"
 
-# compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}
-# where TYPE is NORMAL, DRIVER, or PROFILE}; SUFFIX is the file suffix,
-# capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file
-# is marked as config-dependent.
+# compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
+# HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
 
 NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NORMAL_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
-DRIVER_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-DRIVER_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
 NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
-NORMAL_S_C=	${CC} ${AFLAGS} ${CPPFLAGS} ${PARAM} -c $<
 
-HOSTED_C_C=	${NORMAL_C_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
+HOSTED_C=	${NORMAL_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
 
 %OBJS
 
@@ -111,14 +104,14 @@ genassym: genassym.o
 	${CC} -o $@ genassym.o
 
 genassym.o: ${MVME68K}/mvme68k/genassym.c
-	${HOSTED_C_C}
+	${HOSTED_C}
 
 param.c: $S/conf/param.c
 	rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
-	${NORMAL_C_C}
+	${NORMAL_C}
 
 ioconf.o: ioconf.c
 	${NORMAL_C}
@@ -133,7 +126,7 @@ clean::
 	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
 
 lint:
-	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
+	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
 	    ${MVME68K}/mvme68k/Locore.c ${CFILES} ${MVME68K}/mvme68k/swapgeneric.c \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'
@@ -156,7 +149,7 @@ depend:: .depend
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${MVME68K}/mvme68k/locore.s
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${MVME68K}/mvme68k/genassym.c
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${MVME68K}/mvme68k/genassym.c
 
 
 # depend on root or device configuration
diff --git a/sys/arch/pc532/conf/Makefile.pc532 b/sys/arch/pc532/conf/Makefile.pc532
index 1a75bbeb21ee..cd9c2d89ac81 100644
--- a/sys/arch/pc532/conf/Makefile.pc532
+++ b/sys/arch/pc532/conf/Makefile.pc532
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.pc532,v 1.28 1996/08/10 06:09:22 mycroft Exp $
+#	$NetBSD: Makefile.pc532,v 1.29 1996/08/12 00:51:52 mycroft Exp $
 
 # Makefile for NetBSD
 #
@@ -32,7 +32,7 @@ S!=	cd ../../../..; pwd
 PC532=	$S/arch/pc532
 
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
-CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL
+CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL
 CWARNFLAGS=	-Werror
 CFLAGS=		${DEBUG} ${CWARNFLAGS} -O2 -msb
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
@@ -54,21 +54,13 @@ LIBCOMPAT=	${COMPATLIB}
 LIBCOMPAT=	${COMPATLIB_PROF}
 .endif
 
-# compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}
-# where TYPE is NORMAL, DRIVER, or PROFILE}; SUFFIX is the file suffix,
-# capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file
-# is marked as config-dependent.
+# compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
+# HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
 
 NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NORMAL_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
-DRIVER_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-DRIVER_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
 NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
-NORMAL_S_C=	${CC} ${AFLAGS} ${CPPFLAGS} ${PARAM} -c $<
 
-HOSTED_C_C=	${NORMAL_C_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
+HOSTED_C=	${NORMAL_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
 
 %OBJS
 
@@ -108,14 +100,14 @@ genassym: genassym.o
 	${CC} -o $@ genassym.o
 
 genassym.o: ${PC532}/pc532/genassym.c
-	${HOSTED_C_C}
+	${HOSTED_C}
 
 param.c: $S/conf/param.c
 	rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
-	${NORMAL_C_C}
+	${NORMAL_C}
 
 ioconf.o: ioconf.c
 	${NORMAL_C}
@@ -130,7 +122,7 @@ clean::
 	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
 
 lint:
-	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
+	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
 	    ${PC532}/pc532/Locore.c ${CFILES} ${PC532}/pc532/swapgeneric.c \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'
@@ -153,7 +145,7 @@ depend:: .depend
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${PC532}/pc532/locore.s
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${PC532}/pc532/genassym.c
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PC532}/pc532/genassym.c
 
 
 # depend on root or device configuration
diff --git a/sys/arch/pica/conf/Makefile.pica b/sys/arch/pica/conf/Makefile.pica
index 6ed6afe6edc4..5a088261d66d 100644
--- a/sys/arch/pica/conf/Makefile.pica
+++ b/sys/arch/pica/conf/Makefile.pica
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.pica,v 1.6 1996/08/10 06:09:28 mycroft Exp $
+#	$NetBSD: Makefile.pica,v 1.7 1996/08/12 00:51:56 mycroft Exp $
 
 # Makefile for NetBSD
 #
@@ -32,7 +32,8 @@ S!=	cd ../../../..; pwd
 PICA=	$S/arch/pica
 
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
-CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dpica -D__NetBSD__ ${GP}
+CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
+		-Dpica -D__NetBSD__ ${GP}
 CWARNFLAGS=	-Werror
 CFLAGS=		${DEBUG} ${CWARNFLAGS} -O2 -mips2 -mcpu=r4000
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
@@ -54,21 +55,13 @@ LIBCOMPAT=	${COMPATLIB}
 LIBCOMPAT=	${COMPATLIB_PROF}
 .endif
 
-# compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}
-# where TYPE is NORMAL, DRIVER, or PROFILE}; SUFFIX is the file suffix,
-# capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file
-# is marked as config-dependent.
+# compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
+# HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
 
 NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NORMAL_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
-DRIVER_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-DRIVER_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
 NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
-NORMAL_S_C=	${CC} ${AFLAGS} ${CPPFLAGS} ${PARAM} -c $<
 
-HOSTED_C_C=	${NORMAL_C_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
+HOSTED_C=	${NORMAL_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
 
 %OBJS
 
@@ -114,14 +107,14 @@ genassym: genassym.o
 	${CC} -o $@ genassym.o
 
 genassym.o: ${PICA}/pica/genassym.c
-	${HOSTED_C_C}
+	${HOSTED_C}
 
 param.c: $S/conf/param.c
 	rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
-	${NORMAL_C_C}
+	${NORMAL_C}
 
 ioconf.o: ioconf.c
 	${NORMAL_C}
@@ -136,7 +129,7 @@ clean::
 	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
 
 lint:
-	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
+	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
 	    ${PICA}/pica/Locore.c ${CFILES} ${PICA}/pica/swapgeneric.c \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'
@@ -159,7 +152,7 @@ depend:: .depend
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${PMAX}/pmax/locore.S ${PMAX}/pica/fp.S
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${PMAX}/pmax/genassym.c
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PMAX}/pmax/genassym.c
 
 
 # depend on root or device configuration
diff --git a/sys/arch/pmax/conf/Makefile.pmax b/sys/arch/pmax/conf/Makefile.pmax
index 4e6dd43d69c4..f147c042b60c 100644
--- a/sys/arch/pmax/conf/Makefile.pmax
+++ b/sys/arch/pmax/conf/Makefile.pmax
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.pmax,v 1.31 1996/08/10 06:09:41 mycroft Exp $
+#	$NetBSD: Makefile.pmax,v 1.32 1996/08/12 00:52:01 mycroft Exp $
 
 # Makefile for NetBSD
 #
@@ -32,7 +32,8 @@ S!=	cd ../../../..; pwd
 PMAX=	$S/arch/pmax
 
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
-CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dpmax ${GP}
+CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
+		-Dpmax ${GP}
 CWARNFLAGS=	-Werror
 CFLAGS=		${DEBUG} ${CWARNFLAGS} -O2
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
@@ -54,21 +55,13 @@ LIBCOMPAT=	${COMPATLIB}
 LIBCOMPAT=	${COMPATLIB_PROF}
 .endif
 
-# compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}
-# where TYPE is NORMAL, DRIVER, or PROFILE}; SUFFIX is the file suffix,
-# capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file
-# is marked as config-dependent.
+# compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
+# HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
 
 NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NORMAL_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
-DRIVER_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-DRIVER_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
 NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
-NORMAL_S_C=	${CC} ${AFLAGS} ${CPPFLAGS} ${PARAM} -c $<
 
-HOSTED_C_C=	${NORMAL_C_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
+HOSTED_C=	${NORMAL_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
 
 %OBJS
 
@@ -112,15 +105,15 @@ assym.h: genassym
 genassym: genassym.o
 	${CC} -o $@ genassym.o
 
-genassym.o: ${S}/arch/mips/mips/genassym.c
-	${HOSTED_C_C}
+genassym.o: $S/arch/mips/mips/genassym.c
+	${HOSTED_C}
 
 param.c: $S/conf/param.c
 	rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
-	${NORMAL_C_C}
+	${NORMAL_C}
 
 ioconf.o: ioconf.c
 	${NORMAL_C}
@@ -135,7 +128,7 @@ clean::
 	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
 
 lint:
-	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
+	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
 	    ${PMAX}/pmax/Locore.c ${CFILES} ${PMAX}/pmax/swapgeneric.c \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'
@@ -158,7 +151,7 @@ depend:: .depend
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${PMAX}/pmax/locore.S ${PMAX}/pmax/fp.S
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${S}/arch/mips/mips/genassym.c
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} $S/arch/mips/mips/genassym.c
 
 
 # depend on root or device configuration
diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc
index e9b05226155afc915e3eb842bf5a57fa85a3d6c4..130ffb240d8739a11367e0802b8da6126d4ff530 100644
GIT binary patch
delta 159
zcmZ3XdRb|Lf~cv2p{1pnzJZ0lp^<`tft9I|m4WF-)1%DnD%AmwL5{wge=yrKsVkIc
zq!y(rghU3oDr6Qb`1uF<I{GN&7jY>oc=!j0xVqHpC?w{kOfF=Tp4`W#%&Eu41yM7(
zfL(9$J$4;oE{M8#XIoB{YKYwC2o6)`$^G2vn}2Y7F>dzewPK!ppPzU0Yyoa20Q%1@
A!2kdN

delta 353
zcmcbtv_f@)f~bjtp{1pnzJZ0lp@D*dnU#U1m8r=_)1%CrnOSU^_*JT%{r%iL-Q!(c
z18TXHCp)l-8tW*y1bK$J2I(l|7bye;`MY`gxYk-L1c$o0c}6H?7Aurwq$;Fk=A<eV
zm!_p<R_FlrHL)o>=_n-Tr6?fG11XJnR>(|)Yv57_iRC61Wv8YnBo-?q=jWwmrt7Ap
z7Nq8-q~?`OUdm?2=sbBHn}(Q5b%0}#qi?N(ZnA=k4Hp;0NkAz*4hS<ItPbb_6m^qt
zv*`->`3Lzr`ossvJKJ&sJ?K2SnomjvMH!cee{hJaOT05g2~>mgW@&a)=E;6snVYwA
d`7p9W&EEW<+lHA9qJOd$m-OObekLXcE&#ZZWLN+I

diff --git a/sys/arch/sun3/conf/Makefile.sun3 b/sys/arch/sun3/conf/Makefile.sun3
index c58e6dbfd1d9..59591602aa2b 100644
--- a/sys/arch/sun3/conf/Makefile.sun3
+++ b/sys/arch/sun3/conf/Makefile.sun3
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.sun3,v 1.48 1996/08/10 06:10:07 mycroft Exp $
+#	$NetBSD: Makefile.sun3,v 1.49 1996/08/12 00:52:11 mycroft Exp $
 
 # Makefile for NetBSD
 #
@@ -34,7 +34,8 @@ SUN3=	$S/arch/sun3
 # Override CPP defaults entirely, so cross-compilation works.
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
 XDEFS=		-undef -D__NetBSD__ -Dm68k -Dmc68000
-CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dmc68020 -Dsun3 ${XDEFS}
+CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
+		-Dmc68020 -Dsun3 ${XDEFS}
 CWARNFLAGS= 	-Werror # -Wall -Wstrict-prototypes -Wmissing-prototypes
 CFLAGS= 	${DEBUG} ${CWARNFLAGS} -O2 -msoft-float
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
@@ -56,21 +57,13 @@ LIBCOMPAT=	${COMPATLIB}
 LIBCOMPAT=	${COMPATLIB_PROF}
 .endif
 
-# compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}
-# where TYPE is NORMAL, DRIVER, or PROFILE}; SUFFIX is the file suffix,
-# capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file
-# is marked as config-dependent.
+# compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
+# HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
 
 NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NORMAL_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
-DRIVER_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-DRIVER_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
 NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
-NORMAL_S_C=	${CC} ${AFLAGS} ${CPPFLAGS} ${PARAM} -c $<
 
-HOSTED_C_C=	${NORMAL_C_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
+HOSTED_C=	${NORMAL_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
 
 %OBJS
 
@@ -110,14 +103,14 @@ genassym: genassym.o
 	${CC} -o $@ genassym.o
 
 genassym.o: ${SUN3}/sun3/genassym.c
-	${HOSTED_C_C}
+	${HOSTED_C}
 
 param.c: $S/conf/param.c
 	rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
-	${NORMAL_C_C}
+	${NORMAL_C}
 
 ioconf.o: ioconf.c
 	${NORMAL_C}
@@ -132,7 +125,7 @@ clean::
 	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
 
 lint:
-	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
+	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
 	    ${SUN3}/sun3/Locore.c ${CFILES} ${SUN3}/sun3/swapgeneric.c \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'
@@ -153,7 +146,7 @@ SRCS=	${SUN3}/sun3/locore.s \
 depend:: .depend
 .depend: ${SRCS} assym.h param.c
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
-	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${SUN3}/sun3/genassym.c
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${SUN3}/sun3/genassym.c
 
 # XXX - see below
 #	${MKDEP} -a ${APPFLAGS} ${SUN3}/sun3/locore.s
diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax
index 2ac0776788cb..5d399ddbac1b 100644
--- a/sys/arch/vax/conf/Makefile.vax
+++ b/sys/arch/vax/conf/Makefile.vax
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.vax,v 1.24 1996/08/10 06:10:18 mycroft Exp $
+#	$NetBSD: Makefile.vax,v 1.25 1996/08/12 00:52:16 mycroft Exp $
 
 # Makefile for NetBSD
 #
@@ -33,7 +33,8 @@ S!=	cd ../../../..; pwd
 VAX=	$S/arch/vax
 
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
-CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -D_VAX_INLINE_
+CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
+		-D_VAX_INLINE_
 CWARNFLAGS=	-Werror
 CFLAGS=		${DEBUG} ${CWARNFLAGS} -O2 
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
@@ -55,21 +56,13 @@ LIBCOMPAT=      ${COMPATLIB}
 LIBCOMPAT=      ${COMPATLIB_PROF}
 .endif
 
-# compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}
-# where TYPE is NORMAL, DRIVER, or PROFILE}; SUFFIX is the file suffix,
-# capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file
-# is marked as config-dependent.
+# compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
+# HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
 
 NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NORMAL_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
-DRIVER_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-DRIVER_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
 NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
-NORMAL_S_C=	${CC} ${AFLAGS} ${CPPFLAGS} ${PARAM} -c $<
 
-HOSTED_C_C=	${NORMAL_C_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
+HOSTED_C=	${NORMAL_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
 
 %OBJS
 
@@ -107,7 +100,7 @@ param.c: $S/conf/param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
-	${NORMAL_C_C}
+	${NORMAL_C}
 
 ioconf.o: ioconf.c
 	${NORMAL_C}
@@ -122,7 +115,7 @@ clean::
 	    [Ee]rrs linterrs makelinks
 
 lint:
-	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
+	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
 	    ${VAX}/vax/Locore.c ${CFILES} ${VAX}/vax/swapgeneric.c \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'
diff --git a/sys/arch/x68k/conf/Makefile.x68k b/sys/arch/x68k/conf/Makefile.x68k
index 0f181401ea90..c5b99d3de6db 100644
--- a/sys/arch/x68k/conf/Makefile.x68k
+++ b/sys/arch/x68k/conf/Makefile.x68k
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.x68k,v 1.5 1996/08/10 06:10:27 mycroft Exp $
+#	$NetBSD: Makefile.x68k,v 1.6 1996/08/12 00:52:20 mycroft Exp $
 
 # Makefile for NetBSD
 #
@@ -32,7 +32,8 @@ S!=	cd ../../../..; pwd
 X68K=	$S/arch/x68k
 
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
-CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dmc68020 -Dx68k -DFPCOPROC
+CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
+		-Dmc68020 -Dx68k -DFPCOPROC
 CWARNFLAGS=	-Werror
 CFLAGS=		${DEBUG} ${CWARNFLAGS} -O2 -msoft-float
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
@@ -60,21 +61,13 @@ LIBCOMPAT=	${COMPATLIB_PROF}
 ### for the Motorola 68060 Software Support Package
 .include "$S/arch/m68k/060sp/Makefile.inc"
 
-# compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}
-# where TYPE is NORMAL, DRIVER, or PROFILE}; SUFFIX is the file suffix,
-# capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file
-# is marked as config-dependent.
+# compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
+# HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
 
 NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NORMAL_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
-DRIVER_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-DRIVER_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
 NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
-NORMAL_S_C=	${CC} ${AFLAGS} ${CPPFLAGS} ${PARAM} -c $<
 
-HOSTED_C_C=	${NORMAL_C_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
+HOSTED_C=	${NORMAL_C:S/^-pg$//:S/^-p$//:S/^-nostdinc$//}
 
 %OBJS
 
@@ -114,14 +107,14 @@ genassym: genassym.o
 	${CC} -o $@ genassym.o
 
 genassym.o: ${X68K}/x68k/genassym.c
-	${HOSTED_C_C}
+	${HOSTED_C}
 
 param.c: $S/conf/param.c
 	rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
-	${NORMAL_C_C}
+	${NORMAL_C}
 
 ioconf.o: ioconf.c
 	${NORMAL_C}
@@ -136,7 +129,7 @@ clean::
 	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
 
 lint:
-	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
+	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
 	    ${X68K}/x68k/Locore.c ${CFILES} ${X68K}/x68k/swapgeneric.c \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'
@@ -161,7 +154,7 @@ depend:: .depend
 	-if test -n "${SFILES}"; then \
 		${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}; \
 	fi
-	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${X68K}/x68k/genassym.c
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${X68K}/x68k/genassym.c
 
 
 # depend on root or device configuration