From f1a87e83ee5ba03ffd3ae3fda4b3ee089095720e Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Mon, 12 Feb 2001 05:55:33 +0000
Subject: [PATCH] Fix `make depend' => `make kernel-depend'.  Using the
 dependancy file when rebuilding it is just Wrong.

---
 sys/conf/Makefile.alpha   | 6 +++++-
 sys/conf/Makefile.i386    | 6 +++++-
 sys/conf/Makefile.ia64    | 6 +++++-
 sys/conf/Makefile.pc98    | 6 +++++-
 sys/conf/Makefile.powerpc | 6 +++++-
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index bc749955a890..5641f1e83a94 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -235,7 +235,11 @@ __reml.S: $S/$M/$M/divrem.m4
 
 ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h
 
-kernel-depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \
+kernel-depend:
+	rm -f .depend
+	${MAKE} _kernel-depend
+
+_kernel-depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \
 	    ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \
 	    ${SYSTEM_SFILES} ${MFILES:T:S/.m$/.h/}
 	rm -f .newdep
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 135c8683511e..8edb6f16a0b8 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -195,7 +195,11 @@ genassym.o: $S/$M/$M/genassym.c
 
 ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h
 
-kernel-depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \
+kernel-depend:
+	rm -f .depend
+	${MAKE} _kernel-depend
+
+_kernel-depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \
 	    ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \
 	    ${SYSTEM_SFILES} ${MFILES:T:S/.m$/.h/}
 	rm -f .newdep
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
index 088b31b9c13c..ac16280d70c8 100644
--- a/sys/conf/Makefile.ia64
+++ b/sys/conf/Makefile.ia64
@@ -199,7 +199,11 @@ genassym.o: $S/$M/$M/genassym.c
 
 ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h
 
-kernel-depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \
+kernel-depend:
+	rm -f .depend
+	${MAKE} _kernel-depend
+
+_kernel-depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \
 	    ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \
 	    ${SYSTEM_SFILES} ${MFILES:T:S/.m$/.h/}
 	rm -f .newdep
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 7aef2a297ea5..551a861cab78 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -198,7 +198,11 @@ genassym.o: $S/$M/$M/genassym.c
 
 ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h
 
-kernel-depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \
+kernel-depend:
+	rm -f .depend
+	${MAKE} _kernel-depend
+
+_kernel-depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \
 	    ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \
 	    ${SYSTEM_SFILES} ${MFILES:T:S/.m$/.h/}
 	rm -f .newdep
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 135c8683511e..8edb6f16a0b8 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -195,7 +195,11 @@ genassym.o: $S/$M/$M/genassym.c
 
 ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h
 
-kernel-depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \
+kernel-depend:
+	rm -f .depend
+	${MAKE} _kernel-depend
+
+_kernel-depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \
 	    ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \
 	    ${SYSTEM_SFILES} ${MFILES:T:S/.m$/.h/}
 	rm -f .newdep