From 03c1c9cee02fc1af2e13737a6d789ad07ce176ce Mon Sep 17 00:00:00 2001
From: gwr <gwr@NetBSD.org>
Date: Mon, 17 Mar 1997 20:59:47 +0000
Subject: [PATCH] Fixup dependencies

---
 sys/arch/sun3/conf/Makefile.sun3   | 17 ++++++++++-------
 sys/arch/sun3x/conf/Makefile.sun3x | 22 +++++++++-------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/sys/arch/sun3/conf/Makefile.sun3 b/sys/arch/sun3/conf/Makefile.sun3
index 3acaf1cae859..ffd687686d53 100644
--- a/sys/arch/sun3/conf/Makefile.sun3
+++ b/sys/arch/sun3/conf/Makefile.sun3
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.sun3,v 1.58 1997/02/10 19:23:41 gwr Exp $
+#	$NetBSD: Makefile.sun3,v 1.59 1997/03/17 20:59:47 gwr Exp $
 
 # Makefile for NetBSD
 #
@@ -147,7 +147,8 @@ newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 
 
-clean:
+clean: cleankernel
+cleankernel:
 	rm -f eddep *netbsd netbsd.gdb tags *.[io] [a-z]*.s \
 	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
 
@@ -182,18 +183,20 @@ depend: .depend
 #
 # For cross-compilation, the "gcc -M" mkdep script is convenient,
 # but that does not correctly make rules from *.s files.  The
-# easiest compromise is to just list those dependencies here.
-locore.o: assym.h machine/trap.h m68k/trap.h
-copy.o:   assym.h $S/sys/errno.h
+# easiest work-around is to just list those dependencies here.
+locore.o:   assym.h m68k/asm.h m68k/trap.h
+copy.o:     assym.h m68k/asm.h $S/sys/errno.h
+bcopy.o:    assym.h m68k/asm.h
+copypage.o: assym.h m68k/asm.h
 
 # depend on root or device configuration
-autoconf.o conf.o: Makefile
+conf.o: Makefile
  
 # depend on network or filesystem configuration 
 uipc_proto.o vfs_conf.o: Makefile 
 
 # depend on maxusers
-genassym.o machdep.o: Makefile
+machdep.o: Makefile
 
 # depend on CPU configuration 
 db_machdep.o dvma.o machdep.o pmap.o sun3_startup.o vm_machdep.o: Makefile
diff --git a/sys/arch/sun3x/conf/Makefile.sun3x b/sys/arch/sun3x/conf/Makefile.sun3x
index 8f6efa1f0a76..e416cfd24ea0 100644
--- a/sys/arch/sun3x/conf/Makefile.sun3x
+++ b/sys/arch/sun3x/conf/Makefile.sun3x
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.sun3x,v 1.9 1997/03/14 23:27:34 mycroft Exp $
+#	$NetBSD: Makefile.sun3x,v 1.10 1997/03/17 20:59:48 gwr Exp $
 
 # Makefile for NetBSD
 #
@@ -113,9 +113,6 @@ SYSTEM_LD_TAIL+=; \
 		${STRIP} ${STRIPFLAGS} $@
 .else
 LINKFLAGS+=	-S
-# XXX - temporary:
-SYSTEM_LD_TAIL+=; \
-		dbsym $@
 .endif
 
 # LOAD+
@@ -186,24 +183,23 @@ depend: .depend
 #
 # For cross-compilation, the "gcc -M" mkdep script is convenient,
 # but that does not correctly make rules from *.s files.  The
-# easiest compromise is to just list those dependencies here.
-locore.o: assym.h machine/trap.h m68k/trap.h
-copy.o:   assym.h $S/sys/errno.h
+# easiest work-around is to just list those dependencies here.
+locore.o:   assym.h m68k/asm.h m68k/trap.h
+copy.o:     assym.h m68k/asm.h $S/sys/errno.h
+bcopy.o:    assym.h m68k/asm.h
+copypage.o: assym.h m68k/asm.h
 
 # depend on root or device configuration
-autoconf.o conf.o: Makefile
+conf.o: Makefile
  
 # depend on network or filesystem configuration 
 uipc_proto.o vfs_conf.o: Makefile 
 
 # depend on maxusers
-genassym.o machdep.o: Makefile
+machdep.o: Makefile
 
 # depend on CPU configuration 
-db_machdep.o dvma.o machdep.o pmap.o sun3x_startup.o vm_machdep.o: Makefile
-
-# depends on DDB symbol space
-db_aout.o : Makefile
+db_machdep.o dvma.o machdep.o pmap.o _startup.o vm_machdep.o: Makefile
 
 # depends on KGDBDEV, KGDBRATE
 kgdb_stub.o: Makefile