[src/trunk]: src/sys/arch/i386/stand use a .BEGIN target to make the various ...

[chs <chs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7ba5d129388e
branches:  trunk
changeset: 584445:7ba5d129388e
user:      chs <chs%NetBSD.org@localhost>
date:      Sat Sep 17 16:49:25 2005 +0000

description:
use a .BEGIN target to make the various symlinks,
the previous way had problems with parallel make.

diffstat:

 sys/arch/i386/stand/Makefile.booters       |  30 ++++++++----------------------
 sys/arch/i386/stand/boot/Makefile.boot     |  30 ++++++++----------------------
 sys/arch/i386/stand/bootxx/Makefile.bootxx |  30 ++++++++----------------------
 3 files changed, 24 insertions(+), 66 deletions(-)

diffs (141 lines):

diff -r abe9b4c23cd3 -r 7ba5d129388e sys/arch/i386/stand/Makefile.booters
--- a/sys/arch/i386/stand/Makefile.booters      Sat Sep 17 15:16:11 2005 +0000
+++ b/sys/arch/i386/stand/Makefile.booters      Sat Sep 17 16:49:25 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.booters,v 1.60 2005/05/05 18:03:04 christos Exp $
+#      $NetBSD: Makefile.booters,v 1.61 2005/09/17 16:49:25 chs Exp $
 
 .include <bsd.own.mk>
 
@@ -49,30 +49,16 @@
 CLEANFILES+= ${STARTFILE} vers.c ${BASE}.list
 SRCS+= vers.c
 
-.if !make(obj) && !make(clean) && !make(cleandir)
-.NOPATH: machine x86
-.endif
-
-depend dependall realdepend realall: machine x86 lib
 CLEANFILES+= machine x86
 
-machine:: x86
-       -rm -f $@
-       ln -s $S/arch/i386/include $@
-
-x86::
-       -rm -f $@
-       ln -s $S/arch/x86/include $@
-
-${OBJS} ${ROMSTART} ${DOSSTART} ${PXESTART}: machine x86 lib
-
-lib:
+.if !make(obj) && !make(clean) && !make(cleandir)
+.BEGIN:
+       -rm -f machine && ln -s $S/arch/i386/include machine
+       -rm -f x86 && ln -s $S/arch/x86/include x86
 .ifdef LIBOBJ
-       -rm -f $@
-       ln -s ${LIBOBJ}/lib .
-       [ -d ${LIBOBJ}/lib ] || mkdir ${LIBOBJ}/lib
-.else
-       mkdir lib
+       -rm -f lib && ln -s ${LIBOBJ}/lib lib
+       mkdir -p ${LIBOBJ}/lib
+.endif
 .endif
 
 ### find out what to use for libkern
diff -r abe9b4c23cd3 -r 7ba5d129388e sys/arch/i386/stand/boot/Makefile.boot
--- a/sys/arch/i386/stand/boot/Makefile.boot    Sat Sep 17 15:16:11 2005 +0000
+++ b/sys/arch/i386/stand/boot/Makefile.boot    Sat Sep 17 16:49:25 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.23 2005/06/22 06:06:34 junyoung Exp $
+# $NetBSD: Makefile.boot,v 1.24 2005/09/17 16:49:25 chs Exp $
 
 S=     ${.CURDIR}/../../../../../
 
@@ -82,30 +82,16 @@
 
 I386_STAND_DIR?= $S/arch/i386/stand
 
-.if !make(obj) && !make(clean) && !make(cleandir)
-.NOPATH: machine x86
-.endif
-
-depend dependall realdepend realall: machine x86 lib
 CLEANFILES+= machine x86
 
-machine::
-       -rm -f $@
-       ln -s $S/arch/i386/include $@
-
-x86::
-       -rm -f $@
-       ln -s $S/arch/x86/include $@
-
-${OBJS}: machine x86 lib
-
-lib:
+.if !make(obj) && !make(clean) && !make(cleandir)
+.BEGIN:
+       -rm -f machine && ln -s $S/arch/i386/include machine
+       -rm -f x86 && ln -s $S/arch/x86/include x86
 .ifdef LIBOBJ
-       -rm -f $@
-       ln -s ${LIBOBJ}/lib .
-       [ -d ${LIBOBJ}/lib ] || mkdir ${LIBOBJ}/lib
-.else
-       mkdir lib
+       -rm -f lib && ln -s ${LIBOBJ}/lib lib
+       mkdir -p ${LIBOBJ}/lib
+.endif
 .endif
 
 ### find out what to use for libi386
diff -r abe9b4c23cd3 -r 7ba5d129388e sys/arch/i386/stand/bootxx/Makefile.bootxx
--- a/sys/arch/i386/stand/bootxx/Makefile.bootxx        Sat Sep 17 15:16:11 2005 +0000
+++ b/sys/arch/i386/stand/bootxx/Makefile.bootxx        Sat Sep 17 16:49:25 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootxx,v 1.17 2005/05/05 18:03:04 christos Exp $
+# $NetBSD: Makefile.bootxx,v 1.18 2005/09/17 16:49:25 chs Exp $
 
 S=     ${.CURDIR}/../../../../../
 
@@ -86,30 +86,16 @@
 
 I386_STAND_DIR?= $S/arch/i386/stand
 
-.if !make(obj) && !make(clean) && !make(cleandir)
-.NOPATH: machine x86
-.endif
-
-depend dependall realdepend realall: machine x86 lib
 CLEANFILES+= machine x86
 
-machine::
-       -rm -f $@
-       ln -s $S/arch/i386/include $@
-
-x86::
-       -rm -f $@
-       ln -s $S/arch/x86/include $@
-
-${OBJS}: machine x86 lib
-
-lib:
+.if !make(obj) && !make(clean) && !make(cleandir)
+.BEGIN:
+       -rm -f machine && ln -s $S/arch/i386/include machine
+       -rm -f x86 && ln -s $S/arch/x86/include x86
 .ifdef LIBOBJ
-       -rm -f $@
-       ln -s ${LIBOBJ}/lib .
-       [ -d ${LIBOBJ}/lib ] || mkdir ${LIBOBJ}/lib
-.else
-       mkdir lib
+       -rm -f lib && ln -s ${LIBOBJ}/lib lib
+       mkdir -p ${LIBOBJ}/lib
+.endif
 .endif
 
 ### find out what to use for libi386