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

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

details:   https://anonhg.NetBSD.org/src/rev/d9212a61b659
branches:  trunk
changeset: 789518:d9212a61b659
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Aug 21 06:15:41 2013 +0000

description:
Use <bsd.klinks.mk>

diffstat:

 sys/arch/vax/boot/Makefile.inc  |  15 ++++-----------
 sys/arch/vax/boot/boot/Makefile |   4 ++--
 2 files changed, 6 insertions(+), 13 deletions(-)

diffs (51 lines):

diff -r a4835ce91e40 -r d9212a61b659 sys/arch/vax/boot/Makefile.inc
--- a/sys/arch/vax/boot/Makefile.inc    Wed Aug 21 06:07:26 2013 +0000
+++ b/sys/arch/vax/boot/Makefile.inc    Wed Aug 21 06:15:41 2013 +0000
@@ -1,4 +1,6 @@
-#      $NetBSD: Makefile.inc,v 1.15 2013/07/18 12:15:16 joerg Exp $
+#      $NetBSD: Makefile.inc,v 1.16 2013/08/21 06:15:41 matt Exp $
+
+.include <bsd.klinks.mk>
 
 RELOC=0x3f0000
 .PATH: ${.CURDIR}/../../vax ${.CURDIR}/../common
@@ -9,6 +11,7 @@
 CPPFLAGS+=-I${.CURDIR}/../common
 CPPFLAGS+=-I${.CURDIR}/../../include
 CPPFLAGS+=-DRELOC=${RELOC}
+CPPFLAGS+=-D_STANDALONE
 
 WARNS?=        1
 CFLAGS+=-ffreestanding -fno-pic -fno-unwind-tables
@@ -18,13 +21,3 @@
 
 LIBCRTBEGIN=
 LIBCRTEND=  
-
-.if ${MACHINE} == "vax"
-.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}
-.NOPATH: machine ${MACHINE_ARCH}
-CLEANFILES+= machine ${MACHINE_ARCH}
-.endif
diff -r a4835ce91e40 -r d9212a61b659 sys/arch/vax/boot/boot/Makefile
--- a/sys/arch/vax/boot/boot/Makefile   Wed Aug 21 06:07:26 2013 +0000
+++ b/sys/arch/vax/boot/boot/Makefile   Wed Aug 21 06:15:41 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.40 2012/05/14 10:05:50 abs Exp $
+#      $NetBSD: Makefile,v 1.41 2013/08/21 06:15:41 matt Exp $
 
 S=     ${.CURDIR}/../../../..
 
@@ -36,7 +36,7 @@
        ${HOST_SH} ${S}/conf/newvers_stand.sh -N ${${MKREPRO} == "yes" :?:-D} \
            ${.CURDIR}/version "${MACHINE}"
 
-${PROG}: machine-links ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
+${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
        ${_MKTARGET_LINK}
        ${LD} -N -Ttext ${RELOC} -e nisse -o ${PROG}.sym ${OBJS} \
            ${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN}