summaryrefslogtreecommitdiffstats
path: root/cddl/lib
diff options
context:
space:
mode:
authorrodrigc <rodrigc@FreeBSD.org>2014-11-29 08:33:54 +0000
committerrodrigc <rodrigc@FreeBSD.org>2014-11-29 08:33:54 +0000
commit0475e04762f5dd444faf64924251cd3466d84c98 (patch)
treeb01f06f3087a100d6631cac0ff2f01771ce45e54 /cddl/lib
parent0bfa66131535f604deb80bc8d0cf2f8b810f0352 (diff)
downloadFreeBSD-src-0475e04762f5dd444faf64924251cd3466d84c98.zip
FreeBSD-src-0475e04762f5dd444faf64924251cd3466d84c98.tar.gz
MFC r272484:
Add dependencies to various libraries to libzfs and libzpool. Submitted by: sef
Diffstat (limited to 'cddl/lib')
-rw-r--r--cddl/lib/libzfs/Makefile7
-rw-r--r--cddl/lib/libzpool/Makefile5
2 files changed, 8 insertions, 4 deletions
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
index 4010ac1..b2f4352 100644
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@ -7,8 +7,11 @@
LIB= zfs
DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
- ${LIBAVL} ${LIBZFS_CORE}
-LDADD= -lmd -lpthread -lumem -lutil -lm -lnvpair -lavl -lzfs_core
+ ${LIBAVL} ${LIBZFS_CORE} ${LIBUUTIL} ${LIBBSDXML} ${LIBGEOM} \
+ ${LIBNVPAIR}
+
+LDADD= -lmd -lpthread -lumem -lutil -luutil -lm -lnvpair -lavl \
+ -lbsdxml -lgeom -lnvpair -lzfs_core
SRCS= deviceid.c \
fsshare.c \
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
index 848325a..8fe610c 100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -56,8 +56,9 @@ CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/thread
CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys
CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
-DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ}
-LDADD= -lmd -lpthread -lz
+DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} ${LIBNVPAIR} \
+ ${LIBAVL} ${LIBUMEM}
+LDADD= -lmd -lpthread -lz -lnvpair -lavl -lumem
# atomic.S doesn't like profiling.
NO_PROFILE=
OpenPOWER on IntegriCloud