summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2016-10-15 13:45:09 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2016-10-15 13:45:09 +0000
commit9e02ba4f8bb7e5a75f9b4d21173940a2dcb2c4ca (patch)
treec48db710b53a8781a66986da3357302e265550f5 /sys/arch/amd64
parent4e969093904145dc177cda98b0e3caa6ba1fb4c2 (diff)
cleandir: target for kernel compile directories
ok natano
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/compile/Makefile7
-rw-r--r--sys/arch/amd64/compile/Makefile.inc2
-rw-r--r--sys/arch/amd64/conf/Makefile.amd647
3 files changed, 9 insertions, 7 deletions
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 \