From cec913603e5d075c7bfdc4c3e400fd26b0eb1255 Mon Sep 17 00:00:00 2001
From: mycroft <mycroft@NetBSD.org>
Date: Fri, 2 Feb 1996 13:38:05 +0000
Subject: [PATCH] Don't special-case conf.c.

---
 sys/arch/mac68k/conf/Makefile.mac68k | 5 +----
 sys/arch/mac68k/conf/files.mac68k    | 3 ++-
 sys/arch/pc532/conf/Makefile.pc532   | 6 +-----
 sys/arch/pc532/conf/files.pc532      | 3 ++-
 sys/arch/vax/conf/Makefile.vax       | 5 +----
 5 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k
index 16df9dee076d..4d39f74bff0a 100644
--- a/sys/arch/mac68k/conf/Makefile.mac68k
+++ b/sys/arch/mac68k/conf/Makefile.mac68k
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.mac68k,v 1.29 1996/02/02 02:36:48 mycroft Exp $
+#	$NetBSD: Makefile.mac68k,v 1.30 1996/02/02 13:38:10 mycroft Exp $
 
 # Makefile for NetBSD for the mac
 #	Derived from makefile for hp300 from NetBSD
@@ -163,9 +163,6 @@ tags:
 ioconf.o: ioconf.c
 	${CC} -c ${CFLAGS} ioconf.c
 
-conf.o: ${MAC68K}/mac68k/conf.c
-	${NORMAL_C}
-
 param.c: $S/conf/param.c
 	rm -f param.c
 	cp $S/conf/param.c .
diff --git a/sys/arch/mac68k/conf/files.mac68k b/sys/arch/mac68k/conf/files.mac68k
index 2ef138cb7260..77cb013c4461 100644
--- a/sys/arch/mac68k/conf/files.mac68k
+++ b/sys/arch/mac68k/conf/files.mac68k
@@ -1,4 +1,4 @@
-#	$NetBSD: files.mac68k,v 1.37 1995/11/21 05:06:28 briggs Exp $
+#	$NetBSD: files.mac68k,v 1.38 1996/02/02 13:38:05 mycroft Exp $
 
 # mac68k-specific configuration info
 
@@ -49,6 +49,7 @@ include "../../m68k/fpe/files.fpe"
 
 file	arch/mac68k/mac68k/autoconf.c
 file	arch/mac68k/mac68k/clock.c
+file	arch/mac68k/mac68k/conf.c
 file	arch/mac68k/mac68k/disksubr.c		disk
 file	arch/mac68k/mac68k/machdep.c
 file	arch/mac68k/mac68k/macrom.c
diff --git a/sys/arch/pc532/conf/Makefile.pc532 b/sys/arch/pc532/conf/Makefile.pc532
index 95ccfb39815a..f4d12f388631 100644
--- a/sys/arch/pc532/conf/Makefile.pc532
+++ b/sys/arch/pc532/conf/Makefile.pc532
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.pc532,v 1.17 1996/02/02 02:37:10 mycroft Exp $
+#	$NetBSD: Makefile.pc532,v 1.18 1996/02/02 13:38:24 mycroft Exp $
 
 # Copyright 1990 W. Jolitz
 # 	@(#)Makefile.i386	7.1 5/10/91
@@ -130,10 +130,6 @@ ioconf.o: ioconf.c $S/sys/param.h $S/sys/buf.h \
     ${PC532}/dev/device.h  machine/icu.h
 	${CC} -c ${CFLAGS} ioconf.c
 
-conf.o: $S/sys/param.h $S/sys/systm.h $S/sys/buf.h $S/sys/ioctl.h \
-	$S/sys/tty.h $S/sys/conf.h ${PC532}/pc532/conf.c
-	${CC} -traditional -c ${CFLAGS} ${PC532}/pc532/conf.c
-
 param.c: $S/conf/param.c
 	-rm -f param.c
 	cp $S/conf/param.c .
diff --git a/sys/arch/pc532/conf/files.pc532 b/sys/arch/pc532/conf/files.pc532
index 7e561c9e4029..e7ecc545cbe0 100644
--- a/sys/arch/pc532/conf/files.pc532
+++ b/sys/arch/pc532/conf/files.pc532
@@ -1,4 +1,4 @@
-#	$NetBSD: files.pc532,v 1.16 1995/11/30 00:58:42 jtc Exp $
+#	$NetBSD: files.pc532,v 1.17 1996/02/02 13:38:19 mycroft Exp $
 #
 # new style config file for pc532 architecture
 #
@@ -61,6 +61,7 @@ file	scsi/scsiconf.c			scsi
 file	scsi/scsi_base.c		scsi
 file	scsi/scsi_ioctl.c		scsi
 file	arch/pc532/pc532/autoconf.c
+file	arch/pc532/pc532/conf.c
 file	arch/pc532/pc532/db_disasm.c	ddb
 file	arch/pc532/pc532/db_interface.c	ddb
 file	arch/pc532/pc532/db_trace.c	ddb
diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax
index c97816a46b43..1a619c846743 100644
--- a/sys/arch/vax/conf/Makefile.vax
+++ b/sys/arch/vax/conf/Makefile.vax
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.vax,v 1.13 1996/02/01 22:33:21 mycroft Exp $
+#	$NetBSD: Makefile.vax,v 1.14 1996/02/02 13:38:29 mycroft Exp $
 
 #	@(#)Makefile.vax	7.18 (Berkeley) 12/16/90
 #
@@ -111,9 +111,6 @@ param.c: $S/conf/param.c
 param.o: param.c Makefile
 	${CC} -O -c ${CFLAGS} ${PARAM} param.c
 
-conf.o: ${VAX}/vax/conf.c
-	${CC} -O -c ${CFLAGS} ${PARAM} ${VAX}/vax/conf.c
-
 newvers:
 	sh $S/conf/newvers.sh
 	${CC} ${CFLAGS} -c vers.c