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

Duplicate the logic used elsewhere to define LIBSTAND.

Browse Source
This commit is contained in:
marcel 2002-03-28 06:52:10 +00:00
parent a7bb84b1a2
commit 4131d9a132
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/boot/ia64/ski/Makefile
View File

@ -23,7 +23,16 @@ LIBFICL= ${.CURDIR}/../../ficl/libficl.a
LIBFICL=
.endif
LIBSTAND= -lstand
# where to get libstand from
#XXX need a better way to do this
LIBSTAND= ${.CURDIR}/../../../../lib/libstand/libstand.a
.if !exists(${LIBSTAND})
LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a
.if !exists(${LIBSTAND})
LIBSTAND= -lstand
.endif
.endif
.if exists(${.OBJDIR}/../libski/libski.a)
LIBSKI= ${.OBJDIR}/../libski/libski.a
.else
@ -75,7 +84,7 @@ start.o: ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/start.S
machine:
ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine
${PROG}: ${OBJS} ${LIBFICL} ${LIBSTAND} ${LIBSKI} vers.o
${PROG}: ${OBJS} ${LIBFICL} ${LIBSKI} vers.o
${LD} ${LDFLAGS} -o ${PROG} -M \
${OBJS} vers.o \
${LIBFICL} ${LIBSTAND} ${LIBSKI} ${LIBSTAND} \

13
sys/boot/ia64/skiload/Makefile
View File

@ -23,7 +23,16 @@ LIBFICL= ${.CURDIR}/../../ficl/libficl.a
LIBFICL=
.endif
LIBSTAND= -lstand
# where to get libstand from
#XXX need a better way to do this
LIBSTAND= ${.CURDIR}/../../../../lib/libstand/libstand.a
.if !exists(${LIBSTAND})
LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a
.if !exists(${LIBSTAND})
LIBSTAND= -lstand
.endif
.endif
.if exists(${.OBJDIR}/../libski/libski.a)
LIBSKI= ${.OBJDIR}/../libski/libski.a
.else
@ -75,7 +84,7 @@ start.o: ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/start.S
machine:
ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine
${PROG}: ${OBJS} ${LIBFICL} ${LIBSTAND} ${LIBSKI} vers.o
${PROG}: ${OBJS} ${LIBFICL} ${LIBSKI} vers.o
${LD} ${LDFLAGS} -o ${PROG} -M \
${OBJS} vers.o \
${LIBFICL} ${LIBSTAND} ${LIBSKI} ${LIBSTAND} \