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/usr.bin | |
| 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/usr.bin')
| -rw-r--r-- | cddl/usr.bin/zinject/Makefile | 4 | ||||
| -rw-r--r-- | cddl/usr.bin/ztest/Makefile | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile index 2ea066c2..8c5c141 100644 --- a/cddl/usr.bin/zinject/Makefile +++ b/cddl/usr.bin/zinject/Makefile @@ -20,7 +20,7 @@ CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ - ${LIBZFS} ${LIBZPOOL} -LDADD= -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool + ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} +LDADD= -lgeom -lm -lnvpair -lumem -luutil -lzfs_core -lzfs -lzpool .include <bsd.prog.mk> diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile index 42c0993..965300e 100644 --- a/cddl/usr.bin/ztest/Makefile +++ b/cddl/usr.bin/ztest/Makefile @@ -19,8 +19,9 @@ CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ - ${LIBPTHREAD} ${LIBAVL} ${LIBZFS} ${LIBUUTIL} -LDADD= -lgeom -lm -lnvpair -lumem -lzpool -lpthread -lavl -lzfs -luutil + ${LIBPTHREAD} ${LIBAVL} ${LIBZFS_CORE} ${LIBZFS} ${LIBUUTIL} +LDADD= -lgeom -lm -lnvpair -lumem -lzpool -lpthread -lavl -lzfs_core -lzfs \ + -luutil CSTD= c99 |
