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

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

details:   https://anonhg.NetBSD.org/src/rev/8588a2fe4707
branches:  trunk
changeset: 789527:8588a2fe4707
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Aug 21 07:08:30 2013 +0000

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

diffstat:

 sys/arch/landisk/stand/Makefile.bootprogs     |  15 ++-------------
 sys/arch/landisk/stand/boot/Makefile.boot     |   3 ++-
 sys/arch/landisk/stand/bootxx/Makefile.bootxx |   3 ++-
 sys/arch/mipsco/stand/Makefile.booters        |  22 +++++-----------------
 4 files changed, 11 insertions(+), 32 deletions(-)

diffs (117 lines):

diff -r 716fc661ae9b -r 8588a2fe4707 sys/arch/landisk/stand/Makefile.bootprogs
--- a/sys/arch/landisk/stand/Makefile.bootprogs Wed Aug 21 06:58:58 2013 +0000
+++ b/sys/arch/landisk/stand/Makefile.bootprogs Wed Aug 21 07:08:30 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootprogs,v 1.4 2010/05/27 06:58:14 dholland Exp $
+# $NetBSD: Makefile.bootprogs,v 1.5 2013/08/21 07:08:30 matt Exp $
 
 S=             ${.CURDIR}/../../../../..
 
@@ -11,6 +11,7 @@
 SECONDARY_LOAD_ADDRESS?=0x8ff00000
 
 .include <bsd.own.mk>
+.include <bsd.klinks.mk>
 
 STRIPFLAG=     # override
 
@@ -29,18 +30,6 @@
 CPPFLAGS+=     -DSH4
 CPPFLAGS+=     -I${.OBJDIR} -I${.CURDIR}/.. -I${.CURDIR}/../../boot -I${S}
 
-.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN:
-       -rm -f machine && \
-           ln -s ${S}/arch/${MACHINE}/include machine
-       -rm -f ${MACHINE_CPU} && \
-           ln -s ${S}/arch/${MACHINE_CPU}/include ${MACHINE_CPU}
-.ifdef LIBOBJ
-       -rm -f lib && ln -s ${LIBOBJ}/lib lib
-       mkdir -p ${LIBOBJ}/lib
-.endif
-.endif
-
 ### find out what to use for libsa
 SA_AS= library
 .include "${S}/lib/libsa/Makefile.inc"
diff -r 716fc661ae9b -r 8588a2fe4707 sys/arch/landisk/stand/boot/Makefile.boot
--- a/sys/arch/landisk/stand/boot/Makefile.boot Wed Aug 21 06:58:58 2013 +0000
+++ b/sys/arch/landisk/stand/boot/Makefile.boot Wed Aug 21 07:08:30 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.5 2011/12/25 06:09:09 tsutsui Exp $
+# $NetBSD: Makefile.boot,v 1.6 2013/08/21 07:08:30 matt Exp $
 
 PROG?=         boot
 
@@ -40,6 +40,7 @@
            ${VERSIONFILE} ${MACHINE} ${NEWVERSWHAT}
 
 ${PROG}: ${OBJS} ${LIBLIST}
+       ${_MKTARGET_LINK}
        ${LD} -o ${PROG}.sym ${LDFLAGS} -Ttext ${SECONDARY_LOAD_ADDRESS} \
                -Map ${PROG}.map -cref ${OBJS} ${LIBLIST}
        ${OBJCOPY} -O binary ${PROG}.sym ${PROG}
diff -r 716fc661ae9b -r 8588a2fe4707 sys/arch/landisk/stand/bootxx/Makefile.bootxx
--- a/sys/arch/landisk/stand/bootxx/Makefile.bootxx     Wed Aug 21 06:58:58 2013 +0000
+++ b/sys/arch/landisk/stand/bootxx/Makefile.bootxx     Wed Aug 21 07:08:30 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.bootxx,v 1.3 2009/04/22 17:13:36 tsutsui Exp $
+#      $NetBSD: Makefile.bootxx,v 1.4 2013/08/21 07:08:30 matt Exp $
 
 PROG?=         bootxx_${FS}
 
@@ -46,6 +46,7 @@
 CLEANFILES+=   ${PROG}.sym ${PROG}.map
 
 ${PROG}: ${OBJS} ${LIBLIST}
+       ${_MKTARGET_LINK}
        ${LD} -o ${PROG}.sym ${LDFLAGS} -Ttext ${PRIMARY_LOAD_ADDRESS} \
                -Map ${PROG}.map -cref ${OBJS} ${LIBLIST}
        ${OBJCOPY} -O binary ${PROG}.sym ${PROG}
diff -r 716fc661ae9b -r 8588a2fe4707 sys/arch/mipsco/stand/Makefile.booters
--- a/sys/arch/mipsco/stand/Makefile.booters    Wed Aug 21 06:58:58 2013 +0000
+++ b/sys/arch/mipsco/stand/Makefile.booters    Wed Aug 21 07:08:30 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.booters,v 1.17 2011/01/22 19:19:19 joerg Exp $
+#      $NetBSD: Makefile.booters,v 1.18 2013/08/21 07:13:51 matt Exp $
 
 .include <bsd.sys.mk>          # for HOST_SH
 
@@ -17,21 +17,7 @@
 LIBCRTBEGIN=
 LIBCRTEND=
 
-.PHONY:                machine-links
-beforedepend: machine-links
-
-machine-links: machine mipsco mips
-machine mipsco:
-       -rm -f ${.TARGET}
-       ln -s ${MIPSCO}/include ${.TARGET}
-
-mips:
-       -rm -f ${.TARGET}
-       ln -s ${MIPS}/include ${.TARGET}
-
-CLEANFILES+=   machine mipsco mips
-
-realall: machine-links ${PROG}
+realall: ${PROG}
 
 AFLAGS+=       -D_LOCORE -D_KERNEL -DASSEMBLER -mno-abicalls
 # -I${.CURDIR}/../.. done by Makefile.inc
@@ -124,7 +110,8 @@
        ${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
            -N ${.CURDIR}/version "mipsco"
 
-${PROG}: machine-links ${LDSCRIPT} ${OBJS} ${LIBS}
+${PROG}: ${LDSCRIPT} ${OBJS} ${LIBS}
+       ${_MKTARGET_LINK}
        ${LD} ${OFORMAT} -Map ${PROG}.map -N -x -Ttext ${LOAD_ADDRESS} \
            -T ${LDSCRIPT} -e start -o ${PROG} ${OBJS} ${LIBS}
        @${SIZE} ${PROG}
@@ -146,3 +133,4 @@
        -rm -rf lib
 
 .include <bsd.prog.mk>
+.include <bsd.klinks.mk>