Module Name: src
Committed By: matt
Date: Wed Aug 21 06:15:41 UTC 2013
Modified Files:
src/sys/arch/vax/boot: Makefile.inc
src/sys/arch/vax/boot/boot: Makefile
Log Message:
Use <bsd.klinks.mk>
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/vax/boot/Makefile.inc
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/vax/boot/boot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/vax/boot/Makefile.inc
diff -u src/sys/arch/vax/boot/Makefile.inc:1.15 src/sys/arch/vax/boot/Makefile.inc:1.16
--- src/sys/arch/vax/boot/Makefile.inc:1.15 Thu Jul 18 12:15:16 2013
+++ src/sys/arch/vax/boot/Makefile.inc Wed Aug 21 06:15:41 2013
@@ -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}/../../
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 @@ MKMAN=no
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
Index: src/sys/arch/vax/boot/boot/Makefile
diff -u src/sys/arch/vax/boot/boot/Makefile:1.40 src/sys/arch/vax/boot/boot/Makefile:1.41
--- src/sys/arch/vax/boot/boot/Makefile:1.40 Mon May 14 10:05:50 2012
+++ src/sys/arch/vax/boot/boot/Makefile Wed Aug 21 06:15:41 2013
@@ -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 @@ vers.c: ${.CURDIR}/version
${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}
