[src/trunk]: src/sys/arch Use <bsd.klinks.mk>

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

details:   https://anonhg.NetBSD.org/src/rev/7e44aac4ec5c
branches:  trunk
changeset: 789520:7e44aac4ec5c
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Aug 21 06:24:42 2013 +0000

description:
Use <bsd.klinks.mk>

diffstat:

 sys/arch/sbmips/stand/Makefile.bootprogs |  15 ++-------------
 sys/arch/shark/stand/ofwboot/Makefile    |  12 ++----------
 2 files changed, 4 insertions(+), 23 deletions(-)

diffs (61 lines):

diff -r d0e46f8db449 -r 7e44aac4ec5c sys/arch/sbmips/stand/Makefile.bootprogs
--- a/sys/arch/sbmips/stand/Makefile.bootprogs  Wed Aug 21 06:20:49 2013 +0000
+++ b/sys/arch/sbmips/stand/Makefile.bootprogs  Wed Aug 21 06:24:42 2013 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.bootprogs,v 1.10 2012/01/19 19:58:16 matt Exp $
+# $NetBSD: Makefile.bootprogs,v 1.11 2013/08/21 06:27:54 matt Exp $
 
 .include <bsd.own.mk>
+.include <bsd.klinks.mk>
 .include <bsd.sys.mk>          # for HOST_SH
 
 S=     ${.CURDIR}/../../../..
@@ -20,18 +21,6 @@
 
 CHECKSIZE_CMD= SIZE=${SIZE} ${HOST_SH} ${.CURDIR}/../common/checksize.sh
 
-.PHONY: machine-links
-beforedepend: machine-links .WAIT
-# ${MACHINE} then ${MACHINE_ARCH}
-machine-links:
-       -rm -f machine && \
-           ln -s $S/arch/sbmips/include machine
-       -rm -f mips && \
-           ln -s $S/arch/mips/include mips
-CLEANFILES+=machine mips
-
-realall: machine-links ${PROG}
-
 AFLAGS+=       -DASSEMBLER -D_LOCORE -mno-abicalls -mips64
 # -I${.CURDIR}/../.. done by Makefile.inc
 CPPFLAGS+=     -nostdinc -I${.OBJDIR} -D_STANDALONE -I${S}
diff -r d0e46f8db449 -r 7e44aac4ec5c sys/arch/shark/stand/ofwboot/Makefile
--- a/sys/arch/shark/stand/ofwboot/Makefile     Wed Aug 21 06:20:49 2013 +0000
+++ b/sys/arch/shark/stand/ofwboot/Makefile     Wed Aug 21 06:24:42 2013 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.13 2013/06/30 21:54:26 matt Exp $
+#      $NetBSD: Makefile,v 1.14 2013/08/21 06:24:42 matt Exp $
 
 NOMAN=         # defined
 
 .include <bsd.own.mk>
+.include <bsd.klinks.mk>
 
 S=             ${.CURDIR}/../../../..
 
@@ -40,15 +41,6 @@
 CFLAGS+=       -fno-unwind-tables
 CPUFLAGS=      -mcpu=strongarm
 
-.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN:
-       @[ -h machine ] || ln -s ${S}/arch/${MACHINE}/include machine
-       @[ -h arm ] || ln -s ${S}/arch/arm/include arm
-.endif
-
-.NOPATH: machine arm
-CLEANFILES+= machine arm
-
 CLEANFILES+= ${PROG}.aout
 
 ### find out what to use for libkern