Module Name: src
Committed By: matt
Date: Wed Aug 21 06:49:45 UTC 2013
Modified Files:
src/sys/arch/prep/stand/boot: Makefile
src/sys/arch/prep/stand/common: Makefile
Log Message:
Use <bsd.klinks.mk>
Use ${_MKTARGET_LINK}
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/prep/stand/boot/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/prep/stand/common/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/prep/stand/boot/Makefile
diff -u src/sys/arch/prep/stand/boot/Makefile:1.26 src/sys/arch/prep/stand/boot/Makefile:1.27
--- src/sys/arch/prep/stand/boot/Makefile:1.26 Sat May 19 14:40:13 2012
+++ src/sys/arch/prep/stand/boot/Makefile Wed Aug 21 06:49:44 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2012/05/19 14:40:13 kiyohara Exp $
+# $NetBSD: Makefile,v 1.27 2013/08/21 06:49:44 matt Exp $
NOMAN= # defined
@@ -56,26 +56,15 @@ CLEANFILES+= vers.c machine powerpc ${PR
LIBS= ${L}/sa/libsa.a ${L}/kern/libkern.a ${L}/z/libz.a
-.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN: machine powerpc
-.NOPATH: machine powerpc
-
-machine::
- -rm -f $@
- ln -s ${S}/arch/${MACHINE}/include $@
-
-powerpc::
- -rm -f $@
- ln -s ${S}/arch/powerpc/include $@
-.endif
-
vers.c: ${.CURDIR}/../boot/version
${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
${.CURDIR}/../boot/version "prep" ${NEWVERSWHAT}
${PROG}: ${OBJS} ${LIBS}
+ ${_MKTARGET_LINK}
${LD} -o ${PROG}.elf -N -T ${.CURDIR}/../boot/ld.script \
-Ttext ${RELOC} ${OBJS} ${LIBS}
${STRIP} -o ${PROG} ${PROG}.elf
.include <bsd.prog.mk>
+.include <bsd.klinks.mk>
Index: src/sys/arch/prep/stand/common/Makefile
diff -u src/sys/arch/prep/stand/common/Makefile:1.10 src/sys/arch/prep/stand/common/Makefile:1.11
--- src/sys/arch/prep/stand/common/Makefile:1.10 Thu May 27 06:58:15 2010
+++ src/sys/arch/prep/stand/common/Makefile Wed Aug 21 06:49:45 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/05/27 06:58:15 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2013/08/21 06:49:45 matt Exp $
S= ${.CURDIR}/../../../..
@@ -11,20 +11,8 @@ CPPFLAGS+= -Werror -Wall -Wstrict-protot
CFLAGS= -Os -mmultiple -ffreestanding
-CLEANFILES+= machine powerpc
-
-.if !make(obj) && !make(clean) && !make(cleandir)
-.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}
-.endif
-
.include <bsd.prog.mk>
+.include <bsd.klinks.mk>
### find out what to use for libkern
KERN_AS= library
@@ -44,7 +32,7 @@ LIBSA= ${SALIB}
LIBS= ${LIBSA} ${LIBZ} ${LIBKERN}
-realall: machine-links ${LIBS}
+realall: ${LIBS}
cleandir distclean: .WAIT cleanlibdir
