[src/trunk]: src/sys/arch Create the "machine" and "arm" links directly from ...

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

details:   https://anonhg.NetBSD.org/src/rev/db74f1ef21c9
branches:  trunk
changeset: 555613:db74f1ef21c9
user:      bjh21 <bjh21%NetBSD.org@localhost>
date:      Sun Nov 23 13:34:07 2003 +0000

description:
Create the "machine" and "arm" links directly from the .BEGIN rule, rather
than in dependencies of it, since .BEGIN is apparently only special for
its commands, not its dependencies.  This should get boot26, and probably
boot32, compiling again.

diffstat:

 sys/arch/acorn26/stand/Makefile.buildboot |  19 +++++--------------
 sys/arch/acorn32/stand/Makefile.buildboot |  19 +++++--------------
 2 files changed, 10 insertions(+), 28 deletions(-)

diffs (74 lines):

diff -r 796ff75db031 -r db74f1ef21c9 sys/arch/acorn26/stand/Makefile.buildboot
--- a/sys/arch/acorn26/stand/Makefile.buildboot Sun Nov 23 12:22:51 2003 +0000
+++ b/sys/arch/acorn26/stand/Makefile.buildboot Sun Nov 23 13:34:07 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.buildboot,v 1.8 2003/10/26 07:25:35 lukem Exp $
+#      $NetBSD: Makefile.buildboot,v 1.9 2003/11/23 13:34:07 bjh21 Exp $
 
 S?=    ${.CURDIR}/../../../..
 
@@ -32,23 +32,14 @@
 CFLAGS+=       -Wall -Wstrict-prototypes -Wmissing-prototypes
 
 .if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN: machine ${MACHINE_ARCH}
-.NOPATH: machine ${MACHINE_ARCH}
+.BEGIN:
+       -rm -f machine ${MACHINE_ARCH}
+       ln -s $S/arch/${MACHINE}/include machine
+       ln -s $S/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
 .endif
 
-realdepend realall: machine ${MACHINE_ARCH}
 CLEANFILES+= machine ${MACHINE_ARCH}
 
-machine::
-       -rm -f $@
-       ln -s $S/arch/acorn26/include $@
-
-${MACHINE_ARCH}::
-       -rm -f $@
-       ln -s $S/arch/${MACHINE_ARCH}/include $@
-
-${OBJS}: machine ${MACHINE_ARCH}
-
 ### find out what to use for libkern
 KERN_AS=       library
 .include "${S}/lib/libkern/Makefile.inc"
diff -r 796ff75db031 -r db74f1ef21c9 sys/arch/acorn32/stand/Makefile.buildboot
--- a/sys/arch/acorn32/stand/Makefile.buildboot Sun Nov 23 12:22:51 2003 +0000
+++ b/sys/arch/acorn32/stand/Makefile.buildboot Sun Nov 23 13:34:07 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.buildboot,v 1.5 2003/10/26 07:25:35 lukem Exp $
+#      $NetBSD: Makefile.buildboot,v 1.6 2003/11/23 13:34:07 bjh21 Exp $
 
 S?=    ${.CURDIR}/../../../..
 
@@ -32,23 +32,14 @@
 CFLAGS+=       -Wall -Wstrict-prototypes -Wmissing-prototypes
 
 .if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN: machine ${MACHINE_ARCH}
-.NOPATH: machine ${MACHINE_ARCH}
+.BEGIN:
+       -rm -f machine ${MACHINE_ARCH}
+       ln -s $S/arch/${MACHINE}/include machine
+       ln -s $S/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
 .endif
 
-realdepend realall: machine ${MACHINE_ARCH}
 CLEANFILES+= machine ${MACHINE_ARCH}
 
-machine::
-       -rm -f $@
-       ln -s $S/arch/acorn32/include $@
-
-${MACHINE_ARCH}::
-       -rm -f $@
-       ln -s $S/arch/${MACHINE_ARCH}/include $@
-
-${OBJS}: machine ${MACHINE_ARCH}
-
 ### find out what to use for libkern
 KERN_AS=       library
 .include "${S}/lib/libkern/Makefile.inc"