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

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

details:   https://anonhg.NetBSD.org/src/rev/1874ebaecda0
branches:  trunk
changeset: 789528:1874ebaecda0
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Aug 21 07:17:08 2013 +0000

description:
Use <bsd.klinks.mk>

diffstat:

 sys/arch/emips/stand/Makefile.booters     |  15 ++++-----------
 sys/arch/hpcmips/stand/lcboot/Makefile    |  14 +++-----------
 sys/arch/ia64/stand/ia64/Makefile.booters |  26 ++------------------------
 3 files changed, 9 insertions(+), 46 deletions(-)

diffs (123 lines):

diff -r 8588a2fe4707 -r 1874ebaecda0 sys/arch/emips/stand/Makefile.booters
--- a/sys/arch/emips/stand/Makefile.booters     Wed Aug 21 07:08:30 2013 +0000
+++ b/sys/arch/emips/stand/Makefile.booters     Wed Aug 21 07:17:08 2013 +0000
@@ -1,19 +1,10 @@
-# $NetBSD: Makefile.booters,v 1.1 2011/01/26 01:18:53 pooka Exp $
+# $NetBSD: Makefile.booters,v 1.2 2013/08/21 07:22:26 matt Exp $
 
 .include <bsd.sys.mk>          # for HOST_SH
 
 # $S must correspond to the top of the 'sys' tree
 S=     ${.CURDIR}/../../../..
 
-.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN:
-       @[ -h machine ] || ln -s $S/arch/${MACHINE}/include machine
-       @[ -h emips ] || ln -s $S/arch/${MACHINE}/include emips
-       @[ -h mips ] || ln -s $S/arch/mips/include mips
-.NOPATH: machine emips mips
-.endif
-CLEANFILES+= machine emips mips
-
 BINMODE?=      444
 
 # XXX SHOULD NOT NEED TO DEFINE THESE!
@@ -109,7 +100,8 @@
        ${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
            -N ${.CURDIR}/version "emips"
 
-${PROG}: machine mips emips ${OBJS} ${LIBS}
+${PROG}: ${OBJS} ${LIBS}
+       ${_MKTARGET_LINK}
        ${LD} -Map ${PROG}.map -N -x -Ttext ${LOAD_ADDRESS} \
            ${LDBUG} -e start -o ${PROG}.elf ${OBJS} ${LIBS}
        @${SIZE} ${PROG}.elf
@@ -121,6 +113,7 @@
        dd if=${PROG}.bin of=${PROG} bs=512 conv=sync
 
 .include <bsd.prog.mk>
+.include <bsd.klinks.mk>
 
 CLEANFILES+=   ${PROG}.map
 
diff -r 8588a2fe4707 -r 1874ebaecda0 sys/arch/hpcmips/stand/lcboot/Makefile
--- a/sys/arch/hpcmips/stand/lcboot/Makefile    Wed Aug 21 07:08:30 2013 +0000
+++ b/sys/arch/hpcmips/stand/lcboot/Makefile    Wed Aug 21 07:17:08 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2011/01/22 19:19:18 joerg Exp $
+#      $NetBSD: Makefile,v 1.12 2013/08/21 07:27:01 matt Exp $
 .include <bsd.own.mk>
 
 ROMICE?=       no
@@ -37,16 +37,6 @@
 CPPFLAGS+=     -DROMICE
 .endif
 
-.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN:
-       @([ -h machine ] || ln -s ${S}/arch/${MACHINE}/include machine)
-       @[ -h mips ] || ln -s ${S}/arch/mips/include mips
-.NOPATH: machine
-.endif
-CLEANFILES+= machine mips
-
-${OBJS}: machine mips
-
 ### find out what to use for libkern
 .include "${S}/lib/libkern/Makefile.inc"
 LIBKERN=       ${KERNLIB}
@@ -76,6 +66,7 @@
 
 CLEANFILES+=   ${PROG}
 ${PROG}: ${OBJS} ${LIBKERN} ${LIBSA} ${LIBZ}
+       ${_MKTARGET_LINK}
        ${LD} -o ${PROG} -T ${LD_SCRIPT} ${OBJS} ${LIBLIST}
 
 CLEANFILES+=   ${SREC}
@@ -84,3 +75,4 @@
        ${OBJCOPY} -S -O srec ${PROG} ${SREC}
 
 .include <bsd.prog.mk>
+.include <bsd.klinks.mk>
diff -r 8588a2fe4707 -r 1874ebaecda0 sys/arch/ia64/stand/ia64/Makefile.booters
--- a/sys/arch/ia64/stand/ia64/Makefile.booters Wed Aug 21 07:08:30 2013 +0000
+++ b/sys/arch/ia64/stand/ia64/Makefile.booters Wed Aug 21 07:17:08 2013 +0000
@@ -1,6 +1,7 @@
-#      $NetBSD: Makefile.booters,v 1.4 2010/05/27 06:58:14 dholland Exp $
+#      $NetBSD: Makefile.booters,v 1.5 2013/08/21 07:17:08 matt Exp $
 
 .include <bsd.own.mk>
+.include <bsd.klinks.mk>
 
 STRIPFLAG=
 BINMODE=444
@@ -23,29 +24,6 @@
 LDFLAGS+=      #-nostdlib
 CPPFLAGS+=     -D_STANDALONE
 
-.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN: machine
-.NOPATH: machine
-.endif
-
-realdepend realall: machine lib
-CLEANFILES= machine
-
-machine:
-       -rm -f $@
-       ln -s $S/arch/${MACHINE_ARCH}/include $@
-
-${OBJS}: machine lib
-
-lib:
-.ifdef LIBOBJ
-       -rm -f $@
-       ln -s ${LIBOBJ}/lib .
-       [ -d ${LIBOBJ}/lib ] || mkdir ${LIBOBJ}/lib
-.else
-       mkdir lib
-.endif
-
 ### find out what to use for libkern
 KERN_AS=       library
 .include "${S}/lib/libkern/Makefile.inc"