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

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

details:   https://anonhg.NetBSD.org/src/rev/fa65e4a5b6ae
branches:  trunk
changeset: 789523:fa65e4a5b6ae
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Aug 21 06:49:44 2013 +0000

description:
Use <bsd.klinks.mk>
Use ${_MKTARGET_LINK}

diffstat:

 sys/arch/prep/stand/boot/Makefile   |  17 +++--------------
 sys/arch/prep/stand/common/Makefile |  18 +++---------------
 2 files changed, 6 insertions(+), 29 deletions(-)

diffs (78 lines):

diff -r aa0b586d2d3e -r fa65e4a5b6ae sys/arch/prep/stand/boot/Makefile
--- a/sys/arch/prep/stand/boot/Makefile Wed Aug 21 06:46:26 2013 +0000
+++ b/sys/arch/prep/stand/boot/Makefile Wed Aug 21 06:49:44 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.26 2012/05/19 14:40:13 kiyohara Exp $
+#      $NetBSD: Makefile,v 1.27 2013/08/21 06:49:44 matt Exp $
 
 NOMAN= # defined
 
@@ -56,26 +56,15 @@
 
 LIBS= ${L}/sa/libsa.a ${L}/kern/libkern.a ${L}/z/libz.a
 
-.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN: machine powerpc
-.NOPATH: machine powerpc
-
-machine::
-       -rm -f $@
-       ln -s ${S}/arch/${MACHINE}/include $@
-
-powerpc::
-       -rm -f $@
-       ln -s ${S}/arch/powerpc/include $@
-.endif
-
 vers.c: ${.CURDIR}/../boot/version
        ${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
            ${.CURDIR}/../boot/version "prep" ${NEWVERSWHAT}
 
 ${PROG}: ${OBJS} ${LIBS}
+       ${_MKTARGET_LINK}
        ${LD} -o ${PROG}.elf -N -T ${.CURDIR}/../boot/ld.script \
                -Ttext ${RELOC} ${OBJS} ${LIBS}
        ${STRIP} -o ${PROG} ${PROG}.elf
 
 .include <bsd.prog.mk>
+.include <bsd.klinks.mk>
diff -r aa0b586d2d3e -r fa65e4a5b6ae sys/arch/prep/stand/common/Makefile
--- a/sys/arch/prep/stand/common/Makefile       Wed Aug 21 06:46:26 2013 +0000
+++ b/sys/arch/prep/stand/common/Makefile       Wed Aug 21 06:49:44 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2010/05/27 06:58:15 dholland Exp $
+#      $NetBSD: Makefile,v 1.11 2013/08/21 06:49:45 matt Exp $
 
 S= ${.CURDIR}/../../../..
 
@@ -11,20 +11,8 @@
 
 CFLAGS= -Os -mmultiple -ffreestanding
 
-CLEANFILES+= machine powerpc
-
-.if !make(obj) && !make(clean) && !make(cleandir)
-.PHONY: machine-links
-beforedepend: machine-links
-
-machine-links:
-       -rm -f machine
-       ln -s ${S}/arch/${MACHINE}/include machine
-       -rm -f ${MACHINE_ARCH}
-       ln -s ${S}/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
-.endif
-
 .include <bsd.prog.mk>
+.include <bsd.klinks.mk>
 
 ### find out what to use for libkern
 KERN_AS=       library
@@ -44,7 +32,7 @@
 
 LIBS= ${LIBSA} ${LIBZ} ${LIBKERN}
 
-realall: machine-links ${LIBS}
+realall: ${LIBS}
 
 cleandir distclean: .WAIT cleanlibdir