summaryrefslogtreecommitdiffstats
path: root/cddl/lib
diff options
context:
space:
mode:
authormm <mm@FreeBSD.org>2013-03-18 09:32:29 +0000
committermm <mm@FreeBSD.org>2013-03-18 09:32:29 +0000
commit713c2d790d75eb897ffb4bf09b789cf8940e6ce4 (patch)
tree9353f3579ab3c149b4b017b4be06fbe98b7a5f52 /cddl/lib
parentda897e350b0958d2948223afca3a685866ac6e9c (diff)
downloadFreeBSD-src-713c2d790d75eb897ffb4bf09b789cf8940e6ce4.zip
FreeBSD-src-713c2d790d75eb897ffb4bf09b789cf8940e6ce4.tar.gz
Move common zfs ioctl compatibility functions (userland) into libzfs_compat.c
Introduce additional constants for zfs ioctl versions
Diffstat (limited to 'cddl/lib')
-rw-r--r--cddl/lib/libzfs/Makefile1
-rw-r--r--cddl/lib/libzfs_core/Makefile6
2 files changed, 6 insertions, 1 deletions
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
index 7397cae..5b6b47d 100644
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@ -18,6 +18,7 @@ SRCS= deviceid.c \
zone.c
SRCS+= libzfs_changelist.c \
+ libzfs_compat.c \
libzfs_config.c \
libzfs_dataset.c \
libzfs_diff.c \
diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile
index d0993689..a470fbc 100644
--- a/cddl/lib/libzfs_core/Makefile
+++ b/cddl/lib/libzfs_core/Makefile
@@ -4,12 +4,16 @@
.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
LIB= zfs_core
DPADD= ${LIBNVPAIR}
LDADD= -lnvpair
-SRCS= libzfs_core.c libzfs_core_compat.c
+SRCS= libzfs_core.c \
+ libzfs_core_compat.c
+
+SRCS+= libzfs_compat.c
WARNS?= 0
CSTD= c99
OpenPOWER on IntegriCloud