The drahn memorial bad kernel build fix: prevent blood pressure

spikes in other developers by making it so that removal of a .d
file without removing the corresponding object will result in the
latter being treated as out of date.

ok beck@ art@ drahn@

26 files changed, 156 insertions, 104 deletions

diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha
index 41869a4ebff..4d433010231 100644
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.alpha,v 1.75 2011/07/06 02:08:04 tedu Exp $
+#	$OpenBSD: Makefile.alpha,v 1.76 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -157,9 +157,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index 425a89b8950..340311e4a3e 100644
--- a/sys/arch/amd64/conf/Makefile.amd64
+++ b/sys/arch/amd64/conf/Makefile.amd64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.amd64,v 1.49 2011/07/06 02:08:04 tedu Exp $
+#	$OpenBSD: Makefile.amd64,v 1.50 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -159,9 +159,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/armish/conf/Makefile.armish b/sys/arch/armish/conf/Makefile.armish
index 5627f8a8115..cb871137b38 100644
--- a/sys/arch/armish/conf/Makefile.armish
+++ b/sys/arch/armish/conf/Makefile.armish
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.armish,v 1.40 2011/07/06 02:08:04 tedu Exp $
+#	$OpenBSD: Makefile.armish,v 1.41 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -169,9 +169,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/aviion/conf/Makefile.aviion b/sys/arch/aviion/conf/Makefile.aviion
index 613f6a05741..ee6dec878e0 100644
--- a/sys/arch/aviion/conf/Makefile.aviion
+++ b/sys/arch/aviion/conf/Makefile.aviion
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.aviion,v 1.35 2011/07/06 02:08:04 tedu Exp $
+#	$OpenBSD: Makefile.aviion,v 1.36 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -164,9 +164,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/beagle/conf/Makefile.beagle b/sys/arch/beagle/conf/Makefile.beagle
index 31e7765cc79..e6f7bd7a851 100644
--- a/sys/arch/beagle/conf/Makefile.beagle
+++ b/sys/arch/beagle/conf/Makefile.beagle
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.beagle,v 1.34 2011/07/06 02:08:04 tedu Exp $
+#	$OpenBSD: Makefile.beagle,v 1.35 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -165,9 +165,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/gumstix/conf/Makefile.gumstix b/sys/arch/gumstix/conf/Makefile.gumstix
index bc1fbb482e7..e255ff3c06b 100644
--- a/sys/arch/gumstix/conf/Makefile.gumstix
+++ b/sys/arch/gumstix/conf/Makefile.gumstix
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.gumstix,v 1.32 2011/07/06 02:08:04 tedu Exp $
+#	$OpenBSD: Makefile.gumstix,v 1.33 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -165,9 +165,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300
index ac110024d65..41b7e8c4081 100644
--- a/sys/arch/hp300/conf/Makefile.hp300
+++ b/sys/arch/hp300/conf/Makefile.hp300
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hp300,v 1.75 2011/07/06 02:08:04 tedu Exp $
+#	$OpenBSD: Makefile.hp300,v 1.76 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -195,9 +195,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa
index 3af5c7f7545..0a9c1a431bb 100644
--- a/sys/arch/hppa/conf/Makefile.hppa
+++ b/sys/arch/hppa/conf/Makefile.hppa
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hppa,v 1.67 2011/07/06 02:08:04 tedu Exp $
+#	$OpenBSD: Makefile.hppa,v 1.68 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -167,9 +167,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/hppa64/conf/Makefile.hppa64 b/sys/arch/hppa64/conf/Makefile.hppa64
index 4ebb898b39d..b0dc8f9b721 100644
--- a/sys/arch/hppa64/conf/Makefile.hppa64
+++ b/sys/arch/hppa64/conf/Makefile.hppa64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hppa64,v 1.39 2011/07/06 02:08:04 tedu Exp $
+#	$OpenBSD: Makefile.hppa64,v 1.40 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -159,9 +159,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index dba18dcf79a..e330e2530f0 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.i386,v 1.81 2011/07/06 02:08:04 tedu Exp $
+#	$OpenBSD: Makefile.i386,v 1.82 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -164,9 +164,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk
index 187e3f36526..ddd82182852 100644
--- a/sys/arch/landisk/conf/Makefile.landisk
+++ b/sys/arch/landisk/conf/Makefile.landisk
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.landisk,v 1.42 2011/07/06 02:08:05 tedu Exp $
+#	$OpenBSD: Makefile.landisk,v 1.43 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -158,9 +158,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/loongson/conf/Makefile.loongson b/sys/arch/loongson/conf/Makefile.loongson
index 06d297f8441..ac1f8af9ab3 100644
--- a/sys/arch/loongson/conf/Makefile.loongson
+++ b/sys/arch/loongson/conf/Makefile.loongson
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.loongson,v 1.31 2011/07/06 02:08:05 tedu Exp $
+#	$OpenBSD: Makefile.loongson,v 1.32 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -170,9 +170,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/luna88k/conf/Makefile.luna88k b/sys/arch/luna88k/conf/Makefile.luna88k
index 4624b5f55fd..4c59bda6bcb 100644
--- a/sys/arch/luna88k/conf/Makefile.luna88k
+++ b/sys/arch/luna88k/conf/Makefile.luna88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.luna88k,v 1.42 2011/07/06 02:08:05 tedu Exp $
+#	$OpenBSD: Makefile.luna88k,v 1.43 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -162,9 +162,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k
index ed3d288e299..c3ed580b3b7 100644
--- a/sys/arch/mac68k/conf/Makefile.mac68k
+++ b/sys/arch/mac68k/conf/Makefile.mac68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mac68k,v 1.72 2011/07/06 02:08:05 tedu Exp $
+#	$OpenBSD: Makefile.mac68k,v 1.73 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -160,9 +160,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc
index 83d3c822616..2abaef918c5 100644
--- a/sys/arch/macppc/conf/Makefile.macppc
+++ b/sys/arch/macppc/conf/Makefile.macppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.macppc,v 1.61 2011/07/06 02:08:05 tedu Exp $
+#	$OpenBSD: Makefile.macppc,v 1.62 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -158,9 +158,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k
index c1eef7f7613..97e69365edd 100644
--- a/sys/arch/mvme68k/conf/Makefile.mvme68k
+++ b/sys/arch/mvme68k/conf/Makefile.mvme68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mvme68k,v 1.63 2011/07/06 02:08:05 tedu Exp $
+#	$OpenBSD: Makefile.mvme68k,v 1.64 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -161,9 +161,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k
index aec400a2c20..b1ca3263e5d 100644
--- a/sys/arch/mvme88k/conf/Makefile.mvme88k
+++ b/sys/arch/mvme88k/conf/Makefile.mvme88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mvme88k,v 1.72 2011/07/06 02:08:05 tedu Exp $
+#	$OpenBSD: Makefile.mvme88k,v 1.73 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -159,9 +159,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/octeon/conf/Makefile.octeon b/sys/arch/octeon/conf/Makefile.octeon
index b902fba3fa5..e990a22bc09 100644
--- a/sys/arch/octeon/conf/Makefile.octeon
+++ b/sys/arch/octeon/conf/Makefile.octeon
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.octeon,v 1.6 2011/07/06 02:08:05 tedu Exp $
+#	$OpenBSD: Makefile.octeon,v 1.7 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -170,9 +170,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/palm/conf/Makefile.palm b/sys/arch/palm/conf/Makefile.palm
index fc1b1575059..f579f157d36 100644
--- a/sys/arch/palm/conf/Makefile.palm
+++ b/sys/arch/palm/conf/Makefile.palm
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.palm,v 1.29 2011/07/06 02:08:05 tedu Exp $
+#	$OpenBSD: Makefile.palm,v 1.30 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -165,9 +165,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi
index 84201897985..6dd553bd02f 100644
--- a/sys/arch/sgi/conf/Makefile.sgi
+++ b/sys/arch/sgi/conf/Makefile.sgi
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sgi,v 1.53 2011/07/06 02:08:05 tedu Exp $
+#	$OpenBSD: Makefile.sgi,v 1.54 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -170,9 +170,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/socppc/conf/Makefile.socppc b/sys/arch/socppc/conf/Makefile.socppc
index 7275aa7504f..5845fc6462d 100644
--- a/sys/arch/socppc/conf/Makefile.socppc
+++ b/sys/arch/socppc/conf/Makefile.socppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.socppc,v 1.32 2011/07/06 02:08:05 tedu Exp $
+#	$OpenBSD: Makefile.socppc,v 1.33 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -158,9 +158,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/solbourne/conf/Makefile.solbourne b/sys/arch/solbourne/conf/Makefile.solbourne
index e023feda01c..b1ebda1afb5 100644
--- a/sys/arch/solbourne/conf/Makefile.solbourne
+++ b/sys/arch/solbourne/conf/Makefile.solbourne
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.solbourne,v 1.35 2011/07/06 02:08:05 tedu Exp $
+#	$OpenBSD: Makefile.solbourne,v 1.36 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -157,9 +157,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc
index e824d9d5b64..d200d41bfcc 100644
--- a/sys/arch/sparc/conf/Makefile.sparc
+++ b/sys/arch/sparc/conf/Makefile.sparc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sparc,v 1.71 2011/07/06 02:08:05 tedu Exp $
+#	$OpenBSD: Makefile.sparc,v 1.72 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -161,9 +161,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64
index 9e69a8448e0..a992b7c6baf 100644
--- a/sys/arch/sparc64/conf/Makefile.sparc64
+++ b/sys/arch/sparc64/conf/Makefile.sparc64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sparc64,v 1.58 2011/07/06 02:08:05 tedu Exp $
+#	$OpenBSD: Makefile.sparc64,v 1.59 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -158,9 +158,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax
index 1e801113112..0ca239595c4 100644
--- a/sys/arch/vax/conf/Makefile.vax
+++ b/sys/arch/vax/conf/Makefile.vax
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.vax,v 1.63 2011/07/06 02:08:05 tedu Exp $
+#	$OpenBSD: Makefile.vax,v 1.64 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -158,9 +158,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif
diff --git a/sys/arch/zaurus/conf/Makefile.zaurus b/sys/arch/zaurus/conf/Makefile.zaurus
index 1bb43e583f2..868d61f480a 100644
--- a/sys/arch/zaurus/conf/Makefile.zaurus
+++ b/sys/arch/zaurus/conf/Makefile.zaurus
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.zaurus,v 1.42 2011/07/06 02:08:05 tedu Exp $
+#	$OpenBSD: Makefile.zaurus,v 1.43 2011/07/07 22:28:18 guenther Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -165,9 +165,11 @@ install-kernel-${MACHINE_NAME}:
  ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
 .endif
 .ifnmake clean
-. for o in ${SYSTEM_OBJ:.o=.d} assym.d ${DB_STRUCTINFO:.h=.d}
-.  if exists($o)
-.   include "$o"
+. for o in ${SYSTEM_OBJ} assym.h ${DB_STRUCTINFO}
+.  if exists(${o:R}.d)
+.   include "${o:R}.d"
+.  elif exists($o)
+    .PHONY: $o
 .  endif
 . endfor
 .endif