d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try and tidy up some very loose ends with paths to various libraries etc.

Browse Source
This commit is contained in:
Peter Wemm 2002-04-06 04:29:36 +00:00
parent 402e50591a
commit e91ab65ef6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=93925
3 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/boot/efi/Makefile.inc
View File

@ -1,9 +1,4 @@
# $FreeBSD$
# Options used when building app-specific efi components
DPADD+= ${DESTDIR}/${LIBDIR}/libstand.a
LIBSTANDDIR= ${.CURDIR}/../../../../lib/libstand
LIBSTAND= -lstand
LIBEFI= ${.OBJDIR}/../libefi/libefi.a
CFLAGS+= -ffreestanding

18
sys/boot/efi/loader/Makefile
View File

@ -23,6 +23,19 @@ LIBFICL= ${.CURDIR}/../../ficl/libficl.a
LIBFICL=
.endif
# where to get libstand from
.if exists(${.OBJDIR}/../../../../lib/libstand/libstand.a)
LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a
.else
LIBSTAND= ${.CURDIR}/../../../../lib/libstand/libstand.a
.endif
.if exists(${.OBJDIR}/../libefi/libefi.a)
LIBEFI= ${.OBJDIR}/../libefi/libefi.a
.else
LIBEFI= ${.CURDIR}/../libefi/libefi.a
.endif
# Always add MI sources
.PATH: ${.CURDIR}/../../common
.include <${.CURDIR}/../../common/Makefile.inc>
@ -85,9 +98,8 @@ machine:
.include <bsd.prog.mk>
${BASE}.sym: ${OBJS} ${LIBEFI} ${CRT} vers.o
${BASE}.sym: ${OBJS} ${LIBFICL} ${LIBEFI} ${LIBSTAND} ${CRT} vers.o
${LD} ${LDFLAGS} -o ${BASE}.sym -M ${CRT} ${OBJS} vers.o \
${LIBFICL} ${LIBEFI} -L${DESTDIR}${LIBDIR} ${LIBSTAND} \
> ${.OBJDIR}/${BASE}.list
${LIBFICL} ${LIBEFI} ${LIBSTAND} > ${.OBJDIR}/${BASE}.list
beforedepend ${OBJS}: machine

18
sys/boot/ia64/efi/Makefile
View File

@ -23,6 +23,19 @@ LIBFICL= ${.CURDIR}/../../ficl/libficl.a
LIBFICL=
.endif
# where to get libstand from
.if exists(${.OBJDIR}/../../../../lib/libstand/libstand.a)
LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a
.else
LIBSTAND= ${.CURDIR}/../../../../lib/libstand/libstand.a
.endif
.if exists(${.OBJDIR}/../libefi/libefi.a)
LIBEFI= ${.OBJDIR}/../libefi/libefi.a
.else
LIBEFI= ${.CURDIR}/../libefi/libefi.a
.endif
# Always add MI sources
.PATH: ${.CURDIR}/../../common
.include <${.CURDIR}/../../common/Makefile.inc>
@ -85,9 +98,8 @@ machine:
.include <bsd.prog.mk>
${BASE}.sym: ${OBJS} ${LIBEFI} ${CRT} vers.o
${BASE}.sym: ${OBJS} ${LIBFICL} ${LIBEFI} ${LIBSTAND} ${CRT} vers.o
${LD} ${LDFLAGS} -o ${BASE}.sym -M ${CRT} ${OBJS} vers.o \
${LIBFICL} ${LIBEFI} -L${DESTDIR}${LIBDIR} ${LIBSTAND} \
> ${.OBJDIR}/${BASE}.list
${LIBFICL} ${LIBEFI} ${LIBSTAND} > ${.OBJDIR}/${BASE}.list
beforedepend ${OBJS}: machine