Module Name: src
Committed By: matt
Date: Thu May 2 04:22:45 UTC 2013
Modified Files:
src/sys/arch/acorn26/stand: Makefile.buildboot
src/sys/arch/acorn32/stand: Makefile.buildboot
src/sys/arch/evbarm/stand: Makefile.inc
src/sys/arch/zaurus/stand: Makefile.inc
Log Message:
use KLINK_MACHINE
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/acorn26/stand/Makefile.buildboot
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/acorn32/stand/Makefile.buildboot
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/stand/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/zaurus/stand/Makefile.inc
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/acorn26/stand/Makefile.buildboot
diff -u src/sys/arch/acorn26/stand/Makefile.buildboot:1.14 src/sys/arch/acorn26/stand/Makefile.buildboot:1.15
--- src/sys/arch/acorn26/stand/Makefile.buildboot:1.14 Wed May 1 22:36:52 2013
+++ src/sys/arch/acorn26/stand/Makefile.buildboot Thu May 2 04:22:44 2013
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.buildboot,v 1.14 2013/05/01 22:36:52 matt Exp $
+# $NetBSD: Makefile.buildboot,v 1.15 2013/05/02 04:22:44 matt Exp $
S?= ${.CURDIR}/../../../..
.PATH: ${.CURDIR}/../lib
-MACHINE= acorn26
+KLINK_MACHINE= acorn26
SRCS= ${PROGSOURCE}
NOMAN=# defined
BINDIR=/usr/mdec
@@ -20,6 +20,7 @@ LIBCRTEND=
RISCOSTYPE ?= ff8
.include <bsd.own.mk>
+.include <bsd.klinks.mk>
SRCS+= vers.c
CLEANFILES+= vers.c
Index: src/sys/arch/acorn32/stand/Makefile.buildboot
diff -u src/sys/arch/acorn32/stand/Makefile.buildboot:1.15 src/sys/arch/acorn32/stand/Makefile.buildboot:1.16
--- src/sys/arch/acorn32/stand/Makefile.buildboot:1.15 Wed May 1 22:30:39 2013
+++ src/sys/arch/acorn32/stand/Makefile.buildboot Thu May 2 04:22:44 2013
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.buildboot,v 1.15 2013/05/01 22:30:39 matt Exp $
+# $NetBSD: Makefile.buildboot,v 1.16 2013/05/02 04:22:44 matt Exp $
S?= ${.CURDIR}/../../../..
.PATH: ${.CURDIR}/../lib
-MACHINE= acorn32
+KLINK_MACHINE= acorn32
SRCS= ${PROGSOURCE}
NOMAN=# defined
@@ -31,13 +31,14 @@ LINKFLAGS+=-N -Ttext ${RELOC}
.endif
.include <bsd.own.mk>
+.include <bsd.klinks.mk>
SRCS+= vers.c
CLEANFILES+= vers.c
.PHONY: vers.c
vers.c: ${.CURDIR}/version
${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
- ${.CURDIR}/version ${MACHINE} ${NEWVERSWHAT}
+ ${.CURDIR}/version ${KLINK_MACHINE} ${NEWVERSWHAT}
CPPFLAGS+= -D_STANDALONE
CPPFLAGS+= -I. -I${.CURDIR}/../../.. -I${.CURDIR}/../../../..
@@ -48,13 +49,6 @@ CFLAGS= -O2
CFLAGS+= -ffreestanding
CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes
-.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN:
- -rm -f machine ${MACHINE_ARCH}
- ln -s $S/arch/${MACHINE}/include machine
- ln -s $S/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
-.endif
-
CLEANFILES+= machine ${MACHINE_ARCH}
### find out what to use for libkern
Index: src/sys/arch/evbarm/stand/Makefile.inc
diff -u src/sys/arch/evbarm/stand/Makefile.inc:1.2 src/sys/arch/evbarm/stand/Makefile.inc:1.3
--- src/sys/arch/evbarm/stand/Makefile.inc:1.2 Thu May 2 03:56:41 2013
+++ src/sys/arch/evbarm/stand/Makefile.inc Thu May 2 04:22:44 2013
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.2 2013/05/02 03:56:41 matt Exp $
+# $NetBSD: Makefile.inc,v 1.3 2013/05/02 04:22:44 matt Exp $
-BINDIR?= /usr/mdec
-FILESDIR?= /usr/mdec
-MACHINE=evbarm
+BINDIR?= /usr/mdec
+FILESDIR?= /usr/mdec
+KLINK_MACHINE= evbarm
Index: src/sys/arch/zaurus/stand/Makefile.inc
diff -u src/sys/arch/zaurus/stand/Makefile.inc:1.2 src/sys/arch/zaurus/stand/Makefile.inc:1.3
--- src/sys/arch/zaurus/stand/Makefile.inc:1.2 Wed May 1 22:16:15 2013
+++ src/sys/arch/zaurus/stand/Makefile.inc Thu May 2 04:22:45 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2013/05/01 22:16:15 matt Exp $
+# $NetBSD: Makefile.inc,v 1.3 2013/05/02 04:22:45 matt Exp $
BINDIR= /usr/mdec
-MACHINE= zaurus
+KLINK_MACHINE= zaurus
