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

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

details:   https://anonhg.NetBSD.org/src/rev/ca7b0bd6a36d
branches:  trunk
changeset: 789529:ca7b0bd6a36d
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Aug 21 08:04:50 2013 +0000

description:
Use <bsd.klinks.mk>
Use ${_MKTARGET_*}
Use correct arguments to ${AR}
Fix entry symbol.

diffstat:

 sys/arch/amiga/stand/bootblock/boot/Makefile       |  36 ++++++++---------
 sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile |  43 +++++++++++----------
 2 files changed, 39 insertions(+), 40 deletions(-)

diffs (186 lines):

diff -r 1874ebaecda0 -r ca7b0bd6a36d sys/arch/amiga/stand/bootblock/boot/Makefile
--- a/sys/arch/amiga/stand/bootblock/boot/Makefile      Wed Aug 21 07:17:08 2013 +0000
+++ b/sys/arch/amiga/stand/bootblock/boot/Makefile      Wed Aug 21 08:04:50 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.48 2013/07/18 12:15:15 joerg Exp $
+#      $NetBSD: Makefile,v 1.49 2013/08/21 08:04:50 matt Exp $
 
 .include <bsd.own.mk>
 .include <bsd.sys.mk>          # for HOST_SH
@@ -66,11 +66,12 @@
 
 ### main target: ###
 
-realall: machine m68k ${FILES}
+realall: ${FILES}
 
-CLEANFILES += boot.amiga x.out xxstart.o libboot.a vers.c machine m68k
+CLEANFILES += boot.amiga x.out xxstart.o libboot.a vers.c
 
 .include <bsd.prog.mk>
+.include <bsd.klinks.mk>
 
 ### special  rules for bootblocks ###
 
@@ -93,47 +94,44 @@
 COPTS.cread.c = -O1
 
 .c.o:
+       ${_MKTARGET_COMPILE}
        ${CC} ${CFLAGS} ${COPTS.${.IMPSRC:T}} -S $< -o $*.s
        ${TXLT} < $*.s | ${AS} ${AFLAGS} -o $@
        rm $*.s
 
-.s.o: ; ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $<
+.s.o:
+       ${_MKTARGET_COMPILE}
+       ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $<
 
-.S.o: ; ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $<
+.S.o:
+       ${_MKTARGET_COMPILE}
+       ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $<
 
 boot.amiga: x.out
+       ${_MKTARGET_CREATE}
        ${RELOC2BB} -S x.out $@ || (${NM} -u x.out && false)
 
 x.out: xxstart.o libboot.a ${LIBZ}
+       ${_MKTARGET_LINK}
        ${LD} ${LDFLAGS} -r -dc -e start -o $@ $>
        ${SIZE} $@
        ${NM} -u $@
 
 xxstart.o: ${.CURDIR}/bbstart.s
+       ${_MKTARGET_COMPILE}
        ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp \
                -o $@ -c $>
 
 libboot.a: ${OBJS}
-       ${AR} r $@ $> && ${RANLIB} $@
+       ${_MKTARGET_BUILD}
+       ${AR} crs $@ $> && ${RANLIB} $@
 
 vers.o: vers.c
 vers.c:        ${.CURDIR}/version
+       ${_MKTARGET_CREATE}
        ${HOST_SH} ${DIR_TOP}/conf/newvers_stand.sh \
            ${${MKREPRO} == "yes" :?:-D} -N ${.CURDIR}/version "amiga"
 
-.if !make(obj) && !make(clean) && !make(cleandir)
-.NOPATH: machine m68k
-.BEGIN: machine m68k
-
-machine:
-       -rm -f $@
-       ln -s ${DIR_TOP}/arch/amiga/include $@
-
-m68k:
-       -rm -f $@
-       ln -s ${DIR_TOP}/arch/m68k/include $@
-.endif
-
 # make sure these are built:
 
 ${COBJS}: ${TXLT}
diff -r 1874ebaecda0 -r ca7b0bd6a36d sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
--- a/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile        Wed Aug 21 07:17:08 2013 +0000
+++ b/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile        Wed Aug 21 08:04:50 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.19 2013/07/18 12:15:15 joerg Exp $
+#      $NetBSD: Makefile,v 1.20 2013/08/21 08:04:50 matt Exp $
 
 ### what we need:
 
@@ -39,11 +39,12 @@
 
 ### main target: ###
 
-realall: machine m68k ${FILES}
+realall: ${FILES}
 
-CLEANFILES += bootxx_ffs bootxx_fd x.out f.out xxstart.o fdstart.o libboot.a vers.c machine m68k
+CLEANFILES += bootxx_ffs bootxx_fd x.out f.out xxstart.o fdstart.o libboot.a vers.c
 
 .include <bsd.prog.mk>
+.include <bsd.klinks.mk>
 
 ### special  rules for bootblocks ###
 
@@ -65,58 +66,58 @@
 DEFS+= -D__daddr_t=int32_t
 
 .c.o:
+       ${_MKTARGET_COMPILE}
        ${CC} ${CFLAGS} -S $< -o $*.s
        ${TXLT} < $*.s | ${AS} ${AFLAGS} -o $*.o
        rm $*.s
 
-.s.o: ; ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $<
+.s.o:
+       ${_MKTARGET_COMPILE}
+       ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $<
 
-.S.o: ; ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $<
+.S.o:
+       ${_MKTARGET_COMPILE}
+       ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $<
 
 bootxx_ffs: x.out
+       ${_MKTARGET_CREATE}
        ${RELOC2BB} x.out $@ || (${NM} -u x.out && false)
 
 bootxx_fd: f.out
+       ${_MKTARGET_CREATE}
        ${RELOC2BB} -F f.out $@ || (${NM} -u f.out && false)
 
 x.out: xxstart.o libboot.a
-       ${LD} ${LDFLAGS} -r -dc -e _start -o $@ $>
+       ${_MKTARGET_LINK}
+       ${LD} ${LDFLAGS} -r -dc -e start -o $@ $>
        ${SIZE} $@
        ${NM} -u $@
 
 f.out: fdstart.o libboot.a
-       ${LD} ${LDFLAGS} -r -dc -e _start -o $@ $>
+       ${_MKTARGET_LINK}
+       ${LD} ${LDFLAGS} -r -dc -e start -o $@ $>
        ${SIZE} $@
        ${NM} -u $@
 
 xxstart.o: ${.CURDIR}/../boot/bbstart.s
+       ${_MKTARGET_COMPILE}
        ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp \
                -o $@ -c $>
 
 fdstart.o: ${.CURDIR}/../boot//bbstart.s
+       ${_MKTARGET_COMPILE}
        ${CC} -DAUTOLOAD=8192 ${CAFLAGS} ${COPTS} -x assembler-with-cpp \
                -o $@ -c $>
 
 libboot.a: ${OBJS}
-       ${AR} r $@ $> && ${RANLIB} $@
+       ${_MKTARGET_BUILD}
+       ${AR} crs $@ $> && ${RANLIB} $@
 
 vers.c:        ${.CURDIR}/../boot/version
+       ${_MKTARGET_CREATE}
        ${HOST_SH} ${DIR_TOP}/conf/newvers_stand.sh -N \
            ${.CURDIR}/../boot/version "amiga"
 
-.if !make(obj) && !make(clean) && !make(cleandir)
-.NOPATH: machine m68k
-.BEGIN: machine m68k
-
-machine:
-       -rm -f $@
-       ln -s ${DIR_TOP}/arch/amiga/include $@
-
-m68k:
-       -rm -f $@
-       ln -s ${DIR_TOP}/arch/m68k/include $@
-.endif
-
 # make sure these are built:
 
 ${COBJS}: ${TXLT}