diff options
| author | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
| commit | d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2 (patch) | |
| tree | b04f4bd7cd887f50e7d98af35f46b9834ff86c80 /cddl/usr.sbin | |
| parent | 3c8e37b1d04827f33c0c9a7594bd1b1ef7cdb3d3 (diff) | |
| parent | 4fbde208c6460d576f64d6dc3cdc6cab085a4283 (diff) | |
| download | FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.zip FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.tar.gz | |
Merge head from 7/28
Diffstat (limited to 'cddl/usr.sbin')
| -rw-r--r-- | cddl/usr.sbin/zdb/Makefile | 1 | ||||
| -rw-r--r-- | cddl/usr.sbin/zdb/Makefile.depend | 1 | ||||
| -rw-r--r-- | cddl/usr.sbin/zhack/Makefile | 1 | ||||
| -rw-r--r-- | cddl/usr.sbin/zhack/Makefile.depend | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile index fa9ab98..0e2ec8f 100644 --- a/cddl/usr.sbin/zdb/Makefile +++ b/cddl/usr.sbin/zdb/Makefile @@ -15,6 +15,7 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair 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/libzpool/common CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common diff --git a/cddl/usr.sbin/zdb/Makefile.depend b/cddl/usr.sbin/zdb/Makefile.depend index 529f1d7..2a76b0e 100644 --- a/cddl/usr.sbin/zdb/Makefile.depend +++ b/cddl/usr.sbin/zdb/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + cddl/lib/libavl \ cddl/lib/libnvpair \ cddl/lib/libumem \ cddl/lib/libuutil \ diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile index 9ae3395..8064cf1 100644 --- a/cddl/usr.sbin/zhack/Makefile +++ b/cddl/usr.sbin/zhack/Makefile @@ -14,6 +14,7 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair 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/libzpool/common CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common diff --git a/cddl/usr.sbin/zhack/Makefile.depend b/cddl/usr.sbin/zhack/Makefile.depend index 529f1d7..2a76b0e 100644 --- a/cddl/usr.sbin/zhack/Makefile.depend +++ b/cddl/usr.sbin/zhack/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + cddl/lib/libavl \ cddl/lib/libnvpair \ cddl/lib/libumem \ cddl/lib/libuutil \ |
