Module Name: src
Committed By: matt
Date: Wed Aug 21 08:15:19 UTC 2013
Modified Files:
src/sys/arch/i386/stand: Makefile.booters
src/sys/arch/i386/stand/boot: Makefile.boot
src/sys/arch/i386/stand/bootxx: Makefile.bootxx
Log Message:
Use <bsd.klinks.mk>
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/i386/stand/Makefile.booters
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/i386/stand/boot/Makefile.boot
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/i386/stand/bootxx/Makefile.bootxx
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/i386/stand/Makefile.booters
diff -u src/sys/arch/i386/stand/Makefile.booters:1.86 src/sys/arch/i386/stand/Makefile.booters:1.87
--- src/sys/arch/i386/stand/Makefile.booters:1.86 Fri Aug 10 12:18:14 2012
+++ src/sys/arch/i386/stand/Makefile.booters Wed Aug 21 08:15:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.86 2012/08/10 12:18:14 joerg Exp $
+# $NetBSD: Makefile.booters,v 1.87 2013/08/21 08:15:19 matt Exp $
.include <bsd.own.mk>
@@ -49,18 +49,6 @@ KERNMISCMAKEFLAGS="LIBKERN_ARCH=i386"
CLEANFILES+= ${STARTFILE} vers.c ${BASE}.list
SRCS+= vers.c
-CLEANFILES+= machine x86
-
-.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN:
- -rm -f machine && ln -s $S/arch/i386/include machine
- -rm -f x86 && ln -s $S/arch/x86/include x86
-.ifdef LIBOBJ
- -rm -f lib && ln -s ${LIBOBJ}/lib lib
- mkdir -p ${LIBOBJ}/lib
-.endif
-.endif
-
### find out what to use for libkern
KERN_AS= library
.include "${S}/lib/libkern/Makefile.inc"
@@ -125,3 +113,4 @@ ${BASE}.bin: ${STARTFILE} ${OBJS} ${LIBS
${OBJCOPY} -O binary ${BASE}.sym ${BASE}.bin
.include <bsd.prog.mk>
+.include <bsd.klinks.mk>
Index: src/sys/arch/i386/stand/boot/Makefile.boot
diff -u src/sys/arch/i386/stand/boot/Makefile.boot:1.58 src/sys/arch/i386/stand/boot/Makefile.boot:1.59
--- src/sys/arch/i386/stand/boot/Makefile.boot:1.58 Fri Aug 10 12:18:15 2012
+++ src/sys/arch/i386/stand/boot/Makefile.boot Wed Aug 21 08:15:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.58 2012/08/10 12:18:15 joerg Exp $
+# $NetBSD: Makefile.boot,v 1.59 2013/08/21 08:15:19 matt Exp $
S= ${.CURDIR}/../../../../..
@@ -91,18 +91,6 @@ CPPFLAGS+= -Wno-pointer-sign
I386_STAND_DIR?= $S/arch/i386/stand
-CLEANFILES+= machine x86
-
-.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN:
- -rm -f machine && ln -s $S/arch/i386/include machine
- -rm -f x86 && ln -s $S/arch/x86/include x86
-.ifdef LIBOBJ
- -rm -f lib && ln -s ${LIBOBJ}/lib lib
- mkdir -p ${LIBOBJ}/lib
-.endif
-.endif
-
### find out what to use for libi386
I386DIR= ${I386_STAND_DIR}/lib
.include "${I386DIR}/Makefile.inc"
@@ -165,3 +153,4 @@ ${PROG}: ${OBJS} ${LIBLIST} ${.CURDIR}/.
${OBJCOPY} -O binary ${PROG}.syms ${PROG}
.include <bsd.prog.mk>
+.include <bsd.klinks.mk>
Index: src/sys/arch/i386/stand/bootxx/Makefile.bootxx
diff -u src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.43 src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.44
--- src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.43 Fri Aug 10 12:18:15 2012
+++ src/sys/arch/i386/stand/bootxx/Makefile.bootxx Wed Aug 21 08:15:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootxx,v 1.43 2012/08/10 12:18:15 joerg Exp $
+# $NetBSD: Makefile.bootxx,v 1.44 2013/08/21 08:15:19 matt Exp $
S= ${.CURDIR}/../../../../..
@@ -93,18 +93,6 @@ CPPFLAGS+= -DLIBSA_SINGLE_FILESYSTEM=xxf
I386_STAND_DIR?= $S/arch/i386/stand
-CLEANFILES+= machine x86
-
-.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN:
- -rm -f machine && ln -s $S/arch/i386/include machine
- -rm -f x86 && ln -s $S/arch/x86/include x86
-.ifdef LIBOBJ
- -rm -f lib && ln -s ${LIBOBJ}/lib lib
- mkdir -p ${LIBOBJ}/lib
-.endif
-.endif
-
### find out what to use for libi386
I386DIR= ${I386_STAND_DIR}/lib
.include "${I386DIR}/Makefile.inc"
@@ -150,3 +138,4 @@ ${PROG}: ${OBJS} ${LIBLIST}
fi
.include <bsd.prog.mk>
+.include <bsd.klinks.mk>
