cleandir: target for kernel compile directories

ok natano

39 files changed, 117 insertions, 94 deletions

diff --git a/sys/arch/alpha/compile/Makefile b/sys/arch/alpha/compile/Makefile
index 138b506d104..0adaaab8af6 100644
--- a/sys/arch/alpha/compile/Makefile
+++ b/sys/arch/alpha/compile/Makefile
@@ -1,8 +1,7 @@
-#	$OpenBSD: Makefile,v 1.1 2016/10/14 18:42:59 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.2 2016/10/15 13:45:07 deraadt Exp $
 
-.if	make(obj) || make(clean)
-SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \)
-#SUBDIR=GENERIC GENERIC.MP RAMDISK RAMDISKB RAMDISKBIG RAMDISKC
+.if	make(obj) || make(clean) || make(cleandir)
+SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \) | cut -b3-
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/sys/arch/alpha/compile/Makefile.inc b/sys/arch/alpha/compile/Makefile.inc
index d79a8803ef2..1c3a21c7e8d 100644
--- a/sys/arch/alpha/compile/Makefile.inc
+++ b/sys/arch/alpha/compile/Makefile.inc
@@ -11,7 +11,7 @@ config:
 config:
 	config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T}
 
-clean:
+cleandir clean:
 
 .endif
 
diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha
index ac8b8fa891e..896b24b227d 100644
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.alpha,v 1.90 2016/10/14 18:43:01 deraadt Exp $
+#	$OpenBSD: Makefile.alpha,v 1.91 2016/10/15 13:45:08 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -119,7 +119,10 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 
 clean::
 	rm -f eddep *bsd *bsd.gdb tags *.[dio] [a-z]*.s \
-	    [Ee]rrs linterrs assym.h ${DB_STRUCTINFO}
+	    [Ee]rrs linterrs assym.* ${DB_STRUCTINFO} param.c
+
+cleandir: clean
+	rm -f Makefile *.h ioconf.c options machine ${_mach} vers.c version
 
 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
diff --git a/sys/arch/amd64/compile/Makefile b/sys/arch/amd64/compile/Makefile
index 522b9b708d7..83dd5c4899f 100644
--- a/sys/arch/amd64/compile/Makefile
+++ b/sys/arch/amd64/compile/Makefile
@@ -1,8 +1,7 @@
-#	$OpenBSD: Makefile,v 1.1 2016/10/14 18:42:59 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.2 2016/10/15 13:45:08 deraadt Exp $
 
-.if	make(obj) || make(clean)
-SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \)
-#SUBDIR=GENERIC GENERIC.MP RAMDISK RAMDISK_CD
+.if	make(obj) || make(clean) || make(cleandir)
+SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \) | cut -b3-
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/sys/arch/amd64/compile/Makefile.inc b/sys/arch/amd64/compile/Makefile.inc
index d79a8803ef2..1c3a21c7e8d 100644
--- a/sys/arch/amd64/compile/Makefile.inc
+++ b/sys/arch/amd64/compile/Makefile.inc
@@ -11,7 +11,7 @@ config:
 config:
 	config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T}
 
-clean:
+cleandir clean:
 
 .endif
 
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index 9ca31c55d45..73193f3dc3d 100644
--- a/sys/arch/amd64/conf/Makefile.amd64
+++ b/sys/arch/amd64/conf/Makefile.amd64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.amd64,v 1.69 2016/10/14 18:43:01 deraadt Exp $
+#	$OpenBSD: Makefile.amd64,v 1.70 2016/10/15 13:45:08 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -123,7 +123,10 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 
 clean::
 	rm -f eddep *bsd *bsd.gdb tags *.[dio] [a-z]*.s \
-	    [Ee]rrs linterrs assym.h ${DB_STRUCTINFO}
+	    [Ee]rrs linterrs assym.* ${DB_STRUCTINFO} param.c
+
+cleandir: clean
+	rm -f Makefile *.h ioconf.c options machine ${_mach} vers.c version
 
 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
diff --git a/sys/arch/armv7/compile/Makefile b/sys/arch/armv7/compile/Makefile
index 4f5fc1a4e9a..83dd5c4899f 100644
--- a/sys/arch/armv7/compile/Makefile
+++ b/sys/arch/armv7/compile/Makefile
@@ -1,8 +1,7 @@
-#	$OpenBSD: Makefile,v 1.1 2016/10/14 18:42:59 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.2 2016/10/15 13:45:08 deraadt Exp $
 
-.if	make(obj) || make(clean)
-SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \)
-#SUBDIR=GENERIC RAMDISK
+.if	make(obj) || make(clean) || make(cleandir)
+SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \) | cut -b3-
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/sys/arch/armv7/compile/Makefile.inc b/sys/arch/armv7/compile/Makefile.inc
index d79a8803ef2..1c3a21c7e8d 100644
--- a/sys/arch/armv7/compile/Makefile.inc
+++ b/sys/arch/armv7/compile/Makefile.inc
@@ -11,7 +11,7 @@ config:
 config:
 	config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T}
 
-clean:
+cleandir clean:
 
 .endif
 
diff --git a/sys/arch/armv7/conf/Makefile.armv7 b/sys/arch/armv7/conf/Makefile.armv7
index 9fc0d03bda8..f074ce34f10 100644
--- a/sys/arch/armv7/conf/Makefile.armv7
+++ b/sys/arch/armv7/conf/Makefile.armv7
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.armv7,v 1.15 2016/10/14 18:43:01 deraadt Exp $
+#	$OpenBSD: Makefile.armv7,v 1.16 2016/10/15 13:45:08 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -124,7 +124,10 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 
 clean::
 	rm -f eddep *bsd *bsd.gdb tags *.[dio] [a-z]*.s \
-	    [Ee]rrs linterrs assym.h ${DB_STRUCTINFO}
+	    [Ee]rrs linterrs assym.* ${DB_STRUCTINFO} param.c
+
+cleandir: clean
+	rm -f Makefile *.h ioconf.c options machine ${_mach} vers.c version
 
 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
diff --git a/sys/arch/hppa/compile/Makefile b/sys/arch/hppa/compile/Makefile
index 22989def225..83dd5c4899f 100644
--- a/sys/arch/hppa/compile/Makefile
+++ b/sys/arch/hppa/compile/Makefile
@@ -1,8 +1,7 @@
-#	$OpenBSD: Makefile,v 1.1 2016/10/14 18:42:59 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.2 2016/10/15 13:45:08 deraadt Exp $
 
-.if	make(obj) || make(clean)
-SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \)
-#SUBDIR=GENERIC GENERIC.MP RAMDISK
+.if	make(obj) || make(clean) || make(cleandir)
+SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \) | cut -b3-
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/sys/arch/hppa/compile/Makefile.inc b/sys/arch/hppa/compile/Makefile.inc
index d79a8803ef2..1c3a21c7e8d 100644
--- a/sys/arch/hppa/compile/Makefile.inc
+++ b/sys/arch/hppa/compile/Makefile.inc
@@ -11,7 +11,7 @@ config:
 config:
 	config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T}
 
-clean:
+cleandir clean:
 
 .endif
 
diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa
index 0ceda0c9797..c77fd7fb88f 100644
--- a/sys/arch/hppa/conf/Makefile.hppa
+++ b/sys/arch/hppa/conf/Makefile.hppa
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hppa,v 1.83 2016/10/14 18:43:01 deraadt Exp $
+#	$OpenBSD: Makefile.hppa,v 1.84 2016/10/15 13:45:08 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -129,7 +129,10 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 
 clean::
 	rm -f eddep *bsd *bsd.gdb tags *.[dio] [a-z]*.s \
-	    [Ee]rrs linterrs assym.h ${DB_STRUCTINFO}
+	    [Ee]rrs linterrs assym.* ${DB_STRUCTINFO} param.c
+
+cleandir: clean
+	rm -f Makefile *.h ioconf.c options machine ${_mach} vers.c version
 
 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
diff --git a/sys/arch/i386/compile/Makefile b/sys/arch/i386/compile/Makefile
index 522b9b708d7..83dd5c4899f 100644
--- a/sys/arch/i386/compile/Makefile
+++ b/sys/arch/i386/compile/Makefile
@@ -1,8 +1,7 @@
-#	$OpenBSD: Makefile,v 1.1 2016/10/14 18:42:59 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.2 2016/10/15 13:45:08 deraadt Exp $
 
-.if	make(obj) || make(clean)
-SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \)
-#SUBDIR=GENERIC GENERIC.MP RAMDISK RAMDISK_CD
+.if	make(obj) || make(clean) || make(cleandir)
+SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \) | cut -b3-
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/sys/arch/i386/compile/Makefile.inc b/sys/arch/i386/compile/Makefile.inc
index d79a8803ef2..1c3a21c7e8d 100644
--- a/sys/arch/i386/compile/Makefile.inc
+++ b/sys/arch/i386/compile/Makefile.inc
@@ -11,7 +11,7 @@ config:
 config:
 	config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T}
 
-clean:
+cleandir clean:
 
 .endif
 
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index 00eaacfe87d..18f05560470 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.i386,v 1.96 2016/10/14 18:43:01 deraadt Exp $
+#	$OpenBSD: Makefile.i386,v 1.97 2016/10/15 13:45:08 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -125,7 +125,10 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 
 clean::
 	rm -f eddep *bsd *bsd.gdb tags *.[dio] [a-z]*.s \
-	    [Ee]rrs linterrs assym.h ${DB_STRUCTINFO}
+	    [Ee]rrs linterrs assym.* ${DB_STRUCTINFO} param.c
+
+cleandir: clean
+	rm -f Makefile *.h ioconf.c options machine ${_mach} vers.c version
 
 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
diff --git a/sys/arch/landisk/compile/Makefile b/sys/arch/landisk/compile/Makefile
index 4f5fc1a4e9a..83dd5c4899f 100644
--- a/sys/arch/landisk/compile/Makefile
+++ b/sys/arch/landisk/compile/Makefile
@@ -1,8 +1,7 @@
-#	$OpenBSD: Makefile,v 1.1 2016/10/14 18:42:59 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.2 2016/10/15 13:45:08 deraadt Exp $
 
-.if	make(obj) || make(clean)
-SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \)
-#SUBDIR=GENERIC RAMDISK
+.if	make(obj) || make(clean) || make(cleandir)
+SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \) | cut -b3-
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/sys/arch/landisk/compile/Makefile.inc b/sys/arch/landisk/compile/Makefile.inc
index d79a8803ef2..1c3a21c7e8d 100644
--- a/sys/arch/landisk/compile/Makefile.inc
+++ b/sys/arch/landisk/compile/Makefile.inc
@@ -11,7 +11,7 @@ config:
 config:
 	config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T}
 
-clean:
+cleandir clean:
 
 .endif
 
diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk
index 019922c3738..2daaaab9ee2 100644
--- a/sys/arch/landisk/conf/Makefile.landisk
+++ b/sys/arch/landisk/conf/Makefile.landisk
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.landisk,v 1.56 2016/10/14 18:43:01 deraadt Exp $
+#	$OpenBSD: Makefile.landisk,v 1.57 2016/10/15 13:45:08 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -118,7 +118,10 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 
 clean::
 	rm -f eddep *bsd *bsd.gdb tags *.[dio] [a-z]*.s \
-	    [Ee]rrs linterrs assym.h ${DB_STRUCTINFO}
+	    [Ee]rrs linterrs assym.* ${DB_STRUCTINFO} param.c
+
+cleandir: clean
+	rm -f Makefile *.h ioconf.c options machine ${_mach} vers.c version
 
 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
diff --git a/sys/arch/loongson/compile/Makefile b/sys/arch/loongson/compile/Makefile
index 471034dc9b0..83dd5c4899f 100644
--- a/sys/arch/loongson/compile/Makefile
+++ b/sys/arch/loongson/compile/Makefile
@@ -1,8 +1,7 @@
-#	$OpenBSD: Makefile,v 1.1 2016/10/14 18:43:00 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.2 2016/10/15 13:45:08 deraadt Exp $
 
-.if	make(obj) || make(clean)
-SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \)
-#SUBDIR=GENERIC RAMDISK
+.if	make(obj) || make(clean) || make(cleandir)
+SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \) | cut -b3-
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/sys/arch/loongson/compile/Makefile.inc b/sys/arch/loongson/compile/Makefile.inc
index d79a8803ef2..1c3a21c7e8d 100644
--- a/sys/arch/loongson/compile/Makefile.inc
+++ b/sys/arch/loongson/compile/Makefile.inc
@@ -11,7 +11,7 @@ config:
 config:
 	config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T}
 
-clean:
+cleandir clean:
 
 .endif
 
diff --git a/sys/arch/loongson/conf/Makefile.loongson b/sys/arch/loongson/conf/Makefile.loongson
index 204d261b5bf..e20422c76bd 100644
--- a/sys/arch/loongson/conf/Makefile.loongson
+++ b/sys/arch/loongson/conf/Makefile.loongson
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.loongson,v 1.48 2016/10/14 18:43:01 deraadt Exp $
+#	$OpenBSD: Makefile.loongson,v 1.49 2016/10/15 13:45:08 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -126,7 +126,10 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 
 clean::
 	rm -f eddep *bsd *bsd.gdb tags *.[dio] [a-z]*.s \
-	    [Ee]rrs linterrs assym.h ${DB_STRUCTINFO}
+	    [Ee]rrs linterrs assym.* ${DB_STRUCTINFO} param.c
+
+cleandir: clean
+	rm -f Makefile *.h ioconf.c options machine ${_mach} vers.c version
 
 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
diff --git a/sys/arch/luna88k/compile/Makefile b/sys/arch/luna88k/compile/Makefile
index 4c1ba402478..83dd5c4899f 100644
--- a/sys/arch/luna88k/compile/Makefile
+++ b/sys/arch/luna88k/compile/Makefile
@@ -1,8 +1,7 @@
-#	$OpenBSD: Makefile,v 1.1 2016/10/14 18:43:00 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.2 2016/10/15 13:45:08 deraadt Exp $
 
-.if	make(obj) || make(clean)
-SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \)
-#SUBDIR=GENERIC GENERIC.MP RAMDISK
+.if	make(obj) || make(clean) || make(cleandir)
+SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \) | cut -b3-
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/sys/arch/luna88k/compile/Makefile.inc b/sys/arch/luna88k/compile/Makefile.inc
index d79a8803ef2..1c3a21c7e8d 100644
--- a/sys/arch/luna88k/compile/Makefile.inc
+++ b/sys/arch/luna88k/compile/Makefile.inc
@@ -11,7 +11,7 @@ config:
 config:
 	config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T}
 
-clean:
+cleandir clean:
 
 .endif
 
diff --git a/sys/arch/luna88k/conf/Makefile.luna88k b/sys/arch/luna88k/conf/Makefile.luna88k
index 21efb29ca58..d33eb5b1b38 100644
--- a/sys/arch/luna88k/conf/Makefile.luna88k
+++ b/sys/arch/luna88k/conf/Makefile.luna88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.luna88k,v 1.61 2016/10/14 18:43:01 deraadt Exp $
+#	$OpenBSD: Makefile.luna88k,v 1.62 2016/10/15 13:45:08 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -123,7 +123,10 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 
 clean::
 	rm -f eddep *bsd *bsd.gdb tags *.[dio] [a-z]*.s \
-	    [Ee]rrs linterrs assym.h ${DB_STRUCTINFO}
+	    [Ee]rrs linterrs assym.* ${DB_STRUCTINFO} param.c
+
+cleandir: clean
+	rm -f Makefile *.h ioconf.c options machine ${_mach} vers.c version
 
 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
diff --git a/sys/arch/macppc/compile/Makefile b/sys/arch/macppc/compile/Makefile
index 4c1ba402478..83dd5c4899f 100644
--- a/sys/arch/macppc/compile/Makefile
+++ b/sys/arch/macppc/compile/Makefile
@@ -1,8 +1,7 @@
-#	$OpenBSD: Makefile,v 1.1 2016/10/14 18:43:00 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.2 2016/10/15 13:45:08 deraadt Exp $
 
-.if	make(obj) || make(clean)
-SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \)
-#SUBDIR=GENERIC GENERIC.MP RAMDISK
+.if	make(obj) || make(clean) || make(cleandir)
+SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \) | cut -b3-
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/sys/arch/macppc/compile/Makefile.inc b/sys/arch/macppc/compile/Makefile.inc
index d79a8803ef2..1c3a21c7e8d 100644
--- a/sys/arch/macppc/compile/Makefile.inc
+++ b/sys/arch/macppc/compile/Makefile.inc
@@ -11,7 +11,7 @@ config:
 config:
 	config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T}
 
-clean:
+cleandir clean:
 
 .endif
 
diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc
index 490d9fde5ba..cbaffaf0589 100644
--- a/sys/arch/macppc/conf/Makefile.macppc
+++ b/sys/arch/macppc/conf/Makefile.macppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.macppc,v 1.74 2016/10/14 18:43:02 deraadt Exp $
+#	$OpenBSD: Makefile.macppc,v 1.75 2016/10/15 13:45:08 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -118,7 +118,10 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 
 clean::
 	rm -f eddep *bsd *bsd.gdb tags *.[dio] [a-z]*.s \
-	    [Ee]rrs linterrs assym.h ${DB_STRUCTINFO}
+	    [Ee]rrs linterrs assym.* ${DB_STRUCTINFO} param.c
+
+cleandir: clean
+	rm -f Makefile *.h ioconf.c options machine ${_mach} vers.c version
 
 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
diff --git a/sys/arch/octeon/compile/Makefile b/sys/arch/octeon/compile/Makefile
index 039afc61e7d..5664244807a 100644
--- a/sys/arch/octeon/compile/Makefile
+++ b/sys/arch/octeon/compile/Makefile
@@ -1,8 +1,7 @@
-#	$OpenBSD: Makefile,v 1.1 2016/10/14 18:43:00 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.2 2016/10/15 13:45:08 deraadt Exp $
 
-.if	make(obj) || make(clean)
-SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \)
-#SUBDIR=GENERIC GENERIC.MP RAMDISK
+.if	make(obj) || make(clean) || make(cleandir)
+SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \) | cut -b3-
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/sys/arch/octeon/compile/Makefile.inc b/sys/arch/octeon/compile/Makefile.inc
index d79a8803ef2..1c3a21c7e8d 100644
--- a/sys/arch/octeon/compile/Makefile.inc
+++ b/sys/arch/octeon/compile/Makefile.inc
@@ -11,7 +11,7 @@ config:
 config:
 	config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T}
 
-clean:
+cleandir clean:
 
 .endif
 
diff --git a/sys/arch/octeon/conf/Makefile.octeon b/sys/arch/octeon/conf/Makefile.octeon
index 8d63bcdd3a1..eca76e0dfd3 100644
--- a/sys/arch/octeon/conf/Makefile.octeon
+++ b/sys/arch/octeon/conf/Makefile.octeon
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.octeon,v 1.24 2016/10/14 18:43:02 deraadt Exp $
+#	$OpenBSD: Makefile.octeon,v 1.25 2016/10/15 13:45:08 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -127,7 +127,10 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 
 clean::
 	rm -f eddep *bsd *bsd.gdb tags *.[dio] [a-z]*.s \
-	    [Ee]rrs linterrs assym.h ${DB_STRUCTINFO}
+	    [Ee]rrs linterrs assym.* ${DB_STRUCTINFO} param.c
+
+cleandir: clean
+	rm -f Makefile *.h ioconf.c options machine ${_mach} vers.c version
 
 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
diff --git a/sys/arch/sgi/compile/Makefile b/sys/arch/sgi/compile/Makefile
index 0f147f11628..83dd5c4899f 100644
--- a/sys/arch/sgi/compile/Makefile
+++ b/sys/arch/sgi/compile/Makefile
@@ -1,11 +1,7 @@
-#	$OpenBSD: Makefile,v 1.1 2016/10/14 18:43:00 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.2 2016/10/15 13:45:08 deraadt Exp $
 
-.if	make(obj) || make(clean)
-SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \)
-#SUBDIR=GENERIC-IP22 GENERIC-IP26 GENERIC-IP27 GENERIC-IP27.MP \
-#	GENERIC-IP28 GENERIC-IP30 GENERIC-IP30.MP GENERIC-IP32 \
-#	RAMDISK-IP22 RAMDISK-IP26 RAMDISK-IP27 RAMDISK-IP28 \
-#	RAMDISK-IP30 RAMDISK-IP32
+.if	make(obj) || make(clean) || make(cleandir)
+SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \) | cut -b3-
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/sys/arch/sgi/compile/Makefile.inc b/sys/arch/sgi/compile/Makefile.inc
index d79a8803ef2..1c3a21c7e8d 100644
--- a/sys/arch/sgi/compile/Makefile.inc
+++ b/sys/arch/sgi/compile/Makefile.inc
@@ -11,7 +11,7 @@ config:
 config:
 	config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T}
 
-clean:
+cleandir clean:
 
 .endif
 
diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi
index 3a2b7e8c106..1016ca89066 100644
--- a/sys/arch/sgi/conf/Makefile.sgi
+++ b/sys/arch/sgi/conf/Makefile.sgi
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sgi,v 1.72 2016/10/14 18:43:02 deraadt Exp $
+#	$OpenBSD: Makefile.sgi,v 1.73 2016/10/15 13:45:08 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -126,7 +126,10 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 
 clean::
 	rm -f eddep *bsd *bsd.gdb tags *.[dio] [a-z]*.s \
-	    [Ee]rrs linterrs assym.h ${DB_STRUCTINFO}
+	    [Ee]rrs linterrs assym.* ${DB_STRUCTINFO} param.c
+
+cleandir: clean
+	rm -f Makefile *.h ioconf.c options machine ${_mach} vers.c version
 
 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
diff --git a/sys/arch/socppc/compile/Makefile b/sys/arch/socppc/compile/Makefile
index 3b178449c83..83dd5c4899f 100644
--- a/sys/arch/socppc/compile/Makefile
+++ b/sys/arch/socppc/compile/Makefile
@@ -1,8 +1,7 @@
-#	$OpenBSD: Makefile,v 1.1 2016/10/14 18:43:01 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.2 2016/10/15 13:45:08 deraadt Exp $
 
-.if	make(obj) || make(clean)
-SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \)
-#SUBDIR=GENERIC RAMDISK
+.if	make(obj) || make(clean) || make(cleandir)
+SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \) | cut -b3-
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/sys/arch/socppc/compile/Makefile.inc b/sys/arch/socppc/compile/Makefile.inc
index d79a8803ef2..1c3a21c7e8d 100644
--- a/sys/arch/socppc/compile/Makefile.inc
+++ b/sys/arch/socppc/compile/Makefile.inc
@@ -11,7 +11,7 @@ config:
 config:
 	config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T}
 
-clean:
+cleandir clean:
 
 .endif
 
diff --git a/sys/arch/socppc/conf/Makefile.socppc b/sys/arch/socppc/conf/Makefile.socppc
index 8e6fca141fc..784af4600ca 100644
--- a/sys/arch/socppc/conf/Makefile.socppc
+++ b/sys/arch/socppc/conf/Makefile.socppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.socppc,v 1.45 2016/10/14 18:43:02 deraadt Exp $
+#	$OpenBSD: Makefile.socppc,v 1.46 2016/10/15 13:45:08 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -118,7 +118,10 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 
 clean::
 	rm -f eddep *bsd *bsd.gdb tags *.[dio] [a-z]*.s \
-	    [Ee]rrs linterrs assym.h ${DB_STRUCTINFO}
+	    [Ee]rrs linterrs assym.* ${DB_STRUCTINFO} param.c
+
+cleandir: clean
+	rm -f Makefile *.h ioconf.c options machine ${_mach} vers.c version
 
 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
diff --git a/sys/arch/sparc64/compile/Makefile b/sys/arch/sparc64/compile/Makefile
index 8a80b3aa5e3..5664244807a 100644
--- a/sys/arch/sparc64/compile/Makefile
+++ b/sys/arch/sparc64/compile/Makefile
@@ -1,8 +1,7 @@
-#	$OpenBSD: Makefile,v 1.1 2016/10/14 18:43:01 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.2 2016/10/15 13:45:08 deraadt Exp $
 
-.if	make(obj) || make(clean)
-SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \)
-#SUBDIR=GENERIC GENERIC.MP RAMDISK RAMDISKU1 RAMDISKU5
+.if	make(obj) || make(clean) || make(cleandir)
+SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \) | cut -b3-
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/sys/arch/sparc64/compile/Makefile.inc b/sys/arch/sparc64/compile/Makefile.inc
index d79a8803ef2..1c3a21c7e8d 100644
--- a/sys/arch/sparc64/compile/Makefile.inc
+++ b/sys/arch/sparc64/compile/Makefile.inc
@@ -11,7 +11,7 @@ config:
 config:
 	config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T}
 
-clean:
+cleandir clean:
 
 .endif
 
diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64
index 48d801f52bd..b69c4338bd1 100644
--- a/sys/arch/sparc64/conf/Makefile.sparc64
+++ b/sys/arch/sparc64/conf/Makefile.sparc64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sparc64,v 1.75 2016/10/14 18:43:02 deraadt Exp $
+#	$OpenBSD: Makefile.sparc64,v 1.76 2016/10/15 13:45:08 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -119,7 +119,10 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 
 clean::
 	rm -f eddep *bsd *bsd.gdb tags *.[dio] [a-z]*.s \
-	    [Ee]rrs linterrs assym.h ${DB_STRUCTINFO}
+	    [Ee]rrs linterrs assym.* ${DB_STRUCTINFO} param.c
+
+cleandir: clean
+	rm -f Makefile *.h ioconf.c options machine ${_mach} vers.c version
 
 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \