2 files changed, 19 insertions, 24 deletions

diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
index a034118a6f5b..8f364d2c2bb1 100644
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@ -2,7 +2,6 @@
 .PATH: ${ZFSTOP}/module/zcommon
 .PATH: ${ZFSTOP}/lib/libzfs
 .PATH: ${ZFSTOP}/lib/libzfs/os/freebsd
-.PATH: ${ZFSTOP}/lib/libshare
 .PATH: ${ZFSTOP}/include
 .PATH: ${ZFSTOP}/module/zstd
 .PATH: ${ZFSTOP}/module/zstd/lib
@@ -29,31 +28,28 @@ LIBADD= \
 
 INCS=	libzfs.h
 USER_C = \
-        libzfs_changelist.c \
-        libzfs_config.c \
-        libzfs_crypto.c \
-        libzfs_dataset.c \
-        libzfs_diff.c \
-        libzfs_import.c \
-        libzfs_iter.c \
-        libzfs_mount.c \
-        libzfs_pool.c \
-        libzfs_sendrecv.c \
-        libzfs_status.c \
-        libzfs_util.c
+	libzfs_changelist.c \
+	libzfs_config.c \
+	libzfs_crypto.c \
+	libzfs_dataset.c \
+	libzfs_diff.c \
+	libzfs_import.c \
+	libzfs_iter.c \
+	libzfs_mount.c \
+	libzfs_pool.c \
+	libzfs_sendrecv.c \
+	libzfs_share.c \
+	libzfs_share_nfs.c \
+	libzfs_status.c \
+	libzfs_util.c \
+	os/freebsd/libzfs_share_nfs.c \
+	os/freebsd/libzfs_share_smb.c
 
 # FreeBSD
 USER_C += \
         libzfs_compat.c \
         libzfs_zmount.c
 
-# libshare
-USER_C += \
-	libshare.c \
-	nfs.c \
-	os/freebsd/nfs.c \
-	os/freebsd/smb.c
-
 KERNEL_C = \
         cityhash.c \
         zfeature_common.c \
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
index ade864790f1c..74a5f6ccb438 100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -133,6 +133,7 @@ KERNEL_C = \
 	space_map.c \
 	space_reftree.c \
 	txg.c \
+	u8_textprep.c \
 	trace.c \
 	uberblock.c \
 	unique.c \
@@ -161,7 +162,6 @@ KERNEL_C = \
 	vdev_removal.c \
 	vdev_root.c \
 	vdev_trim.c \
-	xxhash.c \
 	zap.c \
 	zap_leaf.c \
 	zap_micro.c \
@@ -205,6 +205,7 @@ KERNEL_C = \
 	zstd_lazy.c \
 	zstd_ldm.c \
 	zstd_opt.c \
+	zstd_preSplit.c \
 	zthr.c
 
 ARCH_C =
@@ -250,9 +251,7 @@ LUA_C = \
 	lvm.c \
 	lzio.c
 
-UNICODE_C = u8_textprep.c
-
-SRCS+=		${USER_C} ${KERNEL_C} ${LUA_C} ${UNICODE_C} ${ARCH_C}
+SRCS+=		${USER_C} ${KERNEL_C} ${LUA_C} ${ARCH_C}
 
 
 WARNS?=		2