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

Change the way the shared lib directory is handled.

Browse Source 
Should now work if ${.OBJDIR} = ${.CURDIR}/obj.
This commit is contained in:
dsl 2003-10-08 18:51:50 +00:00
parent cabc1ae936
commit 977fe7c488
4 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/arch/i386/stand/boot/Makefile
View File

@ -1,10 +1,13 @@
# $NetBSD: Makefile,v 1.2 2003/06/24 09:38:35 tron Exp $
# $NetBSD: Makefile,v 1.3 2003/10/08 18:51:50 dsl Exp $
SUBDIR= biosboot
LIBOBJ= ${.OBJDIR}
.MAKEOVERRIDES+= LIBOBJ
.include <bsd.subdir.mk>
cleandir distclean: cleanlibdir
cleanlibdir:
rm -rf lib
-rm -rf lib

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

@ -1,4 +1,4 @@
# $NetBSD: Makefile.boot,v 1.9 2003/10/08 04:25:45 lukem Exp $
# $NetBSD: Makefile.boot,v 1.10 2003/10/08 18:51:50 dsl Exp $
S= ${.CURDIR}/../../../../../
@ -80,11 +80,11 @@ SAMISCMAKEFLAGS+= SA_INCLUDE_NET=no # Netboot via TFTP, NFS
I386_STAND_DIR?= $S/arch/i386/stand
.if !make(obj) && !make(clean) && !make(cleandir)
.BEGIN: machine x86
.BEGIN: machine x86 lib
.NOPATH: machine x86
.endif
realdepend realall: machine x86
realdepend realall: machine x86 lib
CLEANFILES+= machine x86
machine::
@ -95,30 +95,35 @@ x86::
-rm -f $@
ln -s $S/arch/x86/include $@
${OBJS}: machine x86
${OBJS}: machine x86 lib
lib:
.ifdef LIBOBJ
-rm -f $@
ln -s ${LIBOBJ}/lib .
[ -d ${LIBOBJ}/lib ] || mkdir ${LIBOBJ}/lib
.else
mkdir lib
.endif
### find out what to use for libi386
I386DIR= ${I386_STAND_DIR}/lib
I386DST= ${.OBJDIR}/../lib/i386
.include "${I386DIR}/Makefile.inc"
LIBI386= ${I386LIB}
### find out what to use for libsa
SA_AS= library
SADST= ${.OBJDIR}/../lib/libsa
SAMISCMAKEFLAGS+="SA_USE_LOADFILE=yes"
.include "${S}/lib/libsa/Makefile.inc"
LIBSA= ${SALIB}
### find out what to use for libkern
KERN_AS= library
KERNDST= ${.OBJDIR}/../lib/libkern
.include "${S}/lib/libkern/Makefile.inc"
LIBKERN= ${KERNLIB}
### find out what to use for libz
Z_AS= library
ZDST= ${.OBJDIR}/../lib/libz
.include "${S}/lib/libz/Makefile.inc"
LIBZ= ${ZLIB}

7
sys/arch/i386/stand/bootxx/Makefile
View File

@ -1,11 +1,14 @@
# $NetBSD: Makefile,v 1.3 2003/10/08 04:25:45 lukem Exp $
# $NetBSD: Makefile,v 1.4 2003/10/08 18:51:50 dsl Exp $
SUBDIR= bootxx_ffsv1 bootxx_ffsv2 bootxx_lfsv1 bootxx_lfsv2
SUBDIR+=bootxx_msdos bootxx_ustarfs
LIBOBJ= ${.OBJDIR}
.MAKEOVERRIDES+= LIBOBJ
.include <bsd.subdir.mk>
cleandir distclean: cleanlibdir
cleanlibdir:
rm -rf lib
-rm -rf lib

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

@ -1,4 +1,4 @@
# $NetBSD: Makefile.bootxx,v 1.9 2003/10/08 04:25:45 lukem Exp $
# $NetBSD: Makefile.bootxx,v 1.10 2003/10/08 18:51:50 dsl Exp $
S= ${.CURDIR}/../../../../../
@ -88,11 +88,11 @@ CPPFLAGS+= -DLIBSA_SINGLE_FILESYSTEM=xxfs \
I386_STAND_DIR?= $S/arch/i386/stand
.if !make(obj) && !make(clean) && !make(cleandir)
.BEGIN: machine x86
.BEGIN: machine x86 lib
.NOPATH: machine x86
.endif
realdepend realall: machine x86
realdepend realall: machine x86 lib
CLEANFILES+= machine x86
machine::
@ -103,24 +103,30 @@ x86::
-rm -f $@
ln -s $S/arch/x86/include $@
${OBJS}: machine x86
${OBJS}: machine x86 lib
lib:
.ifdef LIBOBJ
-rm -f $@
ln -s ${LIBOBJ}/lib .
[ -d ${LIBOBJ}/lib ] || mkdir ${LIBOBJ}/lib
.else
mkdir lib
.endif
### find out what to use for libi386
I386DIR= ${I386_STAND_DIR}/lib
I386DST= ${.OBJDIR}/../lib/i386
.include "${I386DIR}/Makefile.inc"
LIBI386= ${I386LIB}
### find out what to use for libsa
SA_AS= library
SADST= ${.OBJDIR}/../lib/libsa
SAMISCMAKEFLAGS+="SA_USE_LOADFILE=yes"
.include "${S}/lib/libsa/Makefile.inc"
LIBSA= ${SALIB}
### find out what to use for libkern
KERN_AS= library
KERNDST= ${.OBJDIR}/../lib/libkern
.include "${S}/lib/libkern/Makefile.inc"
LIBKERN= ${KERNLIB}