avoid intermediate files with same name (ie. a.out) for parallel make

ok miod

6 files changed, 45 insertions, 42 deletions

diff --git a/lib/csu/vax/Makefile b/lib/csu/vax/Makefile
index 9b788c04d7d..c55a6b84f3e 100644
--- a/lib/csu/vax/Makefile
+++ b/lib/csu/vax/Makefile
@@ -1,26 +1,26 @@
-#	$OpenBSD: Makefile,v 1.5 2001/03/24 18:40:21 tholo Exp $
+#	$OpenBSD: Makefile,v 1.6 2007/10/30 06:02:22 deraadt Exp $
 #	from: @(#)Makefile	5.6 (Berkeley) 5/22/91
 
 CFLAGS+=	-DLIBC_SCCS -I${.CURDIR}/..
 OBJS=		crt0.o gcrt0.o scrt0.o
-CLEANFILES+=	core a.out
+CLEANFILES+=	core crt0.out gcrt0.out scrt0.out
 
 all: ${OBJS}
 
 crt0.o: crt0.c
 	${COMPILE.c} -DCRT0 -UDYNAMIC ${.ALLSRC}
-	${LD} -x -r ${.TARGET}
-	mv a.out ${.TARGET}
+	${LD} -x -r ${.TARGET} -o ${.TARGET}ut
+	mv ${.TARGET}ut ${.TARGET}
 
 gcrt0.o: crt0.c
 	${COMPILE.c} -DMCRT0 ${.ALLSRC} -o ${.TARGET}
-	${LD} -x -r ${.TARGET}
-	mv a.out ${.TARGET}
+	${LD} -x -r ${.TARGET} -o ${.TARGET}ut
+	mv ${.TARGET}ut ${.TARGET}
 
 scrt0.o: crt0.c
 	${COMPILE.c} -DSCRT0 ${.ALLSRC} -o ${.TARGET}
-	${LD} -x -r ${.TARGET}
-	mv a.out ${.TARGET}
+	${LD} -x -r ${.TARGET} -o ${.TARGET}ut
+	mv ${.TARGET}ut ${.TARGET}
 
 realinstall:
 	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
diff --git a/sys/arch/mvme68k/stand/bugcrt/Makefile b/sys/arch/mvme68k/stand/bugcrt/Makefile
index d9c9df7fe61..fc2c517ead0 100644
--- a/sys/arch/mvme68k/stand/bugcrt/Makefile
+++ b/sys/arch/mvme68k/stand/bugcrt/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 1997/04/22 16:05:38 gvf Exp $
+#	$OpenBSD: Makefile,v 1.8 2007/10/30 06:03:14 deraadt Exp $
 #
 # DO NOT OPTMIZE bugcrt (i.e. no "-O2")
 #
@@ -8,14 +8,14 @@ CFLAGS=-I${.CURDIR}/../../include -I${.CURDIR}/../libbug -I${S}/lib/libsa \
 
 OBJS=bugcrt.o
 
-CLEANFILES+=a.out
+CLEANFILES+=bugcrt.out	
 
 all:	${OBJS}
 
 bugcrt.o: bugcrt.c
 	${COMPILE.c} -c $<
-	${LD} -x -r ${.TARGET}
-	mv a.out ${.TARGET}
+	${LD} -x -r ${.TARGET} -o ${.TARGET}ut
+	mv ${.TARGET}ut ${.TARGET}
 
 install:
 
diff --git a/sys/arch/mvme88k/stand/bugcrt/Makefile b/sys/arch/mvme88k/stand/bugcrt/Makefile
index 98a879a6e82..37cd7edf486 100644
--- a/sys/arch/mvme88k/stand/bugcrt/Makefile
+++ b/sys/arch/mvme88k/stand/bugcrt/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.10 2003/10/02 13:24:39 miod Exp $
+#	$OpenBSD: Makefile,v 1.11 2007/10/30 06:03:16 deraadt Exp $
 
 S=${.CURDIR}/../../../..
 
@@ -9,24 +9,24 @@ SINGLE_CFLAGS=-DSTACK_ASM_OP="\".long ${STAGE2_RELOC}\"" -DSTAGE1
 SRCS=crt.c
 OBJS=stage1crt.o stage2crt.o singlecrt.o
 
-CLEANFILES+=a.out ${OBJS}
+CLEANFILES+=stage1crt.out stage2crt.out singlecrt.out ${OBJS}
 
 all:	${OBJS}
 
 stage1crt.o: crt.c
 	${CC} ${CFLAGS} ${STAGE1_CFLAGS} -c ${.CURDIR}/crt.c -o ${.TARGET}
-	${LD} -x -r ${.TARGET}
-	mv a.out ${.TARGET}
+	${LD} -x -r ${.TARGET} -o ${.TARGET}ut
+	mv ${.TARGET}ut ${.TARGET}
 
 stage2crt.o: crt.c
 	${CC} ${CFLAGS} ${STAGE2_CFLAGS} -c ${.CURDIR}/crt.c -o ${.TARGET}
-	${LD} -x -r ${.TARGET}
-	mv a.out ${.TARGET}
+	${LD} -x -r ${.TARGET} -o ${.TARGET}ut
+	mv ${.TARGET}ut ${.TARGET}
 
 singlecrt.o: crt.c
 	${CC} ${CFLAGS} ${SINGLE_CFLAGS} -c ${.CURDIR}/crt.c -o ${.TARGET}
-	${LD} -x -r ${.TARGET}
-	mv a.out ${.TARGET}
+	${LD} -x -r ${.TARGET} -o ${.TARGET}ut
+	mv ${.TARGET}ut ${.TARGET}
 
 install:
 
diff --git a/sys/arch/mvmeppc/stand/bugcrt/Makefile b/sys/arch/mvmeppc/stand/bugcrt/Makefile
index a34e296d768..70dbefaf389 100644
--- a/sys/arch/mvmeppc/stand/bugcrt/Makefile
+++ b/sys/arch/mvmeppc/stand/bugcrt/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2004/11/15 14:03:06 miod Exp $
+#	$OpenBSD: Makefile,v 1.3 2007/10/30 06:03:16 deraadt Exp $
 #
 # DO NOT OPTMIZE bugcrt (i.e. no "-O2")
 #
@@ -18,18 +18,18 @@ all:	${OBJS}
 
 stage1crt.o: crt.c
 	${CC} ${CFLAGS} ${STAGE1_CFLAGS} -c ${.CURDIR}/crt.c -o ${.TARGET}
-	${LD} -x -r ${.TARGET}
-	mv a.out ${.TARGET}
+	${LD} -x -r ${.TARGET} -o ${.TARGET}ut 
+	mv ${.TARGET}ut ${.TARGET}
 
 stage2crt.o: crt.c
 	${CC} ${CFLAGS} ${STAGE2_CFLAGS} -c ${.CURDIR}/crt.c -o ${.TARGET}
-	${LD} -x -r ${.TARGET}
-	mv a.out ${.TARGET}
+	${LD} -x -r ${.TARGET} -o ${.TARGET}ut 
+	mv ${.TARGET}ut ${.TARGET}
 
 singlecrt.o: crt.c
 	${CC} ${CFLAGS} ${SINGLE_CFLAGS} -c ${.CURDIR}/crt.c -o ${.TARGET}
-	${LD} -x -r ${.TARGET}
-	mv a.out ${.TARGET}
+	${LD} -x -r ${.TARGET} -o ${.TARGET}ut 
+	mv ${.TARGET}ut ${.TARGET}
 
 install:
 
diff --git a/sys/arch/sparc/stand/boot/Makefile b/sys/arch/sparc/stand/boot/Makefile
index cf25c3e058b..2846ebf7df5 100644
--- a/sys/arch/sparc/stand/boot/Makefile
+++ b/sys/arch/sparc/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.12 2003/08/11 06:35:45 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.13 2007/10/30 06:03:16 deraadt Exp $
 #	$NetBSD: Makefile,v 1.2 1995/09/30 21:43:38 pk Exp $
 
 .PATH:	${.CURDIR}/../common
@@ -22,12 +22,14 @@ elfclean: clean-elf.c
 	${HOSTCC} -o elfclean ${.ALLSRC}
 
 ${PROG}: ${OBJS} ${LIBS} elfclean
-	${LD} -N -Ttext ${RELOC2} --format a.out-sparc-netbsd -e start ${OBJS} ${LIBSA} ${LIBKERN} ${LIBZ} `cc -print-libgcc-file-name` -o elf
-	./elfclean elf
-	objcopy -j .text -j .data -j .bss -O a.out-sparc-netbsd elf a.out
-	@size a.out
-	(echo -n 01 | tr 01 '\01\03'; tail +3c a.out) | dd obs=512 conv=osync > ${.TARGET}
-	@rm a.out elf
+	${LD} -N -Ttext ${RELOC2} --format a.out-sparc-netbsd -e start ${OBJS} ${LIBSA} ${LIBKERN} ${LIBZ} `cc -print-libgcc-file-name` -o ${.TARGET}.elf
+	./elfclean ${.TARGET}.elf
+	objcopy -j .text -j .data -j .bss -O a.out-sparc-netbsd \
+	    ${.TARGET}.elf ${.TARGET}.aout
+	@size ${.TARGET}.aout
+	(echo -n 01 | tr 01 '\01\03'; tail +3c ${.TARGET}.aout) | \
+	    dd obs=512 conv=osync > ${.TARGET}
+	@rm ${.TARGET}.aout ${.TARGET}.elf
 
 srt0.o: srt0.S
 	${CC} ${CFLAGS} -D_LOCORE -c ${.IMPSRC}
diff --git a/sys/arch/sparc/stand/bootxx/Makefile b/sys/arch/sparc/stand/bootxx/Makefile
index afb0c7667f6..161973642b3 100644
--- a/sys/arch/sparc/stand/bootxx/Makefile
+++ b/sys/arch/sparc/stand/bootxx/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2003/08/11 06:35:45 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.8 2007/10/30 06:03:16 deraadt Exp $
 #	$NetBSD: Makefile,v 1.2 1995/09/30 21:43:38 pk Exp $
 
 .PATH:	${.CURDIR}/../common
@@ -9,7 +9,7 @@ NOMAN=	noman
 INSTALL_STRIP=
 
 SRCS=	srt0.S bootxx.c closeall.c dvma.c promdev.c
-CLEANFILES+=${PROG}.aout ${PROG}.elf elfclean elf
+CLEANFILES+=${PROG}.aout ${PROG}.elf elfclean
 
 # pre-built bits of libkern
 KOBJS=	__main.o bzero.o urem.o udiv.o
@@ -26,12 +26,13 @@ elfclean: clean-elf.c
 	${HOSTCC} -o elfclean ${.ALLSRC}
 
 ${PROG}: ${OBJS} elfclean
-	${LD} -N -Ttext ${RELOC} -e start ${OBJS} ${_SOBJS} ${_KOBJS} -o elf
-	./elfclean elf
-	objcopy -j .text -j .data -j .bss -O a.out-sparc-netbsd elf a.out
-	@size a.out
-	(echo -n 01 | tr 01 '\01\03'; tail +3c a.out) > ${.TARGET}
-	@rm a.out
+	${LD} -N -Ttext ${RELOC} -e start ${OBJS} ${_SOBJS} ${_KOBJS} -o ${.TARGET}.elf
+	./elfclean ${.TARGET}.elf
+	objcopy -j .text -j .data -j .bss -O a.out-sparc-netbsd \
+	    ${.TARGET}.elf ${.TARGET}.aout
+	@size ${.TARGET}.aout
+	(echo -n 01 | tr 01 '\01\03'; tail +3c ${.TARGET}.aout) > ${.TARGET}
+	@rm ${.TARGET}.aout ${.TARGET}.elf
 
 srt0.o: srt0.S
 	${CC} ${CFLAGS} -D_LOCORE -c ${.IMPSRC}