Add libraries in order that they will link if static as well as dynamic
This commit is contained in:
parent
a3aed58d4c
commit
3cf1fc0878
|
@ -1,4 +1,4 @@
|
||||||
# $NetBSD: Makefile,v 1.2 2009/09/16 09:17:29 haad Exp $
|
# $NetBSD: Makefile,v 1.3 2014/10/30 21:15:13 justin Exp $
|
||||||
|
|
||||||
.include "../../Makefile.zfs"
|
.include "../../Makefile.zfs"
|
||||||
|
|
||||||
|
@ -8,9 +8,6 @@ MKMAN= no
|
||||||
DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} ${LIBPTHREAD} \
|
DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} ${LIBPTHREAD} \
|
||||||
${LIBZ} ${LIBAVL}
|
${LIBZ} ${LIBAVL}
|
||||||
|
|
||||||
LIBAVL_OBJDIR!= cd ${LIBAVL_SRCDIR} && ${PRINTOBJDIR}
|
|
||||||
LDADD+= -L${LIBAVL_OBJDIR} -lavl
|
|
||||||
|
|
||||||
LIBNVPAIR_OBJDIR!= cd ${LIBNVPAIR_SRCDIR} && ${PRINTOBJDIR}
|
LIBNVPAIR_OBJDIR!= cd ${LIBNVPAIR_SRCDIR} && ${PRINTOBJDIR}
|
||||||
LDADD+= -L${LIBNVPAIR_OBJDIR} -lnvpair
|
LDADD+= -L${LIBNVPAIR_OBJDIR} -lnvpair
|
||||||
|
|
||||||
|
@ -20,6 +17,9 @@ LDADD+= -L${LIBUMEM_OBJDIR} -lumem
|
||||||
LIBZPOOL_OBJDIR!= cd ${LIBZPOOL_SRCDIR} && ${PRINTOBJDIR}
|
LIBZPOOL_OBJDIR!= cd ${LIBZPOOL_SRCDIR} && ${PRINTOBJDIR}
|
||||||
LDADD+= -L${LIBZPOOL_OBJDIR} -lzpool
|
LDADD+= -L${LIBZPOOL_OBJDIR} -lzpool
|
||||||
|
|
||||||
|
LIBAVL_OBJDIR!= cd ${LIBAVL_SRCDIR} && ${PRINTOBJDIR}
|
||||||
|
LDADD+= -L${LIBAVL_OBJDIR} -lavl
|
||||||
|
|
||||||
LDADD+= -lm -lpthread -lz
|
LDADD+= -lm -lpthread -lz
|
||||||
|
|
||||||
.PATH: ${ZFSDIR}/dist/cmd/ztest
|
.PATH: ${ZFSDIR}/dist/cmd/ztest
|
||||||
|
|
Loading…
Reference in New Issue