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

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

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

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

diffstat:

 sys/arch/rs6000/stand/boot/Makefile   |  19 ++++---------------
 sys/arch/rs6000/stand/common/Makefile |  24 ++++--------------------
 2 files changed, 8 insertions(+), 35 deletions(-)

diffs (90 lines):

diff -r d9212a61b659 -r d0e46f8db449 sys/arch/rs6000/stand/boot/Makefile
--- a/sys/arch/rs6000/stand/boot/Makefile       Wed Aug 21 06:15:41 2013 +0000
+++ b/sys/arch/rs6000/stand/boot/Makefile       Wed Aug 21 06:20:49 2013 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.4 2011/01/22 19:19:22 joerg Exp $
+#      $NetBSD: Makefile,v 1.5 2013/08/21 06:20:49 matt Exp $
 
 NOMAN= # defined
 
 .include <bsd.own.mk>
+.include <bsd.klinks.mk>
 
 COMMON= ${.CURDIR}/../common
 COMMONOBJ!=    cd ${COMMON} && ${PRINTOBJDIR}
@@ -46,28 +47,16 @@
 RELOC= 0x800000
 #RELOC= 0x0
 
-CLEANFILES+= vers.c machine powerpc
+CLEANFILES+= vers.c
 
 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 "rs6000" ${NEWVERSWHAT}
 
 ${PROG}: ${OBJS} ${LIBS}
+       ${_MKTARGET_LINK}
        ${LD} -o ${PROG} -s -N -T ${.CURDIR}/../boot/ld.script \
                -Ttext ${RELOC} ${OBJS} ${LIBS}
 
diff -r d9212a61b659 -r d0e46f8db449 sys/arch/rs6000/stand/common/Makefile
--- a/sys/arch/rs6000/stand/common/Makefile     Wed Aug 21 06:15:41 2013 +0000
+++ b/sys/arch/rs6000/stand/common/Makefile     Wed Aug 21 06:20:49 2013 +0000
@@ -1,7 +1,9 @@
-#      $NetBSD: Makefile,v 1.2 2010/05/27 06:58:15 dholland Exp $
+#      $NetBSD: Makefile,v 1.3 2013/08/21 06:20:49 matt Exp $
 
 S= ${.CURDIR}/../../../..
 
+.include <bsd.klinks.mk>
+
 NOMAN= # defined
 
 CPPFLAGS+= -D_STANDALONE
@@ -11,19 +13,6 @@
 
 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>
 
 ### find out what to use for libkern
@@ -44,9 +33,4 @@
 
 LIBS= ${LIBSA} ${LIBZ} ${LIBKERN}
 
-realall: machine-links ${LIBS}
-
-cleandir distclean: .WAIT cleanlibdir
-
-cleanlibdir:
-       -rm -rf lib
+realall: ${LIBS}