From b51c19847a76df16a2a09098d86189ff50ff2507 Mon Sep 17 00:00:00 2001 From: avg Date: Fri, 23 Oct 2015 08:12:00 +0000 Subject: MFC r284409: Fix circular dependency between libzfs and libzfs_core By bapt. --- cddl/lib/libzfs/Makefile | 1 - cddl/lib/libzfs_core/Makefile | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index b2f4352..19a3f2e 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -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 \ diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile index a470fbc..99ab34d 100644 --- a/cddl/lib/libzfs_core/Makefile +++ b/cddl/lib/libzfs_core/Makefile @@ -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 -- cgit v1.1