svn commit: r289807 - in stable/10/cddl/lib: libzfs libzfs_core

[Andriy Gapon]

Author: avg
Date: Fri Oct 23 08:12:00 2015
New Revision: 289807
URL: https://svnweb.freebsd.org/changeset/base/289807

Log:
  MFC r284409: Fix circular dependency between libzfs and libzfs_core
  
  By bapt.

Modified:
  stable/10/cddl/lib/libzfs/Makefile
  stable/10/cddl/lib/libzfs_core/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/cddl/lib/libzfs/Makefile
==============================================================================
--- stable/10/cddl/lib/libzfs/Makefile	Fri Oct 23 08:04:59 2015	(r289806)
+++ stable/10/cddl/lib/libzfs/Makefile	Fri Oct 23 08:12:00 2015	(r289807)
@@ -37,7 +37,6 @@ SRCS+=	libzfs_changelist.c \
 	zfs_comutil.c \
 	zfs_deleg.c \
 	zfs_fletcher.c \
-	zfs_ioctl_compat.c \
 	zfs_namecheck.c \
 	zfs_prop.c \
 	zpool_prop.c \

Modified: stable/10/cddl/lib/libzfs_core/Makefile
==============================================================================
--- stable/10/cddl/lib/libzfs_core/Makefile	Fri Oct 23 08:04:59 2015	(r289806)
+++ stable/10/cddl/lib/libzfs_core/Makefile	Fri Oct 23 08:12:00 2015	(r289807)
@@ -11,7 +11,8 @@ DPADD=	${LIBNVPAIR}
 LDADD=	-lnvpair
 
 SRCS=	libzfs_core.c \
-	libzfs_core_compat.c
+	libzfs_core_compat.c \
+	zfs_ioctl_compat.c
 
 SRCS+=	libzfs_compat.c