Introduce .WAIT into the cleandir rule for blasting the libsa/libkern/etc.

trees, because it can race with the libsa/libkern/etc. makefiles' own cleandir rules. I think I've found all of the uses of the offending idiom... Closes PR 43360.
2010-05-27 06:58:12 +00:00 · 2010-05-27 06:58:12 +00:00 · 5ef6a33bb9
parent 08d0e14947
commit 5ef6a33bb9
30 changed files with 60 additions and 60 deletions
--- a/sys/arch/arc/stand/boot/Makefile
+++ b/sys/arch/arc/stand/boot/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/04/03 10:38:12 tsutsui Exp $
+# $NetBSD: Makefile,v 1.9 2010/05/27 06:58:12 dholland Exp $

 .include <bsd.own.mk>
 .include <bsd.sys.mk>	# for ${HOST_SH}
@ -59,7 +59,7 @@ LIBZ=    ${ZLIB}

 LIBS=  ${LIBSA} ${LIBKERN} ${LIBZ}

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir
 cleanlibdir:
 	-rm -rf lib

--- a/sys/arch/atari/stand/libsa/Makefile
+++ b/sys/arch/atari/stand/libsa/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.30 2009/03/31 11:42:07 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.31 2010/05/27 06:58:13 dholland Exp $

 # Logically src/sys
 S!=	cd ${.CURDIR}/../../../..; pwd
@ -24,7 +24,7 @@ LIBS=	${LIBSA} ${LIBKERN}

 realall: ${LIBS}

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/bebox/stand/common/Makefile
+++ b/sys/arch/bebox/stand/common/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2008/05/26 16:36:09 kiyohara Exp $
+#	$NetBSD: Makefile,v 1.2 2010/05/27 06:58:13 dholland Exp $

 S= ${.CURDIR}/../../../..

@ -46,7 +46,7 @@ LIBS= ${LIBSA} ${LIBZ} ${LIBKERN}

 realall: machine-links ${LIBS}

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/cobalt/stand/boot/Makefile
+++ b/sys/arch/cobalt/stand/boot/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.20 2010/01/19 15:28:51 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.21 2010/05/27 06:58:13 dholland Exp $

 NOMAN= # defined

@ -107,7 +107,7 @@ ${PROG}: ${LDSCRIPT} ${OBJS} ${LIBS}

 CLEANFILES+=	${PROG}.map ${PROG}.elf ${PROG}.gz

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
+++ b/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.gzboot,v 1.15 2009/01/12 07:45:24 tsutsui Exp $
+#	$NetBSD: Makefile.gzboot,v 1.16 2010/05/27 06:58:13 dholland Exp $

 NOMAN=  # defined

@ -85,7 +85,7 @@ SA_AS=		library
 .include "${S}/lib/libsa/Makefile.inc"
 LIBSA=		${SALIB}

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/ews4800mips/stand/Makefile.bootxx
+++ b/sys/arch/ews4800mips/stand/Makefile.bootxx
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootxx,v 1.4 2009/03/15 06:17:02 tsutsui Exp $
+#	$NetBSD: Makefile.bootxx,v 1.5 2010/05/27 06:58:13 dholland Exp $

 NOMAN		=

@ -53,7 +53,7 @@ ${PROG}: ${OBJS} ${LIBS}
 	ls -al ${PROG}
 #	-rm -f ${BASE}.tmp

-clean cleandir distclean: cleanlibdir
+clean cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/ews4800mips/stand/boot/Makefile
+++ b/sys/arch/ews4800mips/stand/boot/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2009/04/03 10:38:12 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.11 2010/05/27 06:58:13 dholland Exp $

 WARNS		?= 1
 NOMAN		=
@ -99,7 +99,7 @@ LIBS		= ${LIBSA} ${LIBZ} ${LIBKERN}
 coffhdrfix:	${COMMON}/coffhdrfix.c
 	${HOST_CC} -o ${COFFHDRFIX} ${COMMON}/coffhdrfix.c

-clean cleandir distclean: cleanlibdir
+clean cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/i386/stand/Makefile.booters
+++ b/sys/arch/i386/stand/Makefile.booters
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.booters,v 1.78 2009/03/30 09:22:52 tsutsui Exp $
+#	$NetBSD: Makefile.booters,v 1.79 2010/05/27 06:58:13 dholland Exp $

 .include <bsd.own.mk>

@ -91,7 +91,7 @@ I386DIR= ${I386_STAND_DIR}/lib
 .include "${I386DIR}/Makefile.inc"
 LIBI386=		${I386LIB}

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/i386/stand/boot/Makefile
+++ b/sys/arch/i386/stand/boot/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/11/14 14:03:12 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2010/05/27 06:58:13 dholland Exp $

 SUBDIR= biosboot

@ -8,7 +8,7 @@ LIBOBJ= ${.OBJDIR}
 .include <bsd.subdir.mk>
 .include <bsd.obj.mk>

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/i386/stand/boot/Makefile.boot
+++ b/sys/arch/i386/stand/boot/Makefile.boot
@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.43 2010/05/23 13:59:12 veego Exp $
+# $NetBSD: Makefile.boot,v 1.44 2010/05/27 06:58:14 dholland Exp $

 S=	${.CURDIR}/../../../../..

@ -127,7 +127,7 @@ Z_AS= library
 LIBZ= ${ZLIB}


-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/i386/stand/bootxx/Makefile
+++ b/sys/arch/i386/stand/bootxx/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/11/14 14:03:12 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2010/05/27 06:58:14 dholland Exp $

 SUBDIR=	bootxx_cd9660 bootxx_ffsv1 .WAIT bootxx_ffsv2 bootxx_lfsv1 bootxx_lfsv2
 SUBDIR+=bootxx_msdos bootxx_ustarfs
@ -9,7 +9,7 @@ LIBOBJ= ${.OBJDIR}
 .include <bsd.subdir.mk>
 .include <bsd.obj.mk>

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/i386/stand/bootxx/Makefile.bootxx
+++ b/sys/arch/i386/stand/bootxx/Makefile.bootxx
@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootxx,v 1.38 2009/11/30 21:40:35 dsl Exp $
+# $NetBSD: Makefile.bootxx,v 1.39 2010/05/27 06:58:14 dholland Exp $

 S=	${.CURDIR}/../../../../..

@ -124,7 +124,7 @@ KERN_AS=        library
 LIBKERN=        ${KERNLIB}


-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/i386/stand/netboot/Makefile
+++ b/sys/arch/i386/stand/netboot/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.30 2005/12/11 12:17:49 christos Exp $
+#	$NetBSD: Makefile,v 1.31 2010/05/27 06:58:14 dholland Exp $

 SUBDIR+=	3c509
 SUBDIR+=	.WAIT
@ -16,7 +16,7 @@ LIBOBJ=	${.OBJDIR}
 .include <bsd.subdir.mk>
 .include <bsd.obj.mk>

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/ia64/stand/ia64/Makefile.booters
+++ b/sys/arch/ia64/stand/ia64/Makefile.booters
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.booters,v 1.3 2009/07/20 04:59:03 kiyohara Exp $
+#	$NetBSD: Makefile.booters,v 1.4 2010/05/27 06:58:14 dholland Exp $

 .include <bsd.own.mk>

@ -63,7 +63,7 @@ SAMISCMAKEFLAGS+="SA_USE_LOADFILE=yes" "SA_INCLUDE_NET=no"
 LIBSA=		${SALIB}


-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/landisk/stand/Makefile.bootprogs
+++ b/sys/arch/landisk/stand/Makefile.bootprogs
@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootprogs,v 1.3 2009/05/03 15:12:12 tsutsui Exp $
+# $NetBSD: Makefile.bootprogs,v 1.4 2010/05/27 06:58:14 dholland Exp $

 S=		${.CURDIR}/../../../../..

@ -57,7 +57,7 @@ Z_AS= library
 .include "${S}/lib/libz/Makefile.inc"
 LIBZ= ${ZLIB}

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/landisk/stand/boot/Makefile
+++ b/sys/arch/landisk/stand/boot/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/11/14 14:09:54 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2010/05/27 06:58:14 dholland Exp $

 SUBDIR= boot

@ -8,7 +8,7 @@ LIBOBJ= ${.OBJDIR}
 .include <bsd.subdir.mk>
 .include <bsd.obj.mk>

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/landisk/stand/bootxx/Makefile
+++ b/sys/arch/landisk/stand/bootxx/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/05/13 14:55:20 tsutsui Exp $
+# $NetBSD: Makefile,v 1.6 2010/05/27 06:58:14 dholland Exp $

 SUBDIR=	bootxx_ffsv1 .WAIT bootxx_ffsv2 bootxx_ustarfs

@ -8,7 +8,7 @@ LIBOBJ= ${.OBJDIR}
 .include <bsd.subdir.mk>
 .include <bsd.obj.mk>

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/macppc/stand/ofwboot/Makefile
+++ b/sys/arch/macppc/stand/ofwboot/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.49 2009/04/03 10:38:13 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.50 2010/05/27 06:58:14 dholland Exp $

 S=	${.CURDIR}/../../../..

@ -70,7 +70,7 @@ SAMISCMAKEFLAGS= SA_USE_CREAD=yes SA_USE_LOADFILE=yes
 .include "${S}/lib/libsa/Makefile.inc"
 LIBSA=		${SALIB}

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/mipsco/stand/Makefile.booters
+++ b/sys/arch/mipsco/stand/Makefile.booters
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.booters,v 1.15 2009/04/03 10:38:13 tsutsui Exp $
+#	$NetBSD: Makefile.booters,v 1.16 2010/05/27 06:58:14 dholland Exp $

 .include <bsd.sys.mk>		# for HOST_SH

@ -139,7 +139,7 @@ ${PROG}: machine-links ${LDSCRIPT} ${OBJS} ${LIBS}

 CLEANFILES+=	${PROG}.map ${PROG}.elf

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/news68k/stand/common/Makefile
+++ b/sys/arch/news68k/stand/common/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2009/04/03 10:38:13 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.14 2010/05/27 06:58:14 dholland Exp $

 S= ${.CURDIR}/../../../..

@ -35,7 +35,7 @@ LIBS= ${LIBSA} ${LIBZ} ${LIBKERN}

 realall: ${LIBS}

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/pmax/stand/Makefile.booters
+++ b/sys/arch/pmax/stand/Makefile.booters
@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.51 2009/04/23 16:37:44 tsutsui Exp $
+# $NetBSD: Makefile.booters,v 1.52 2010/05/27 06:58:14 dholland Exp $

 .include <bsd.sys.mk>		# for HOST_SH

@ -122,7 +122,7 @@ ${PROG}: ${OBJS} ${LIBS}

 CLEANFILES+=	${PROG}.map ${PROG}.elf

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/prep/stand/common/Makefile
+++ b/sys/arch/prep/stand/common/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2006/04/10 17:58:59 garbled Exp $
+#	$NetBSD: Makefile,v 1.10 2010/05/27 06:58:15 dholland Exp $

 S= ${.CURDIR}/../../../..

@ -46,7 +46,7 @@ LIBS= ${LIBSA} ${LIBZ} ${LIBKERN}

 realall: machine-links ${LIBS}

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/rs6000/stand/common/Makefile
+++ b/sys/arch/rs6000/stand/common/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2007/12/17 19:12:00 garbled Exp $
+#	$NetBSD: Makefile,v 1.2 2010/05/27 06:58:15 dholland Exp $

 S= ${.CURDIR}/../../../..

@ -46,7 +46,7 @@ LIBS= ${LIBSA} ${LIBZ} ${LIBKERN}

 realall: machine-links ${LIBS}

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/sandpoint/stand/netboot/Makefile
+++ b/sys/arch/sandpoint/stand/netboot/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2010/05/19 15:05:58 phx Exp $
+#	$NetBSD: Makefile,v 1.19 2010/05/27 06:58:15 dholland Exp $

 S=		${.CURDIR}/../../../..

@ -61,7 +61,7 @@ ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}

 .include <bsd.prog.mk>

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/sgimips/stand/boot/Makefile
+++ b/sys/arch/sgimips/stand/boot/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2009/12/16 19:00:48 matt Exp $
+#	$NetBSD: Makefile,v 1.17 2010/05/27 06:58:15 dholland Exp $


 # Don't strip the ECOFF'ed version on install -- strip gets confused by that,
@ -40,6 +40,6 @@ ip2xboot: ${OBJS} ${LIBS}
 	@${STRIP} -s ${.TARGET}.elf -o ${.TARGET}
 	@${SIZE} ${.TARGET}

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir
 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/sgimips/stand/boot64/Makefile
+++ b/sys/arch/sgimips/stand/boot64/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2009/03/15 15:20:13 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.7 2010/05/27 06:58:15 dholland Exp $

 PROG=	ip30boot

@ -73,7 +73,7 @@ ip30boot: ${OBJS} ${LIBS}
 	${LD} -m elf64btsmip -Map boot.map -x -Ttext ${LOAD_ADDRESS_IP30} \
 		${LDBUG} -e start -o ${.TARGET} ${OBJS} ${LIBS}

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir
 cleanlibdir:
 	-rm -rf lib

--- a/sys/arch/sparc/stand/Makefile.buildboot
+++ b/sys/arch/sparc/stand/Makefile.buildboot
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.buildboot,v 1.26 2009/11/27 11:11:22 tsutsui Exp $
+#	$NetBSD: Makefile.buildboot,v 1.27 2010/05/27 06:58:15 dholland Exp $
 #
 # This file is for the sparc `boot' and `bootxx' only; it does not
 # currently play well on a 64-bit system.
@ -58,7 +58,7 @@ LIBSA=		${SALIB}

 .include <bsd.klinks.mk>

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/sparc/stand/ofwboot/Makefile
+++ b/sys/arch/sparc/stand/ofwboot/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.23 2010/04/02 18:39:44 martin Exp $
+#	$NetBSD: Makefile,v 1.24 2010/05/27 06:58:15 dholland Exp $

 CURDIR=	${.CURDIR}
 S=	${CURDIR}/../../../..
@ -87,7 +87,7 @@ LIBSA=		${SALIB}
 .endif
 CLEANFILES+= machine sparc64 sparc

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/sun68k/stand/libsa/Makefile
+++ b/sys/arch/sun68k/stand/libsa/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.27 2009/03/20 11:42:25 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.28 2010/05/27 06:58:15 dholland Exp $

 # Logically src/sys
 S!= cd ${.CURDIR}/../../../..; pwd
@ -41,7 +41,7 @@ LIBS= ${LIBSA} ${LIBKERN}

 realall: ${LIBS}

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib
--- a/sys/arch/zaurus/stand/zboot/Makefile
+++ b/sys/arch/zaurus/stand/zboot/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2009/04/13 12:25:36 nonaka Exp $
+#	$NetBSD: Makefile,v 1.4 2010/05/27 06:58:15 dholland Exp $

 PROG=		zboot

@ -53,7 +53,7 @@ ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
 .include <bsd.klinks.mk>
 .include <bsd.prog.mk>

-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir

 cleanlibdir:
 	-rm -rf lib