Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/cddl/osnet/usr.bin/ztest Add libraries in order tha...



details:   https://anonhg.NetBSD.org/src/rev/255643356890
branches:  trunk
changeset: 333370:255643356890
user:      justin <justin%NetBSD.org@localhost>
date:      Thu Oct 30 21:15:13 2014 +0000

description:
Add libraries in order that they will link if static as well as dynamic

diffstat:

 external/cddl/osnet/usr.bin/ztest/Makefile |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r d824c5820323 -r 255643356890 external/cddl/osnet/usr.bin/ztest/Makefile
--- a/external/cddl/osnet/usr.bin/ztest/Makefile        Thu Oct 30 20:21:39 2014 +0000
+++ b/external/cddl/osnet/usr.bin/ztest/Makefile        Thu Oct 30 21:15:13 2014 +0000
@@ -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 @@
 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 @@
 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



Home | Main Index | Thread Index | Old Index