[src/trunk]: src/sys/arch use KLINK_MACHINE

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

details:   https://anonhg.NetBSD.org/src/rev/67a9278ec442
branches:  trunk
changeset: 786573:67a9278ec442
user:      matt <matt%NetBSD.org@localhost>
date:      Thu May 02 04:22:44 2013 +0000

description:
use KLINK_MACHINE

diffstat:

 sys/arch/acorn26/stand/Makefile.buildboot |   5 +++--
 sys/arch/acorn32/stand/Makefile.buildboot |  14 ++++----------
 sys/arch/evbarm/stand/Makefile.inc        |   8 ++++----
 sys/arch/zaurus/stand/Makefile.inc        |   4 ++--
 4 files changed, 13 insertions(+), 18 deletions(-)

diffs (93 lines):

diff -r 45cb9cc18dbf -r 67a9278ec442 sys/arch/acorn26/stand/Makefile.buildboot
--- a/sys/arch/acorn26/stand/Makefile.buildboot Thu May 02 04:14:28 2013 +0000
+++ b/sys/arch/acorn26/stand/Makefile.buildboot Thu May 02 04:22:44 2013 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile.buildboot,v 1.14 2013/05/01 22:36:52 matt Exp $
+#      $NetBSD: Makefile.buildboot,v 1.15 2013/05/02 04:22:44 matt Exp $
 
 S?=    ${.CURDIR}/../../../..
 
 .PATH: ${.CURDIR}/../lib
 
-MACHINE= acorn26
+KLINK_MACHINE= acorn26
 SRCS=  ${PROGSOURCE}
 NOMAN=# defined
 BINDIR=/usr/mdec
@@ -20,6 +20,7 @@
 RISCOSTYPE ?= ff8
 
 .include <bsd.own.mk>
+.include <bsd.klinks.mk>
 
 SRCS+=         vers.c
 CLEANFILES+=   vers.c
diff -r 45cb9cc18dbf -r 67a9278ec442 sys/arch/acorn32/stand/Makefile.buildboot
--- a/sys/arch/acorn32/stand/Makefile.buildboot Thu May 02 04:14:28 2013 +0000
+++ b/sys/arch/acorn32/stand/Makefile.buildboot Thu May 02 04:22:44 2013 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile.buildboot,v 1.15 2013/05/01 22:30:39 matt Exp $
+#      $NetBSD: Makefile.buildboot,v 1.16 2013/05/02 04:22:44 matt Exp $
 
 S?=    ${.CURDIR}/../../../..
 
 .PATH: ${.CURDIR}/../lib
 
-MACHINE=       acorn32
+KLINK_MACHINE= acorn32
 
 SRCS=  ${PROGSOURCE}
 NOMAN=# defined
@@ -31,13 +31,14 @@
 .endif
 
 .include <bsd.own.mk>
+.include <bsd.klinks.mk>
 
 SRCS+=         vers.c
 CLEANFILES+=   vers.c
 .PHONY: vers.c
 vers.c: ${.CURDIR}/version
        ${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
-           ${.CURDIR}/version ${MACHINE} ${NEWVERSWHAT}
+           ${.CURDIR}/version ${KLINK_MACHINE} ${NEWVERSWHAT}
 
 CPPFLAGS+=     -D_STANDALONE 
 CPPFLAGS+=     -I. -I${.CURDIR}/../../.. -I${.CURDIR}/../../../..
@@ -48,13 +49,6 @@
 CFLAGS+=       -ffreestanding
 CFLAGS+=       -Wall -Wstrict-prototypes -Wmissing-prototypes
 
-.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN:
-       -rm -f machine ${MACHINE_ARCH}
-       ln -s $S/arch/${MACHINE}/include machine
-       ln -s $S/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
-.endif
-
 CLEANFILES+= machine ${MACHINE_ARCH}
 
 ### find out what to use for libkern
diff -r 45cb9cc18dbf -r 67a9278ec442 sys/arch/evbarm/stand/Makefile.inc
--- a/sys/arch/evbarm/stand/Makefile.inc        Thu May 02 04:14:28 2013 +0000
+++ b/sys/arch/evbarm/stand/Makefile.inc        Thu May 02 04:22:44 2013 +0000
@@ -1,5 +1,5 @@
-#      $NetBSD: Makefile.inc,v 1.2 2013/05/02 03:56:41 matt Exp $
+#      $NetBSD: Makefile.inc,v 1.3 2013/05/02 04:22:44 matt Exp $
 
-BINDIR?= /usr/mdec
-FILESDIR?= /usr/mdec
-MACHINE=evbarm
+BINDIR?=       /usr/mdec
+FILESDIR?=     /usr/mdec
+KLINK_MACHINE= evbarm
diff -r 45cb9cc18dbf -r 67a9278ec442 sys/arch/zaurus/stand/Makefile.inc
--- a/sys/arch/zaurus/stand/Makefile.inc        Thu May 02 04:14:28 2013 +0000
+++ b/sys/arch/zaurus/stand/Makefile.inc        Thu May 02 04:22:44 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.2 2013/05/01 22:16:15 matt Exp $
+#      $NetBSD: Makefile.inc,v 1.3 2013/05/02 04:22:45 matt Exp $
 
 BINDIR=                /usr/mdec
-MACHINE=       zaurus
+KLINK_MACHINE= zaurus