aboutsummaryrefslogtreecommitdiff
path: root/cddl/sbin/zfs/Makefile
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2013-03-05 08:09:53 +0000
committerMartin Matuska <mm@FreeBSD.org>2013-03-05 08:09:53 +0000
commitdce1a726f283916a09eac22252f5f762dd7f4b8f (patch)
tree669ea5740806cbf29b6e064275d3f5a62478bd47 /cddl/sbin/zfs/Makefile
parent23c07ad60d0e9eb2db5b6fbdafc1bd8b413ff7dd (diff)
parent5b5bfb7422f23e7a01f737edc83a22ea54181aed (diff)
downloadsrc-dce1a726f283916a09eac22252f5f762dd7f4b8f.tar.gz
src-dce1a726f283916a09eac22252f5f762dd7f4b8f.zip
WiP merge of libzfs_core (MFV r238590, r238592)
not yet working, ioctl handling needs to be changed
Notes
Notes: svn path=/projects/libzfs_core/; revision=247831
Diffstat (limited to 'cddl/sbin/zfs/Makefile')
-rw-r--r--cddl/sbin/zfs/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
index 95a476b7a512..a49d278a8e36 100644
--- a/cddl/sbin/zfs/Makefile
+++ b/cddl/sbin/zfs/Makefile
@@ -14,6 +14,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
@@ -22,7 +23,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
DPADD= ${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \
- ${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
-LDADD= -lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs
+ ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
+LDADD= -lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
.include <bsd.prog.mk>