diff options
| author | mm <mm@FreeBSD.org> | 2013-03-05 08:09:53 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2013-03-05 08:09:53 +0000 |
| commit | 99f883783c89d10b9d02e77393eb9d0a307f3ca0 (patch) | |
| tree | 669ea5740806cbf29b6e064275d3f5a62478bd47 /cddl/sbin | |
| parent | 712512f2cc075f7890eaf59c6aa392f330857ff9 (diff) | |
| parent | d5063724619a16bd1592c39395c787e97be18693 (diff) | |
| download | FreeBSD-src-99f883783c89d10b9d02e77393eb9d0a307f3ca0.zip FreeBSD-src-99f883783c89d10b9d02e77393eb9d0a307f3ca0.tar.gz | |
WiP merge of libzfs_core (MFV r238590, r238592)
not yet working, ioctl handling needs to be changed
Diffstat (limited to 'cddl/sbin')
| -rw-r--r-- | cddl/sbin/zfs/Makefile | 5 | ||||
| -rw-r--r-- | cddl/sbin/zpool/Makefile | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile index 95a476b..a49d278 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> diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile index b9d44b6..1884d24 100644 --- a/cddl/sbin/zpool/Makefile +++ b/cddl/sbin/zpool/Makefile @@ -27,7 +27,7 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common DPADD= ${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} \ - ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS} -LDADD= -lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs + ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} +LDADD= -lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs .include <bsd.prog.mk> |
