${SRCS} is only used once, and fits onto the line where it is used

idea that came out of discussion with drahn

27 files changed, 54 insertions, 81 deletions

diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha
index 4ffb9544b43..30601fa80a2 100644
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.alpha,v 1.65 2010/05/24 23:19:20 deraadt Exp $
+#	$OpenBSD: Makefile.alpha,v 1.66 2010/05/25 02:35:01 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -127,9 +127,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/locore.s
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index 6b71a94a5e0..531b57c8d11 100644
--- a/sys/arch/amd64/conf/Makefile.amd64
+++ b/sys/arch/amd64/conf/Makefile.amd64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.amd64,v 1.38 2010/05/24 23:19:21 deraadt Exp $
+#	$OpenBSD: Makefile.amd64,v 1.39 2010/05/25 02:35:02 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -128,9 +128,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/locore.S
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/armish/conf/Makefile.armish b/sys/arch/armish/conf/Makefile.armish
index 884fc845013..07ba7d3ff34 100644
--- a/sys/arch/armish/conf/Makefile.armish
+++ b/sys/arch/armish/conf/Makefile.armish
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.armish,v 1.30 2010/05/24 23:19:21 deraadt Exp $
+#	$OpenBSD: Makefile.armish,v 1.31 2010/05/25 02:35:02 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -137,9 +137,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/${_mach}_start.S ${_archdir}/${_arch}/locore.S
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/aviion/conf/Makefile.aviion b/sys/arch/aviion/conf/Makefile.aviion
index e64e288766e..425b9359f11 100644
--- a/sys/arch/aviion/conf/Makefile.aviion
+++ b/sys/arch/aviion/conf/Makefile.aviion
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.aviion,v 1.24 2010/05/24 23:19:21 deraadt Exp $
+#	$OpenBSD: Makefile.aviion,v 1.25 2010/05/25 02:35:02 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -133,9 +133,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/locore.S
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/beagle/conf/Makefile.beagle b/sys/arch/beagle/conf/Makefile.beagle
index f1c7fb6d036..5671554cb20 100644
--- a/sys/arch/beagle/conf/Makefile.beagle
+++ b/sys/arch/beagle/conf/Makefile.beagle
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.beagle,v 1.24 2010/05/24 23:19:21 deraadt Exp $
+#	$OpenBSD: Makefile.beagle,v 1.25 2010/05/25 02:35:02 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -133,9 +133,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/${_mach}_start.S ${_archdir}/${_arch}/locore.S
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/gumstix/conf/Makefile.gumstix b/sys/arch/gumstix/conf/Makefile.gumstix
index fe40a545c73..c09111ee95d 100644
--- a/sys/arch/gumstix/conf/Makefile.gumstix
+++ b/sys/arch/gumstix/conf/Makefile.gumstix
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.gumstix,v 1.22 2010/05/24 23:19:21 deraadt Exp $
+#	$OpenBSD: Makefile.gumstix,v 1.23 2010/05/25 02:35:02 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -133,9 +133,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/${_mach}_start.S ${_archdir}/${_arch}/locore.S
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300
index 44975884759..7cd4cd312c9 100644
--- a/sys/arch/hp300/conf/Makefile.hp300
+++ b/sys/arch/hp300/conf/Makefile.hp300
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hp300,v 1.65 2010/05/24 23:19:21 deraadt Exp $
+#	$OpenBSD: Makefile.hp300,v 1.66 2010/05/25 02:35:02 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -164,9 +164,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/locore.s
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa
index c1cac1b6de1..a8ed65e8bdf 100644
--- a/sys/arch/hppa/conf/Makefile.hppa
+++ b/sys/arch/hppa/conf/Makefile.hppa
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hppa,v 1.54 2010/05/24 23:19:21 deraadt Exp $
+#	$OpenBSD: Makefile.hppa,v 1.55 2010/05/25 02:35:02 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -148,9 +148,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/locore.S
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/hppa64/conf/Makefile.hppa64 b/sys/arch/hppa64/conf/Makefile.hppa64
index aa76436b158..838fa3e2795 100644
--- a/sys/arch/hppa64/conf/Makefile.hppa64
+++ b/sys/arch/hppa64/conf/Makefile.hppa64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hppa64,v 1.28 2010/05/24 23:19:22 deraadt Exp $
+#	$OpenBSD: Makefile.hppa64,v 1.29 2010/05/25 02:35:02 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -128,9 +128,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/locore.S
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index 5b5b7a4adde..6fe3f08d904 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.i386,v 1.71 2010/05/24 23:19:22 deraadt Exp $
+#	$OpenBSD: Makefile.i386,v 1.72 2010/05/25 02:35:02 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -133,9 +133,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/locore.s
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk
index 49b4de1f97c..9fdbea21575 100644
--- a/sys/arch/landisk/conf/Makefile.landisk
+++ b/sys/arch/landisk/conf/Makefile.landisk
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.landisk,v 1.31 2010/05/24 23:19:22 deraadt Exp $
+#	$OpenBSD: Makefile.landisk,v 1.32 2010/05/25 02:35:02 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -127,9 +127,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/locore.S
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/loongson/conf/Makefile.loongson b/sys/arch/loongson/conf/Makefile.loongson
index 99d95c90ef7..e8b6c5f448e 100644
--- a/sys/arch/loongson/conf/Makefile.loongson
+++ b/sys/arch/loongson/conf/Makefile.loongson
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.loongson,v 1.21 2010/05/24 23:19:22 deraadt Exp $
+#	$OpenBSD: Makefile.loongson,v 1.22 2010/05/25 02:35:02 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -138,9 +138,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/locore.S
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/luna88k/conf/Makefile.luna88k b/sys/arch/luna88k/conf/Makefile.luna88k
index d0b1e04b7bd..075d8bc1c8e 100644
--- a/sys/arch/luna88k/conf/Makefile.luna88k
+++ b/sys/arch/luna88k/conf/Makefile.luna88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.luna88k,v 1.31 2010/05/24 23:19:22 deraadt Exp $
+#	$OpenBSD: Makefile.luna88k,v 1.32 2010/05/25 02:35:02 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -131,9 +131,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/locore.S
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k
index f7e14fe53e0..f03c212afeb 100644
--- a/sys/arch/mac68k/conf/Makefile.mac68k
+++ b/sys/arch/mac68k/conf/Makefile.mac68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mac68k,v 1.62 2010/05/24 23:19:22 deraadt Exp $
+#	$OpenBSD: Makefile.mac68k,v 1.63 2010/05/25 02:35:02 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -129,9 +129,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/locore.s
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc
index 691447fd24c..2266a25180a 100644
--- a/sys/arch/macppc/conf/Makefile.macppc
+++ b/sys/arch/macppc/conf/Makefile.macppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.macppc,v 1.51 2010/05/24 23:19:22 deraadt Exp $
+#	$OpenBSD: Makefile.macppc,v 1.52 2010/05/25 02:35:02 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -127,9 +127,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/locore.S
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/moko/conf/Makefile.moko b/sys/arch/moko/conf/Makefile.moko
index 0ddf8201a20..04c9890d332 100644
--- a/sys/arch/moko/conf/Makefile.moko
+++ b/sys/arch/moko/conf/Makefile.moko
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.moko,v 1.22 2010/05/24 23:19:22 deraadt Exp $
+#	$OpenBSD: Makefile.moko,v 1.23 2010/05/25 02:35:02 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -133,9 +133,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/${_mach}_start.S ${_archdir}/${_arch}/locore.S
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k
index df2b8814461..508bfc8e0e9 100644
--- a/sys/arch/mvme68k/conf/Makefile.mvme68k
+++ b/sys/arch/mvme68k/conf/Makefile.mvme68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mvme68k,v 1.53 2010/05/24 23:19:22 deraadt Exp $
+#	$OpenBSD: Makefile.mvme68k,v 1.54 2010/05/25 02:35:02 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -130,9 +130,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/locore.s
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k
index 2130a1945a6..5cc5d74bac9 100644
--- a/sys/arch/mvme88k/conf/Makefile.mvme88k
+++ b/sys/arch/mvme88k/conf/Makefile.mvme88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mvme88k,v 1.61 2010/05/24 23:19:22 deraadt Exp $
+#	$OpenBSD: Makefile.mvme88k,v 1.62 2010/05/25 02:35:02 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -128,9 +128,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/locore.S
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/mvmeppc/conf/Makefile.mvmeppc b/sys/arch/mvmeppc/conf/Makefile.mvmeppc
index e0167bffa22..0ee3ead406b 100644
--- a/sys/arch/mvmeppc/conf/Makefile.mvmeppc
+++ b/sys/arch/mvmeppc/conf/Makefile.mvmeppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mvmeppc,v 1.48 2010/05/24 23:19:22 deraadt Exp $
+#	$OpenBSD: Makefile.mvmeppc,v 1.49 2010/05/25 02:35:02 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -127,9 +127,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/locore.S
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/palm/conf/Makefile.palm b/sys/arch/palm/conf/Makefile.palm
index d48253aefb2..3c231d277bb 100644
--- a/sys/arch/palm/conf/Makefile.palm
+++ b/sys/arch/palm/conf/Makefile.palm
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.palm,v 1.19 2010/05/24 23:19:22 deraadt Exp $
+#	$OpenBSD: Makefile.palm,v 1.20 2010/05/25 02:35:03 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -133,9 +133,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/${_mach}_start.S ${_archdir}/${_arch}/locore.S
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi
index cf819d3250a..10738c27690 100644
--- a/sys/arch/sgi/conf/Makefile.sgi
+++ b/sys/arch/sgi/conf/Makefile.sgi
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sgi,v 1.43 2010/05/24 23:19:22 deraadt Exp $
+#	$OpenBSD: Makefile.sgi,v 1.44 2010/05/25 02:35:03 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -138,9 +138,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/locore.S
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/socppc/conf/Makefile.socppc b/sys/arch/socppc/conf/Makefile.socppc
index 39757d11bc9..4703c10f1a6 100644
--- a/sys/arch/socppc/conf/Makefile.socppc
+++ b/sys/arch/socppc/conf/Makefile.socppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.socppc,v 1.22 2010/05/24 23:19:22 deraadt Exp $
+#	$OpenBSD: Makefile.socppc,v 1.23 2010/05/25 02:35:03 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -127,9 +127,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/locore.S
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/solbourne/conf/Makefile.solbourne b/sys/arch/solbourne/conf/Makefile.solbourne
index fabf57ef2a9..6fe3f786ad1 100644
--- a/sys/arch/solbourne/conf/Makefile.solbourne
+++ b/sys/arch/solbourne/conf/Makefile.solbourne
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.solbourne,v 1.24 2010/05/24 23:19:22 deraadt Exp $
+#	$OpenBSD: Makefile.solbourne,v 1.25 2010/05/25 02:35:03 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -127,9 +127,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/locore.s
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc
index 6e6bca16803..f8739ad97d0 100644
--- a/sys/arch/sparc/conf/Makefile.sparc
+++ b/sys/arch/sparc/conf/Makefile.sparc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sparc,v 1.61 2010/05/24 23:19:22 deraadt Exp $
+#	$OpenBSD: Makefile.sparc,v 1.62 2010/05/25 02:35:03 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -130,9 +130,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/locore.s
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64
index dc8ae8d267a..e2641a778d9 100644
--- a/sys/arch/sparc64/conf/Makefile.sparc64
+++ b/sys/arch/sparc64/conf/Makefile.sparc64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sparc64,v 1.48 2010/05/24 23:19:22 deraadt Exp $
+#	$OpenBSD: Makefile.sparc64,v 1.49 2010/05/25 02:35:03 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -127,9 +127,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/locore.s
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax
index 0f4a1c341a0..2682ce37b75 100644
--- a/sys/arch/vax/conf/Makefile.vax
+++ b/sys/arch/vax/conf/Makefile.vax
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.vax,v 1.51 2010/05/24 23:19:22 deraadt Exp $
+#	$OpenBSD: Makefile.vax,v 1.52 2010/05/25 02:35:03 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -127,9 +127,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/intvec.s ${_machdir}/${_mach}/subr.s
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)
diff --git a/sys/arch/zaurus/conf/Makefile.zaurus b/sys/arch/zaurus/conf/Makefile.zaurus
index 7e044d84875..740b71f511b 100644
--- a/sys/arch/zaurus/conf/Makefile.zaurus
+++ b/sys/arch/zaurus/conf/Makefile.zaurus
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.zaurus,v 1.32 2010/05/24 23:19:22 deraadt Exp $
+#	$OpenBSD: Makefile.zaurus,v 1.33 2010/05/25 02:35:03 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -133,9 +133,8 @@ tags:
 	@echo "see $S/kern/Makefile for tags"
 
 AFILES=	${_machdir}/${_mach}/${_mach}_start.S ${_archdir}/${_arch}/locore.S
-SRCS=	${AFILES} param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
+.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if !empty(SFILES)