Module Name: src
Committed By: justin
Date: Thu Oct 30 21:15:13 UTC 2014
Modified Files:
src/external/cddl/osnet/usr.bin/ztest: Makefile
Log Message:
Add libraries in order that they will link if static as well as dynamic
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/usr.bin/ztest/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/usr.bin/ztest/Makefile
diff -u src/external/cddl/osnet/usr.bin/ztest/Makefile:1.2 src/external/cddl/osnet/usr.bin/ztest/Makefile:1.3
--- src/external/cddl/osnet/usr.bin/ztest/Makefile:1.2 Wed Sep 16 09:17:29 2009
+++ src/external/cddl/osnet/usr.bin/ztest/Makefile Thu Oct 30 21:15:13 2014
@@ -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"
@@ -8,9 +8,6 @@ MKMAN= no
DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} ${LIBPTHREAD} \
${LIBZ} ${LIBAVL}
-LIBAVL_OBJDIR!= cd ${LIBAVL_SRCDIR} && ${PRINTOBJDIR}
-LDADD+= -L${LIBAVL_OBJDIR} -lavl
-
LIBNVPAIR_OBJDIR!= cd ${LIBNVPAIR_SRCDIR} && ${PRINTOBJDIR}
LDADD+= -L${LIBNVPAIR_OBJDIR} -lnvpair
@@ -20,6 +17,9 @@ LDADD+= -L${LIBUMEM_OBJDIR} -lum
LIBZPOOL_OBJDIR!= cd ${LIBZPOOL_SRCDIR} && ${PRINTOBJDIR}
LDADD+= -L${LIBZPOOL_OBJDIR} -lzpool
+LIBAVL_OBJDIR!= cd ${LIBAVL_SRCDIR} && ${PRINTOBJDIR}
+LDADD+= -L${LIBAVL_OBJDIR} -lavl
+
LDADD+= -lm -lpthread -lz
.PATH: ${ZFSDIR}/dist/cmd/ztest
