diff options
| author | Renato Botelho <renato@netgate.com> | 2015-11-03 09:45:44 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-11-03 09:45:44 -0200 |
| commit | c7275b999acdea9746ff095cf10188b4a3d09b7a (patch) | |
| tree | a95eeaad8a2157ed3641d93c98bdc108bcd728d4 /cddl/lib | |
| parent | 2b0a9fbf7a64ff2e54d03cebd5bc2d787026eaf8 (diff) | |
| parent | fe49fc6e1c94b6c41d1d3844ca219a76da3c70dc (diff) | |
| download | FreeBSD-src-c7275b999acdea9746ff095cf10188b4a3d09b7a.zip FreeBSD-src-c7275b999acdea9746ff095cf10188b4a3d09b7a.tar.gz | |
Merge branch 'stable/10' into devel
Diffstat (limited to 'cddl/lib')
| -rw-r--r-- | cddl/lib/Makefile | 5 | ||||
| -rw-r--r-- | cddl/lib/libzfs/Makefile | 1 | ||||
| -rw-r--r-- | cddl/lib/libzfs_core/Makefile | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile index fef1383..9a6b7c8 100644 --- a/cddl/lib/Makefile +++ b/cddl/lib/Makefile @@ -32,4 +32,9 @@ _drti= drti _libdtrace= libdtrace .endif +SUBDIR_DEPEND_libdtrace= libctf +SUBDIR_DEPEND_libzfs= libavl libnvpair libumem libuutil libzfs_core + +SUBDIR_PARALLEL= + .include <bsd.subdir.mk> 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 |
