Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use <bsd.klinks.mk>

This commit is contained in:
matt 2013-08-21 08:15:19 +00:00
parent bf0daa663a
commit e76ea19a00
4 changed files with 8 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/arch/i386/stand/Makefile.booters
View File

@ -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} ${LIBSA} ${LIBZ} ${LIBKERN} ${LIBI386}
${OBJCOPY} -O binary ${BASE}.sym ${BASE}.bin
.include <bsd.prog.mk>
.include <bsd.klinks.mk>

15
sys/arch/i386/stand/boot/Makefile.boot
View File

@ -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}/../Makefile.boot
${OBJCOPY} -O binary ${PROG}.syms ${PROG}
.include <bsd.prog.mk>
.include <bsd.klinks.mk>

15
sys/arch/i386/stand/bootxx/Makefile.bootxx
View File

@ -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=xxfs \
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>

10
sys/arch/x68k/stand/loadbsd/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.15 2013/08/12 16:34:05 joerg Exp $
# $NetBSD: Makefile,v 1.16 2013/08/21 08:17:34 matt Exp $
S= ${.CURDIR}/../../../..
@ -14,6 +14,7 @@ BINDIR= /usr/mdec
.PATH: ${.CURDIR}/../common
.include <bsd.own.mk>
.include <bsd.klinks.mk>
AOUT2HUXDIR!= cd ${.CURDIR}/../aout2hux && ${PRINTOBJDIR}
AOUT2HUX= ${AOUT2HUXDIR}/aout2hux
@ -31,13 +32,6 @@ LDLIBS= -L${LIBDOS} -ldos -L${LIBIOCS} -liocs -L${DESTDIR}/usr/lib -lc
DPADD+= ${AOUT2HUX}
CLEANFILES+= ${BASE}1 ${BASE}2
CLEANFILES+= machine m68k
.if !make(obj) && !make(clean) && !make(cleandir)
.BEGIN:
rm -f machine && ln -s $S/arch/x68k/include machine
rm -f m68k && ln -s $S/arch/m68k/include m68k
.endif
${PROG}: ${BASE}1 ${BASE}2
${_MKTARGET_LINK}