Removed build system from master branch, will relocate to linux-zfs-branch

62 files changed, 0 insertions, 962 deletions

diff --git a/META b/META
deleted file mode 100644
index d43327990..000000000
--- a/META
+++ /dev/null
@@ -1,6 +0,0 @@
-Meta:         1
-Name:         zfs
-Branch:       1.0
-Version:      0.4.0
-Release:      1
-Release-Tags: relext
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 39f3fd084..000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-AUTOMAKE_OPTIONS = foreign dist-zip
-
-SUBDIRS = doc scripts $(BUILDDIR)
-CONFIG_CLEAN_FILES =  aclocal.m4 config.guess config.sub
-CONFIG_CLEAN_FILES += depcomp missing mkinstalldirs
-EXTRA_DIST = autogen.sh
-
-.PHONY: quilt
-quilt:   .quilt-$(BUILDDIR)
-autogen: .autogen-$(BUILDDIR)
-config:  .config-$(BUILDDIR)
-.quilt-$(BUILDDIR):
-	./scripts/quilt.sh -p $(NAME) -b $(BUILDDIR) -s $(SERIESFILE) -d $(PATCHDIR)
-	echo $(BUILDDIR) >$@
-
-unquilt:
-	rm -rf $(BUILDDIR)
-	rm -f .quilt-$(BUILDDIR)
-
-clean-generic:
-
-distclean: unquilt
-
-rpms: dist Makefile
-	rpmbuild -ta $(distdir).tar.gz
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 72bba5b03..000000000
--- a/autogen.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-aclocal -I config &&
-libtoolize --automake --copy
-autoheader &&
-automake --add-missing --include-deps 2>/dev/null
-autoconf
-rm -rf autom4te.cache aclocal.m4
diff --git a/build/Makefile b/build/Makefile
deleted file mode 100644
index f84b8e9cc..000000000
--- a/build/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-m := conftest.o
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 249865656..000000000
--- a/configure.ac
+++ /dev/null
@@ -1,164 +0,0 @@
-#
-# This file is part of the ZFS Linux port.
-#
-# Copyright (c) 2008 Lawrence Livermore National Security, LLC.
-# Produced at Lawrence Livermore National Laboratory
-# Written by:
-#         Brian Behlendorf <[email protected]>,
-#         Herb Wartens <[email protected]>,
-#         Jim Garlick <[email protected]>
-# LLNL-CODE-403049
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-AC_INIT
-AC_LANG(C)
-ZFS_AC_META
-AC_CONFIG_AUX_DIR([config])
-AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([$ZFS_META_NAME], [$ZFS_META_VERSION])
-AC_CONFIG_HEADERS([zfs_config.h])
-AM_MAINTAINER_MODE
-
-AC_PROG_INSTALL
-AC_PROG_CC
-AC_PROG_LIBTOOL
-
-zfsconfig=kernel
-kernelsrc=
-kernelbuild=
-splsrc=
-splbuild=
-
-ZFS_AC_KERNEL
-ZFS_AC_SPL
-ZFS_AC_CONFIG
-ZFS_AC_LICENSE
-ZFS_AC_DEBUG
-ZFS_AC_2ARGS_BIO_END_IO_T
-
-# Check for needed userspace bits
-AC_CHECK_HEADERS(sys/types.h sys/byteorder.h sys/isa_defs.h \
-                 sys/systeminfo.h sys/u8_textprep.h libdiskmgt.h)
-
-AC_CHECK_FUNCS(strlcat strlcpy strnlen issetugid setmntent getexecname)
-
-AC_CHECK_LIB([diskmgt], [libdiskmgt_error],
-	[AC_DEFINE([HAVE_LIBDISKMGT], 1,
-        [Define to 1 if 'libdiskmgt' library available])])
-
-AC_CHECK_LIB([efi], [efi_alloc_and_init],
-	[AC_DEFINE([HAVE_LIBEFI], 1,
-	[Define to 1 if 'libefi' library available])])
-
-AC_CHECK_LIB([share], [sa_init],
-	[AC_DEFINE([HAVE_LIBSHARE], 1,
-	[Define to 1 if 'libshare' library available])])
-
-AC_EGREP_HEADER(ioctl, unistd.h,
-	[AC_DEFINE([HAVE_IOCTL_IN_UNISTD_H], 1,
-        [Define to 1 if ioctl() is defined in <unistd.h> header file])])
-
-AC_EGREP_HEADER(ioctl, sys/ioctl.h,
-	[AC_DEFINE([HAVE_IOCTL_IN_SYS_IOCTL_H], 1,
-        [Define to 1 if ioctl() is defined in <sys/ioctl.h> header file])])
-
-AC_EGREP_HEADER(ioctl, stropts.h,
-	[AC_DEFINE([HAVE_IOCTL_IN_STROPTS_H], 1,
-        [Define to 1 if ioctl() is defined in <stropts.h> header file])])
-
-AC_EGREP_HEADER(strcmp, strings.h, 
-	[AC_DEFINE([HAVE_STRCMP_IN_STRINGS_H], 1,
-        [Define to 1 if strcmpl() is defined in <strings.h> header file])])
-
-AC_EGREP_HEADER(sysinfo, sys/systeminfo.h, 
-	[AC_DEFINE([HAVE_SYSINFO_IN_SYS_SYSTEMINFO_H], 1,
-        [Define to 1 if sysinfo() is defined in <sys/systeminfo.h> header file])])
-
-#AC_DEFINE([HAVE_ZVOL], 1, ["Define to 1 to include ZVOL support"])
-#AC_DEFINE([HAVE_ZPL], 1, ["Define to 1 to include ZPL support"])
-#AC_DEFINE([WANT_FAKE_IOCTL], 1, ["Define to 1 to use fake ioctl() support"])
-#AC_DEFINE([HAVE_DM_INUSE_SWAP], 1, ["None"])
-#AC_DEFINE([HAVE_UNICODE], 1, ["None"])
-#AC_DEFINE([HAVE_INTTYPES], 1, [Define to 1 if unint16 defined in <sys/types.h> header file])
-
-AC_CONFIG_FILES([ Makefile
-                  config/Makefile
-                  doc/Makefile
-                  scripts/Makefile
-                  zfs/Makefile
-                  zfs/lib/libudmu/include/Makefile
-                  zfs/lib/libudmu/Makefile
-                  zfs/lib/Makefile
-                  zfs/lib/libnvpair/include/sys/Makefile
-                  zfs/lib/libnvpair/include/Makefile
-                  zfs/lib/libnvpair/Makefile
-                  zfs/lib/libsolcompat/sparc64/Makefile
-                  zfs/lib/libsolcompat/Makefile
-                  zfs/lib/libsolcompat/include/tsol/Makefile
-                  zfs/lib/libsolcompat/include/sparc64/sys/Makefile
-                  zfs/lib/libsolcompat/include/sparc64/Makefile
-                  zfs/lib/libsolcompat/include/rpc/Makefile
-                  zfs/lib/libsolcompat/include/i386/sys/Makefile
-                  zfs/lib/libsolcompat/include/i386/Makefile
-                  zfs/lib/libsolcompat/include/ia32/sys/Makefile
-                  zfs/lib/libsolcompat/include/ia32/Makefile
-                  zfs/lib/libsolcompat/include/amd64/sys/Makefile
-                  zfs/lib/libsolcompat/include/amd64/Makefile
-                  zfs/lib/libsolcompat/include/sys/sysevent/Makefile
-                  zfs/lib/libsolcompat/include/sys/fm/Makefile
-                  zfs/lib/libsolcompat/include/sys/Makefile
-                  zfs/lib/libsolcompat/include/Makefile
-                  zfs/lib/libsolcompat/i386/Makefile
-                  zfs/lib/libsolcompat/amd64/Makefile
-                  zfs/lib/libavl/include/sys/Makefile
-                  zfs/lib/libavl/include/Makefile
-                  zfs/lib/libavl/Makefile
-                  zfs/lib/libuutil/include/Makefile
-                  zfs/lib/libuutil/Makefile
-                  zfs/lib/libzfs/include/Makefile
-                  zfs/lib/libzfs/Makefile
-                  zfs/lib/libumem/include/Makefile
-                  zfs/lib/libumem/Makefile
-                  zfs/lib/libumem/sys/Makefile
-                  zfs/lib/libzcommon/include/Makefile
-                  zfs/lib/libzcommon/include/sys/fm/fs/Makefile
-                  zfs/lib/libzcommon/include/sys/fm/Makefile
-                  zfs/lib/libzcommon/include/sys/Makefile
-                  zfs/lib/libzcommon/include/sys/fs/Makefile
-                  zfs/lib/libzcommon/Makefile
-                  zfs/lib/libzpool/Makefile
-                  zfs/lib/libport/include/sys/Makefile
-                  zfs/lib/libport/include/Makefile
-                  zfs/lib/libport/Makefile
-                  zfs/lib/libdmu-ctl/include/sys/Makefile
-                  zfs/lib/libdmu-ctl/include/Makefile
-                  zfs/lib/libdmu-ctl/Makefile
-                  zfs/zcmd/ztest/Makefile
-                  zfs/zcmd/Makefile
-                  zfs/zcmd/zfs/Makefile
-                  zfs/zcmd/zdb/Makefile
-                  zfs/zcmd/zinject/Makefile
-                  zfs/zcmd/zdump/Makefile
-                  zfs/zcmd/zpool/Makefile
-               ])
-AC_OUTPUT
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 07f6386f4..000000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = LEGAL
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
deleted file mode 100644
index e70853075..000000000
--- a/scripts/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-EXTRA_DIST  = check.sh create-zpool.sh load-zfs.sh unload-zfs.sh
-EXTRA_DIST += profile-kpios-disk.sh profile-kpios-pids.sh
-EXTRA_DIST += profile-kpios-post.sh profile-kpios-pre.sh profile-kpios.sh
-EXTRA_DIST += survey.sh update-zfs.sh zpios-jbod.sh zpios.sh
-
-check:
-	./check.sh
-
diff --git a/zfs/Makefile.in b/zfs/Makefile.in
deleted file mode 100644
index e0b30c837..000000000
--- a/zfs/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-subdir-m += lib
-subdir-m += zcmd
-
-all:
-# Make the exported SPL symbols available to this module.  There
-# is probably a better way to do this, but this will have to do
-# for now...  an option to modpost perhaps.
-	cp @splsymvers@ .
-
-# Kick off the kernel build system
-	$(MAKE) -C @LINUX@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ modules
-
-install uninstall clean distclean maintainer-clean distdir:
-	$(MAKE) -C @LINUX@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ $@
-
-check:
diff --git a/zfs/lib/Makefile.in b/zfs/lib/Makefile.in
deleted file mode 100644
index 324270db9..000000000
--- a/zfs/lib/Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
-subdir-m += libuutil		# User space util support
-subdir-m += libumem		# User space memory support
-subdir-m += libzfs		# User space library support
-subdir-m += libsolcompat	# User space compatibility library
-
-subdir-m += libzpool		# Kernel DMU/SPA
-subdir-m += libdmu-ctl		# Kernel control interface
-
-subdir-m += libavl		# Kernel + user space AVL tree support
-subdir-m += libnvpair		# Kernel + user space name/value support
-subdir-m += libzcommon		# Kernel + user space common support
-subdir-m += libport		# Kernel + user space linux support
diff --git a/zfs/lib/libavl/Makefile.in b/zfs/lib/libavl/Makefile.in
deleted file mode 100644
index 6b9d4d540..000000000
--- a/zfs/lib/libavl/Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
-subdir-m += include
-DISTFILES = avl.c
-
-MODULE  := zavl
-LIBRARY := libavl
-
-# Compile as kernel module.  Needed symlinks created for all
-# k* objects created by top level configure script.
-
-EXTRA_CFLAGS  = @KERNELCPPFLAGS@
-EXTRA_CFLAGS += -I@LIBDIR@/libavl/include
-
-obj-m := ${MODULE}.o
-
-${MODULE}-objs += kavl.o	# Generic AVL support
-
-# Compile as shared library.  There's an extra useless host program
-# here called 'zu' because it was the easiest way I could convince
-# the kernel build system to construct a user space shared library.
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include
-HOSTCFLAGS += -I@LIBDIR@/libport/include
-HOSTCFLAGS += -I@LIBDIR@/libavl/include
-
-hostprogs-y := zu
-always := $(hostprogs-y)
-
-zu-objs := zu.o ${LIBRARY}.so
-
-${LIBRARY}-objs += uavl.o
diff --git a/zfs/lib/libavl/include/Makefile.in b/zfs/lib/libavl/include/Makefile.in
deleted file mode 100644
index 6611e4143..000000000
--- a/zfs/lib/libavl/include/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-subdir-m += sys
diff --git a/zfs/lib/libavl/include/sys/Makefile.in b/zfs/lib/libavl/include/sys/Makefile.in
deleted file mode 100644
index 8149c3861..000000000
--- a/zfs/lib/libavl/include/sys/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-DISTFILES = avl.h avl_impl.h
diff --git a/zfs/lib/libdmu-ctl/Makefile.in b/zfs/lib/libdmu-ctl/Makefile.in
deleted file mode 100644
index c4017b254..000000000
--- a/zfs/lib/libdmu-ctl/Makefile.in
+++ /dev/null
@@ -1,28 +0,0 @@
-# NOTE: dctl_client.c, dctl_common.c, dctl_server.c, dctl_thrpool.c unused
-# by kernel port.  Potentially they should just be removed if we don't care
-# able user space lustre intergration from this source base.
-
-# NOTE: For clarity this directly should simply be renamed libzpl and
-# the full kernel implementation should be minimally stubbed out.
-
-subdir-m += include
-DISTFILES  = dctl_client.c dctl_common.c dctl_server.c dctl_thrpool.c
-DISTFILES += dmu_send.c rrwlock.c zfs_acl.c zfs_ctldir.c
-DISTFILES += zfs_dir.c zfs_fuid.c zfs_ioctl.c zfs_log.c zfs_replay.c
-DISTFILES += zfs_rlock.c zfs_vfsops.c zfs_vnops.c zvol.c
-
-MODULE := zctl
-
-EXTRA_CFLAGS  = @KERNELCPPFLAGS@
-EXTRA_CFLAGS += -I@LIBDIR@/libzcommon/include
-EXTRA_CFLAGS += -I@LIBDIR@/libdmu-ctl/include
-EXTRA_CFLAGS += -I@LIBDIR@/libavl/include
-EXTRA_CFLAGS += -I@LIBDIR@/libport/include
-EXTRA_CFLAGS += -I@LIBDIR@/libnvpair/include
-
-obj-m := ${MODULE}.o
-
-${MODULE}-objs += zvol.o	# Volume emulation interface
-${MODULE}-objs += zfs_ioctl.o	# /dev/zfs_ioctl interface
-${MODULE}-objs += zfs_vfsops.o
-${MODULE}-objs += dmu_send.o
diff --git a/zfs/lib/libdmu-ctl/include/Makefile.in b/zfs/lib/libdmu-ctl/include/Makefile.in
deleted file mode 100644
index 6611e4143..000000000
--- a/zfs/lib/libdmu-ctl/include/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-subdir-m += sys
diff --git a/zfs/lib/libdmu-ctl/include/sys/Makefile.in b/zfs/lib/libdmu-ctl/include/sys/Makefile.in
deleted file mode 100644
index 8f97ae684..000000000
--- a/zfs/lib/libdmu-ctl/include/sys/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-DISTFILES = dmu_ctl.h dmu_ctl_impl.h
diff --git a/zfs/lib/libnvpair/Makefile.in b/zfs/lib/libnvpair/Makefile.in
deleted file mode 100644
index 90599ca48..000000000
--- a/zfs/lib/libnvpair/Makefile.in
+++ /dev/null
@@ -1,34 +0,0 @@
-subdir-m += include
-DISTFILES = libnvpair.c nvpair.c nvpair_alloc_fixed.c nvpair_alloc_system.c
-
-MODULE  := znvpair
-LIBRARY := libnvpair
-
-# Compile as kernel module.  Needed symlinks created for all
-# k* objects created by top level configure script.
-
-EXTRA_CFLAGS  = @KERNELCPPFLAGS@
-EXTRA_CFLAGS += -I@LIBDIR@/libnvpair/include
-
-obj-m := ${MODULE}.o
-
-${MODULE}-objs += knvpair.o		# Interfaces name/value pairs
-${MODULE}-objs += nvpair_alloc_spl.o	# Generic alloc/free support
-
-# Compile as shared library.  There's an extra useless host program
-# here called 'zu' because it was the easiest way I could convince
-# the kernel build system to construct a user space shared library.
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include
-HOSTCFLAGS += -I@LIBDIR@/libport/include
-HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
-
-hostprogs-y := zu
-always := $(hostprogs-y)
-
-zu-objs := zu.o ${LIBRARY}.so
-
-${LIBRARY}-objs += unvpair.o
-${LIBRARY}-objs += nvpair_alloc_system.o
-${LIBRARY}-objs += libnvpair.o
diff --git a/zfs/lib/libnvpair/include/Makefile.in b/zfs/lib/libnvpair/include/Makefile.in
deleted file mode 100644
index d92f7114c..000000000
--- a/zfs/lib/libnvpair/include/Makefile.in
+++ /dev/null
@@ -1,2 +0,0 @@
-subdir-m += sys
-DISTFILES = libnvpair.h
diff --git a/zfs/lib/libnvpair/include/sys/Makefile.in b/zfs/lib/libnvpair/include/sys/Makefile.in
deleted file mode 100644
index 4f970cea5..000000000
--- a/zfs/lib/libnvpair/include/sys/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-DISTFILES = nvpair.h nvpair_impl.h
diff --git a/zfs/lib/libport/Makefile.in b/zfs/lib/libport/Makefile.in
deleted file mode 100644
index 85bdc959a..000000000
--- a/zfs/lib/libport/Makefile.in
+++ /dev/null
@@ -1,37 +0,0 @@
-subdir-m += include
-DISTFILES = port.c strlcat.c strlcpy.c strnlen.c u8_textprep.c
-
-MODULE  := zport
-LIBRARY := libzport
-
-# Compile as kernel module.  Needed symlinks created for all
-# k* objects created by top level configure script.
-
-EXTRA_CFLAGS  = @KERNELCPPFLAGS@
-EXTRA_CFLAGS += -I@LIBDIR@/libzcommon/include
-EXTRA_CFLAGS += -I@LIBDIR@/libport/include
-
-obj-m := ${MODULE}.o
-
-${MODULE}-objs += spl.o
-${MODULE}-objs += ku8_textprep.o
-
-# Compile as shared library.  There's an extra useless host program
-# here called 'zu' because it was the easiest way I could convince
-# the kernel build system to construct a user space shared library.
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@LIBDIR@/libzcommon/include
-HOSTCFLAGS += -I@LIBDIR@/libport/include
-
-hostprogs-y := zu
-always := $(hostprogs-y)
-
-zu-objs := zu.o ${LIBRARY}.so
-
-${LIBRARY}-objs += strlcpy.o
-${LIBRARY}-objs += strlcat.o
-${LIBRARY}-objs += strnlen.o
-${LIBRARY}-objs += port.o
-${LIBRARY}-objs += u8_textprep.o
-
diff --git a/zfs/lib/libport/include/Makefile.in b/zfs/lib/libport/include/Makefile.in
deleted file mode 100644
index e65438354..000000000
--- a/zfs/lib/libport/include/Makefile.in
+++ /dev/null
@@ -1,4 +0,0 @@
-subdir-m += sys
-
-DISTFILES  = fake_ioctl.h libdiskmgt.h libshare.h mntent.h stdlib.h
-DISTFILES += string.h strings.h stropts.h unistd.h
diff --git a/zfs/lib/libport/include/sys/Makefile.in b/zfs/lib/libport/include/sys/Makefile.in
deleted file mode 100644
index 6472080e1..000000000
--- a/zfs/lib/libport/include/sys/Makefile.in
+++ /dev/null
@@ -1,3 +0,0 @@
-DISTFILES  = byteorder.h debug.h efi_partition.h ioctl.h isa_defs.h
-DISTFILES += policy.h socket.h swap.h systeminfo.h systm.h time.h
-DISTFILES += types.h u8_textprep.h u8_textprep_data.h
diff --git a/zfs/lib/libsolcompat/Makefile.in b/zfs/lib/libsolcompat/Makefile.in
deleted file mode 100644
index f139d1c5e..000000000
--- a/zfs/lib/libsolcompat/Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
-subdir-m += amd64 i386 sparc64 include
-DISTFILES  = atomic_asm_weak.h gen_synonyms.h getmntany.c
-DISTFILES += mkdirp.c synonyms.h tsd.h zone.c
-
-LIBRARY := libsolcompat
-
-# Compile as shared library.  There's an extra useless host program
-# here called 'zu' because it was the easiest way I could convince
-# the kernel build system to construct a user space shared library.
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include
-HOSTCFLAGS += -I@LIBDIR@/libport/include
-
-hostprogs-y := zu
-always := $(hostprogs-y)
-
-zu-objs := zu.o ${LIBRARY}.so
-
-${LIBRARY}-objs += getmntany.o
-${LIBRARY}-objs += mkdirp.o
-${LIBRARY}-objs += zone.o
diff --git a/zfs/lib/libsolcompat/amd64/Makefile.in b/zfs/lib/libsolcompat/amd64/Makefile.in
deleted file mode 100644
index d56b66f9d..000000000
--- a/zfs/lib/libsolcompat/amd64/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-DISTFILES = atomic.S
diff --git a/zfs/lib/libsolcompat/i386/Makefile.in b/zfs/lib/libsolcompat/i386/Makefile.in
deleted file mode 100644
index d56b66f9d..000000000
--- a/zfs/lib/libsolcompat/i386/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-DISTFILES = atomic.S
diff --git a/zfs/lib/libsolcompat/include/Makefile.in b/zfs/lib/libsolcompat/include/Makefile.in
deleted file mode 100644
index 34bea226c..000000000
--- a/zfs/lib/libsolcompat/include/Makefile.in
+++ /dev/null
@@ -1,4 +0,0 @@
-subdir-m += amd64 i386 ia32 rpc sparc64 sys tsol
-DISTFILES  = assert.h atomic.h devid.h dirent.h libc.h libdevinfo.h libgen.h
-DISTFILES += mtlib.h priv.h stdarg.h stdio_ext.h strings.h ucred.h zone.h
-
diff --git a/zfs/lib/libsolcompat/include/amd64/Makefile.in b/zfs/lib/libsolcompat/include/amd64/Makefile.in
deleted file mode 100644
index 6611e4143..000000000
--- a/zfs/lib/libsolcompat/include/amd64/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-subdir-m += sys
diff --git a/zfs/lib/libsolcompat/include/amd64/sys/Makefile.in b/zfs/lib/libsolcompat/include/amd64/sys/Makefile.in
deleted file mode 100644
index 0466e658f..000000000
--- a/zfs/lib/libsolcompat/include/amd64/sys/Makefile.in
+++ /dev/null
@@ -1,2 +0,0 @@
-DISTFILES = asm_linkage.h
-
diff --git a/zfs/lib/libsolcompat/include/i386/Makefile.in b/zfs/lib/libsolcompat/include/i386/Makefile.in
deleted file mode 100644
index 6611e4143..000000000
--- a/zfs/lib/libsolcompat/include/i386/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-subdir-m += sys
diff --git a/zfs/lib/libsolcompat/include/i386/sys/Makefile.in b/zfs/lib/libsolcompat/include/i386/sys/Makefile.in
deleted file mode 100644
index 0466e658f..000000000
--- a/zfs/lib/libsolcompat/include/i386/sys/Makefile.in
+++ /dev/null
@@ -1,2 +0,0 @@
-DISTFILES = asm_linkage.h
-
diff --git a/zfs/lib/libsolcompat/include/ia32/Makefile.in b/zfs/lib/libsolcompat/include/ia32/Makefile.in
deleted file mode 100644
index 6611e4143..000000000
--- a/zfs/lib/libsolcompat/include/ia32/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-subdir-m += sys
diff --git a/zfs/lib/libsolcompat/include/ia32/sys/Makefile.in b/zfs/lib/libsolcompat/include/ia32/sys/Makefile.in
deleted file mode 100644
index 0466e658f..000000000
--- a/zfs/lib/libsolcompat/include/ia32/sys/Makefile.in
+++ /dev/null
@@ -1,2 +0,0 @@
-DISTFILES = asm_linkage.h
-
diff --git a/zfs/lib/libsolcompat/include/rpc/Makefile.in b/zfs/lib/libsolcompat/include/rpc/Makefile.in
deleted file mode 100644
index 93e4aa2e9..000000000
--- a/zfs/lib/libsolcompat/include/rpc/Makefile.in
+++ /dev/null
@@ -1,2 +0,0 @@
-DISTFILES = xdr.h
-
diff --git a/zfs/lib/libsolcompat/include/sparc64/Makefile.in b/zfs/lib/libsolcompat/include/sparc64/Makefile.in
deleted file mode 100644
index 6611e4143..000000000
--- a/zfs/lib/libsolcompat/include/sparc64/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-subdir-m += sys
diff --git a/zfs/lib/libsolcompat/include/sparc64/sys/Makefile.in b/zfs/lib/libsolcompat/include/sparc64/sys/Makefile.in
deleted file mode 100644
index 0466e658f..000000000
--- a/zfs/lib/libsolcompat/include/sparc64/sys/Makefile.in
+++ /dev/null
@@ -1,2 +0,0 @@
-DISTFILES = asm_linkage.h
-
diff --git a/zfs/lib/libsolcompat/include/sys/Makefile.in b/zfs/lib/libsolcompat/include/sys/Makefile.in
deleted file mode 100644
index 0f353b99a..000000000
--- a/zfs/lib/libsolcompat/include/sys/Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
-subdir-m += fm sysevent
-DISTFILES  = acl.h acl_impl.h bitmap.h byteorder.h callb.h cmn_err.h cred.h
-DISTFILES += dkio.h dklabel.h feature_tests.h file.h idmap.h int_limits.h
-DISTFILES += int_types.h inttypes.h isa_defs.h kmem.h kstat.h mkdev.h mntent.h
-DISTFILES += mntio.h mnttab.h modctl.h mount.h note.h param.h priv.h
-DISTFILES += processor.h rctl.h sdt.h stack.h stat.h sunddi.h sysevent.h
-DISTFILES += sysmacros.h time.h trap.h types.h types32.h uio.h utsname.h
-DISTFILES += uuid.h va_list.h varargs.h vmem.h vtoc.h zone.h
diff --git a/zfs/lib/libsolcompat/include/sys/fm/Makefile.in b/zfs/lib/libsolcompat/include/sys/fm/Makefile.in
deleted file mode 100644
index 5b752c687..000000000
--- a/zfs/lib/libsolcompat/include/sys/fm/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-DISTFILES = protocol.h util.h
diff --git a/zfs/lib/libsolcompat/include/sys/sysevent/Makefile.in b/zfs/lib/libsolcompat/include/sys/sysevent/Makefile.in
deleted file mode 100644
index 4938c5659..000000000
--- a/zfs/lib/libsolcompat/include/sys/sysevent/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-DISTFILES = eventdefs.h
diff --git a/zfs/lib/libsolcompat/include/tsol/Makefile.in b/zfs/lib/libsolcompat/include/tsol/Makefile.in
deleted file mode 100644
index 9f5ec08aa..000000000
--- a/zfs/lib/libsolcompat/include/tsol/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-DISTFILES = label.h
diff --git a/zfs/lib/libsolcompat/sparc64/Makefile.in b/zfs/lib/libsolcompat/sparc64/Makefile.in
deleted file mode 100644
index d56b66f9d..000000000
--- a/zfs/lib/libsolcompat/sparc64/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-DISTFILES = atomic.S
diff --git a/zfs/lib/libudmu/Makefile.in b/zfs/lib/libudmu/Makefile.in
deleted file mode 100644
index 9603ee40b..000000000
--- a/zfs/lib/libudmu/Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
-subdir-m += include
-DISTFILES = Makefile.in udmu_util.c udmu.c
-
-LIBRARY := libudmu
-
-# Compile as kernel module unsupported for libudmu.
-
-# Compile as shared library.  There's an extra useless host program
-# here called 'zu' because it was the easiest way I could convince
-# the kernel build system to construct a user space shared library.
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include
-HOSTCFLAGS += -I@LIBDIR@/libport/include
-HOSTCFLAGS += -I@LIBDIR@/libavl/include
-
-hostprogs-y := zu
-always := $(hostprogs-y)
-
-zu-objs := zu.o ${LIBRARY}.so
-
-${LIBRARY}-objs += udmu.o
diff --git a/zfs/lib/libudmu/include/Makefile.in b/zfs/lib/libudmu/include/Makefile.in
deleted file mode 100644
index 0ca214254..000000000
--- a/zfs/lib/libudmu/include/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-DISTFILES = udmu.h udmu_util.h
diff --git a/zfs/lib/libumem/Makefile.in b/zfs/lib/libumem/Makefile.in
deleted file mode 100644
index 008748e7c..000000000
--- a/zfs/lib/libumem/Makefile.in
+++ /dev/null
@@ -1,40 +0,0 @@
-subdir-m += include sys
-DISTFILES  = COPYING COPYRIGHT OPENSOLARIS.LICENSE README README-alpha TODO
-DISTFILES += config.h envvar.c getpcstack.c init_lib.c misc.c misc.h
-DISTFILES += sol_compat.h umem.c umem_agent_support.c umem_base.h
-DISTFILES += umem_fail.c umem_fork.c umem_impl.h umem_update_thread.c
-DISTFILES += vmem.c vmem_base.c vmem_base.h vmem_mmap.c vmem_sbrk.c
-DISTFILES += vmem_stand.h
-
-LIBRARY := libumem
-
-# Compile as shared library.  There's an extra useless host program
-# here called 'zu' because it was the easiest way I could convince
-# the kernel build system to construct a user space shared library.
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@LIBDIR@/libumem
-HOSTCFLAGS += -I@LIBDIR@/libumem/include
-HOSTCFLAGS += -I@LIBDIR@/libumem/sys
-
-HOSTLDFLAGS += -pthread
-HOSTLDFLAGS += -ldl
-
-hostprogs-y := zu
-always := $(hostprogs-y)
-
-zu-objs := zu.o ${LIBRARY}.so
-
-${LIBRARY}-objs += envvar.o
-${LIBRARY}-objs += getpcstack.o
-${LIBRARY}-objs += init_lib.o
-${LIBRARY}-objs += misc.o
-${LIBRARY}-objs += umem.o
-${LIBRARY}-objs += umem_agent_support.o
-${LIBRARY}-objs += umem_fail.o
-${LIBRARY}-objs += umem_fork.o
-${LIBRARY}-objs += umem_update_thread.o
-${LIBRARY}-objs += vmem.o
-${LIBRARY}-objs += vmem_base.o
-${LIBRARY}-objs += vmem_mmap.o
-${LIBRARY}-objs += vmem_sbrk.o
diff --git a/zfs/lib/libumem/include/Makefile.in b/zfs/lib/libumem/include/Makefile.in
deleted file mode 100644
index b16a5d217..000000000
--- a/zfs/lib/libumem/include/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-DISTFILES = umem.h
diff --git a/zfs/lib/libumem/sys/Makefile.in b/zfs/lib/libumem/sys/Makefile.in
deleted file mode 100644
index eed2c3118..000000000
--- a/zfs/lib/libumem/sys/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-DISTFILES = vmem.h vmem_impl_user.h
diff --git a/zfs/lib/libuutil/Makefile.in b/zfs/lib/libuutil/Makefile.in
deleted file mode 100644
index 8931bd850..000000000
--- a/zfs/lib/libuutil/Makefile.in
+++ /dev/null
@@ -1,35 +0,0 @@
-subdir-m += include
-DISTFILES = Makefile.in *.c
-
-LIBRARY := libuutil
-
-# Compile as shared library.  There's an extra useless host program
-# here called 'zu' because it was the easiest way I could convince
-# the kernel build system to construct a user space shared library.
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include
-HOSTCFLAGS += -I@LIBDIR@/libport/include
-HOSTCFLAGS += -I@LIBDIR@/libavl/include
-HOSTCFLAGS += -I@LIBDIR@/libuutil/include
-HOSTCFLAGS += -DNATIVE_BUILD
-
-HOSTLDFLAGS += -pthread
-HOSTLDFLAGS += -lrt
-HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
-HOSTLDFLAGS += -lzport -L@LIBDIR@/libport
-
-hostprogs-y := zu
-always := $(hostprogs-y)
-
-zu-objs := zu.o ${LIBRARY}.so
-
-${LIBRARY}-objs += uu_alloc.o
-${LIBRARY}-objs += uu_avl.o
-${LIBRARY}-objs += uu_dprintf.o
-${LIBRARY}-objs += uu_ident.o
-${LIBRARY}-objs += uu_list.o
-${LIBRARY}-objs += uu_misc.o
-${LIBRARY}-objs += uu_open.o
-${LIBRARY}-objs += uu_pname.o
-${LIBRARY}-objs += uu_strtoint.o
diff --git a/zfs/lib/libuutil/include/Makefile.in b/zfs/lib/libuutil/include/Makefile.in
deleted file mode 100644
index ff0ba1440..000000000
--- a/zfs/lib/libuutil/include/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-DISTFILES = libuutil.h libuutil_common.h libuutil_impl.h
diff --git a/zfs/lib/libzcommon/Makefile.in b/zfs/lib/libzcommon/Makefile.in
deleted file mode 100644
index 7a1929113..000000000
--- a/zfs/lib/libzcommon/Makefile.in
+++ /dev/null
@@ -1,55 +0,0 @@
-subdir-m += include
-DISTFILES  = compress.c list.c zfs_comutil.c zfs_deleg.c zfs_namecheck.c
-DISTFILES += zfs_prop.c zpool_prop.c zprop_common.c
-
-MODULE  := zcommon
-LIBRARY := libzcommon
-
-# Compile as kernel module.  Needed symlinks created for all
-# k* objects created by top level configure script.
-
-EXTRA_CFLAGS  = @KERNELCPPFLAGS@
-EXTRA_CFLAGS += -I@LIBDIR@/libzcommon/include
-EXTRA_CFLAGS += -I@LIBDIR@/libport/include
-EXTRA_CFLAGS += -I@LIBDIR@/libavl/include
-EXTRA_CFLAGS += -I@LIBDIR@/libnvpair/include
-
-obj-m := ${MODULE}.o
-
-${MODULE}-objs += spl.o
-${MODULE}-objs += kzfs_deleg.o
-${MODULE}-objs += kzfs_prop.o
-${MODULE}-objs += kzprop_common.o
-${MODULE}-objs += kcompress.o
-${MODULE}-objs += klist.o
-${MODULE}-objs += kzfs_namecheck.o
-${MODULE}-objs += kzfs_comutil.o
-${MODULE}-objs += kzpool_prop.o
-
-# Compile as shared library.  There's an extra useless host program
-# here called 'zu' because it was the easiest way I could convince
-# the kernel build system to construct a user space shared library.
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@LIBDIR@/libzcommon/include
-HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include
-HOSTCFLAGS += -I@LIBDIR@/libport/include
-HOSTCFLAGS += -I@LIBDIR@/libavl/include
-HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
-HOSTCFLAGS += -I@LIBDIR@/libumem/include
-
-HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
-
-hostprogs-y := zu
-always := $(hostprogs-y)
-
-zu-objs := zu.o ${LIBRARY}.so
-
-${LIBRARY}-objs += zfs_deleg.o
-${LIBRARY}-objs += zfs_prop.o
-${LIBRARY}-objs += zprop_common.o
-${LIBRARY}-objs += compress.o
-${LIBRARY}-objs += list.o
-${LIBRARY}-objs += zfs_namecheck.o
-${LIBRARY}-objs += zfs_comutil.o
-${LIBRARY}-objs += zpool_prop.o
diff --git a/zfs/lib/libzcommon/include/Makefile.in b/zfs/lib/libzcommon/include/Makefile.in
deleted file mode 100644
index 69ab6afa2..000000000
--- a/zfs/lib/libzcommon/include/Makefile.in
+++ /dev/null
@@ -1,2 +0,0 @@
-subdir-m += sys
-DISTFILES = zfs_comutil.h zfs_deleg.h zfs_namecheck.h zfs_prop.h
diff --git a/zfs/lib/libzcommon/include/sys/Makefile.in b/zfs/lib/libzcommon/include/sys/Makefile.in
deleted file mode 100644
index e73a05fce..000000000
--- a/zfs/lib/libzcommon/include/sys/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-subdir-m += fm fs
-
-DISTFILES  = arc.h bplist.h compress.h dbuf.h dmu.h dmu_impl.h
-DISTFILES += dmu_objset.h dmu_traverse.h dmu_tx.h dmu_zfetch.h
-DISTFILES += dnode.h dsl_dataset.h dsl_deleg.h dsl_dir.h dsl_pool.h
-DISTFILES += dsl_prop.h dsl_synctask.h list.h list_impl.h metaslab.h
-DISTFILES += metaslab_impl.h refcount.h rprwlock.h rrwlock.h spa.h
-DISTFILES += spa_boot.h spa_impl.h space_map.h txg.h txg_impl.h uberblock.h
-DISTFILES += uberblock_impl.h unique.h vdev.h vdev_disk.h vdev_file.h
-DISTFILES += vdev_impl.h zap.h zap_impl.h zap_leaf.h zfs_acl.h
-DISTFILES += zfs_context.h zfs_context_user.h zfs_ctldir.h zfs_debug.h
-DISTFILES += zfs_dir.h zfs_fuid.h zfs_i18n.h zfs_ioctl.h zfs_rlock.h
-DISTFILES += zfs_vfsops.h zfs_znode.h zil.h zil_impl.h zio.h
-DISTFILES += zio_checksum.h zio_compress.h zio_impl.h zvol.h
diff --git a/zfs/lib/libzcommon/include/sys/fm/Makefile.in b/zfs/lib/libzcommon/include/sys/fm/Makefile.in
deleted file mode 100644
index 0a4dc0223..000000000
--- a/zfs/lib/libzcommon/include/sys/fm/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-subdir-m += fs
diff --git a/zfs/lib/libzcommon/include/sys/fm/fs/Makefile.in b/zfs/lib/libzcommon/include/sys/fm/fs/Makefile.in
deleted file mode 100644
index cbfbe3c67..000000000
--- a/zfs/lib/libzcommon/include/sys/fm/fs/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-DISTFILES = zfs.h
diff --git a/zfs/lib/libzcommon/include/sys/fs/Makefile.in b/zfs/lib/libzcommon/include/sys/fs/Makefile.in
deleted file mode 100644
index cbfbe3c67..000000000
--- a/zfs/lib/libzcommon/include/sys/fs/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-DISTFILES = zfs.h
diff --git a/zfs/lib/libzfs/Makefile.in b/zfs/lib/libzfs/Makefile.in
deleted file mode 100644
index 4718bed00..000000000
--- a/zfs/lib/libzfs/Makefile.in
+++ /dev/null
@@ -1,46 +0,0 @@
-subdir-m += include
-DISTFILES  = libzfs_changelist.c libzfs_config.c libzfs_dataset.c
-DISTFILES += libzfs_graph.c libzfs_import.c libzfs_mount.c libzfs_pool.c
-DISTFILES += libzfs_sendrecv.c libzfs_status.c libzfs_util.c
-
-LIBRARY := libzfs
-
-# Compile as shared library.  There's an extra useless host program
-# here called 'zu' because it was the easiest way I could convince
-# the kernel build system to construct a user space shared library.
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@LIBDIR@/libzfs/include
-HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include
-HOSTCFLAGS += -I@LIBDIR@/libport/include
-HOSTCFLAGS += -I@LIBDIR@/libumem/include
-HOSTCFLAGS += -I@LIBDIR@/libuutil/include
-HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
-HOSTCFLAGS += -I@LIBDIR@/libavl/include
-HOSTCFLAGS += -I@LIBDIR@/libzcommon/include
-HOSTCFLAGS += -I@LIBDIR@/libdmu-ctl/include
-HOSTCFLAGS += -I@LIBDIR@/libzpool	# For existing fletcher.c hack
-
-HOSTLDFLAGS += -ldl -lm
-HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
-HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
-HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
-HOSTLDFLAGS += -lzport -L@LIBDIR@/libport
-HOSTLDFLAGS += -lsolcompat -L@LIBDIR@/libsolcompat
-HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
-
-hostprogs-y := zu
-always := $(hostprogs-y)
-
-zu-objs := zu.o ${LIBRARY}.so
-
-${LIBRARY}-objs += libzfs_dataset.o	# Interface for manipulating datasets
-${LIBRARY}-objs += libzfs_pool.o	# Interface for manipulating pools
-${LIBRARY}-objs += libzfs_changelist.o	# Support for property changes
-${LIBRARY}-objs += libzfs_config.o	# Interface for manipulating configuration
-${LIBRARY}-objs += libzfs_graph.o	# Support for dependent list for datasets
-${LIBRARY}-objs += libzfs_import.o	# Discover and import pools
-${LIBRARY}-objs += libzfs_mount.o	# Mount, unmount, and share datasets
-${LIBRARY}-objs += libzfs_status.o	# Status
-${LIBRARY}-objs += libzfs_util.o	# Misc support
-${LIBRARY}-objs += libzfs_sendrecv.o
diff --git a/zfs/lib/libzfs/include/Makefile.in b/zfs/lib/libzfs/include/Makefile.in
deleted file mode 100644
index 23c0b471f..000000000
--- a/zfs/lib/libzfs/include/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-DISTFILES = libzfs.h libzfs_impl.h
diff --git a/zfs/lib/libzpool/Makefile.in b/zfs/lib/libzpool/Makefile.in
deleted file mode 100644
index 440fd1cbc..000000000
--- a/zfs/lib/libzpool/Makefile.in
+++ /dev/null
@@ -1,102 +0,0 @@
-# NOTE: kernel.c, taskq.c, util.c unused by kernel port.
-# Potentially they should just be removed if we don't care
-# able user space lustre intergration from this source base.
-
-DISTFILES  = arc.c bplist.c dbuf.c dmu.c dmu_object.c dmu_objset.c
-DISTFILES += dmu_traverse.c dmu_tx.c dmu_zfetch.c dnode.c dnode_sync.c
-DISTFILES += dsl_dataset.c dsl_deleg.c dsl_dir.c dsl_pool.c dsl_prop.c
-DISTFILES += dsl_synctask.c fletcher.c gzip.c kernel.c lzjb.c metaslab.c
-DISTFILES += refcount.c sha256.c spa.c spa_boot.c spa_config.c spa_errlog.c
-DISTFILES += spa_history.c spa_misc.c space_map.c taskq.c txg.c uberblock.c
-DISTFILES += unique.c util.c vdev.c vdev_cache.c vdev_disk.c vdev_missing.c
-DISTFILES += vdev_file.c vdev_label.c vdev_mirror.c vdev_queue.c vdev_raidz.c
-DISTFILES += vdev_root.c zap.c zap_leaf.c zap_micro.c zfs_byteswap.c zfs_fm.c
-DISTFILES += zfs_znode.c zil.c zio.c zio_checksum.c zio_compress.c zio_inject.c
-
-MODULE := zpool
-
-EXTRA_CFLAGS  = @KERNELCPPFLAGS@
-EXTRA_CFLAGS += -I@LIBDIR@/libzcommon/include
-EXTRA_CFLAGS += -I@LIBDIR@/libport/include
-EXTRA_CFLAGS += -I@LIBDIR@/libavl/include
-EXTRA_CFLAGS += -I@LIBDIR@/libnvpair/include
-
-obj-m := ${MODULE}.o
-
-# DMU (Data Management Unit)
-${MODULE}-objs += dmu.o		# Interfaces dmu core
-${MODULE}-objs += dmu_objset.o	# Interfaces dmu objset open/close/manipulate
-${MODULE}-objs += dmu_object.o	# Interfaces dmu alloc/free
-${MODULE}-objs += txg.o		# Transaction model control threads
-${MODULE}-objs += dmu_tx.o	# Interfaces dmu transaction create/manipulate
-${MODULE}-objs += dnode.o	# Open context object-level support
-${MODULE}-objs += dnode_sync.o	# Syncing context object-level support
-${MODULE}-objs += dbuf.o	# Buffer management support
-${MODULE}-objs += dmu_zfetch.o	# Data stream prefetch logic
-${MODULE}-objs += refcount.o	# Generic refcount support
-#${MODULE}-objs += dmu_send.o	# XXX missing: Snapshot send/received support
-
-# DSL (Dataset and Snapshot Layer)
-${MODULE}-objs += dsl_dir.o	# Namespace and management support
-${MODULE}-objs += dsl_dataset.o	# Interfaces snapshot/rollback/clone
-${MODULE}-objs += dsl_pool.o	# Pool-level support
-${MODULE}-objs += dsl_prop.o	# Property manipulation support
-${MODULE}-objs += dsl_deleg.o	# XXX: ?
-${MODULE}-objs += dsl_synctask.o# XXX: ?
-${MODULE}-objs += unique.o	# Unique objset ID support
-
-# ZAP (ZFS Attribute Processor)
-${MODULE}-objs += zap.o		# Interfaces (fat)
-${MODULE}-objs += zap_leaf.o	# Low-level support
-${MODULE}-objs += zap_micro.o	# Interfaces (micro)
-
-# ZIL (ZFS Intent Log)
-${MODULE}-objs += zil.o		# Intent log
-
-# ARC (Adaptive Replacement Cache)
-${MODULE}-objs += arc.o		# Adaptive replacement cache
-
-# SPA (Storage Pool Allocator)
-${MODULE}-objs += spa.o		# Open/import/export/destroy support
-${MODULE}-objs += spa_misc.o	# Misc support (includes locking)
-${MODULE}-objs += spa_config.o	# Parse and update pool config data
-${MODULE}-objs += spa_errlog.o	# Log of persistent pool-wide data errors
-${MODULE}-objs += spa_history.o	# Command history support
-${MODULE}-objs += spa_boot.o	# Bootable root partitions
-${MODULE}-objs += zfs_fm.o	# Post reports of FMA consumption support
-
-# ZIO (ZFS I/O Pipeline)
-${MODULE}-objs += zio.o		# Interfaces zio core
-${MODULE}-objs += zio_checksum.o# Generic checksum interface
-${MODULE}-objs += fletcher.o	# Fletcher 2 and 4 checksum algorithms
-${MODULE}-objs += sha256.o	# SHA256 checksum algorithms
-${MODULE}-objs += zio_compress.o# Generic compression interface
-${MODULE}-objs += lzjb.o	# LZJB compression algorithm
-${MODULE}-objs += gzip.o	# GZIP compression algorithm
-${MODULE}-objs += uberblock.o	# Basic uberblock routines
-${MODULE}-objs += bplist.o	# Keeps track of list of block pointers
-${MODULE}-objs += metaslab.o	# Bulk of DVA translation
-${MODULE}-objs += space_map.o	# Keeps track of free space
-${MODULE}-objs += zio_inject.o	# Framework for persistent error injection
-
-# VDEV (Virtual Devices)
-${MODULE}-objs += vdev.o	# Interfaces vdev code
-${MODULE}-objs += vdev_disk.o	# Disk virtual device
-${MODULE}-objs += vdev_file.o	# File virtual device
-${MODULE}-objs += vdev_mirror.o	# N-Way mirroring
-${MODULE}-objs += vdev_raidz.o	# RAID-Z grouping
-${MODULE}-objs += vdev_root.o	# Top-level pseudo vdev
-${MODULE}-objs += vdev_missing.o# Special device for import
-${MODULE}-objs += vdev_label.o	# Read/write indentifying label support
-${MODULE}-objs += vdev_cache.o	# Simple device-level caching for reads
-${MODULE}-objs += vdev_queue.o	# I/O scheduling algorithm for vdevs
-
-# ZPL (ZFS Posix Layer)
-${MODULE}-objs += zfs_byteswap.o# Byteswap support for ZPL
-${MODULE}-objs += zfs_znode.o	# Vnode to znode mapping
-
-# Traversal
-${MODULE}-objs += dmu_traverse.o# Traversal code
-
-# SPL (Solaris Porting Layer)
-${MODULE}-objs += spl.o		# Linux kernel glue and misc support
diff --git a/zfs/zcmd/Makefile.in b/zfs/zcmd/Makefile.in
deleted file mode 100644
index 23720a5c7..000000000
--- a/zfs/zcmd/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-subdir-m += zfs
-subdir-m += zpool
-#subdir-m += zdb
-#subdir-m += ztest
-#subdir-m += zdump
-#subdir-m += zinject
diff --git a/zfs/zcmd/zdb/Makefile.in b/zfs/zcmd/zdb/Makefile.in
deleted file mode 100644
index 119b29767..000000000
--- a/zfs/zcmd/zdb/Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
-DISTFILES = Makefile.in zdb.c zdb_il.c
-
-CMD := zdb
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@CMDDIR@/zdb/
-HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include
-HOSTCFLAGS += -I@LIBDIR@/libport/include
-HOSTCFLAGS += -I@LIBDIR@/libavl/include
-HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
-HOSTCFLAGS += -I@LIBDIR@/libumem/include
-HOSTCFLAGS += -I@LIBDIR@/libuutil/include
-HOSTCFLAGS += -I@LIBDIR@/libzcommon/include
-HOSTCFLAGS += -I@LIBDIR@/libzfs/include
-
-HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
-HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
-HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem
-HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
-HOSTLDFLAGS += -lzport -L@LIBDIR@/libport
-HOSTLDFLAGS += -lsolcompat -L@LIBDIR@/libsolcompat
-HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
-HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs
-
-# Additional shared library paths for executing binaries in-tree
-export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libumem:@LIBDIR@/libuutil:@LIBDIR@/libport:@LIBDIR@/libsolcompat:@LIBDIR@/libzcommon:@LIBDIR@/libzfs
-
-hostprogs-y := ${CMD}
-always := $(hostprogs-y)
-
-${CMD}-objs += zdb_il.o
-${CMD}-objs += zdb.o		# Core command
diff --git a/zfs/zcmd/zdump/Makefile.in b/zfs/zcmd/zdump/Makefile.in
deleted file mode 100644
index e9662462c..000000000
--- a/zfs/zcmd/zdump/Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
-DISTFILES = Makefile.in zdump.c
-
-CMD := zdump
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@CMDDIR@/zdump/
-HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include
-HOSTCFLAGS += -I@LIBDIR@/libport/include
-HOSTCFLAGS += -I@LIBDIR@/libavl/include
-HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
-HOSTCFLAGS += -I@LIBDIR@/libumem/include
-HOSTCFLAGS += -I@LIBDIR@/libuutil/include
-HOSTCFLAGS += -I@LIBDIR@/libzcommon/include
-HOSTCFLAGS += -I@LIBDIR@/libzfs/include
-
-HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
-HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
-HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem
-HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
-HOSTLDFLAGS += -lzport -L@LIBDIR@/libport
-HOSTLDFLAGS += -lsolcompat -L@LIBDIR@/libsolcompat
-HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
-HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs
-
-# Additional shared library paths for executing binaries in-tree
-export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libumem:@LIBDIR@/libuutil:@LIBDIR@/libport:@LIBDIR@/libsolcompat:@LIBDIR@/libzcommon:@LIBDIR@/libzfs
-
-hostprogs-y := ${CMD}
-always := $(hostprogs-y)
-
-${CMD}-objs += zdump.o		# Arg processing
diff --git a/zfs/zcmd/zfs/Makefile.in b/zfs/zcmd/zfs/Makefile.in
deleted file mode 100644
index 2d07982fb..000000000
--- a/zfs/zcmd/zfs/Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
-DISTFILES = Makefile.in zfs_iter.c zfs_main.c zfs_util.h zfs_iter.h
-
-CMD := zfs
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@CMDDIR@/zpool/
-HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include
-HOSTCFLAGS += -I@LIBDIR@/libport/include
-HOSTCFLAGS += -I@LIBDIR@/libavl/include
-HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
-HOSTCFLAGS += -I@LIBDIR@/libumem/include
-HOSTCFLAGS += -I@LIBDIR@/libuutil/include
-HOSTCFLAGS += -I@LIBDIR@/libzcommon/include
-HOSTCFLAGS += -I@LIBDIR@/libzfs/include
-
-HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
-HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
-HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem
-HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
-HOSTLDFLAGS += -lzport -L@LIBDIR@/libport
-HOSTLDFLAGS += -lsolcompat -L@LIBDIR@/libsolcompat
-HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
-HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs
-
-# Additional shared library paths for executing binaries in-tree
-export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libumem:@LIBDIR@/libuutil:@LIBDIR@/libport:@LIBDIR@/libsolcompat:@LIBDIR@/libzcommon:@LIBDIR@/libzfs
-
-hostprogs-y := ${CMD}
-always := $(hostprogs-y)
-
-${CMD}-objs += zfs_main.o	# Arg processing
-${CMD}-objs += zfs_iter.o	# Iterator support
diff --git a/zfs/zcmd/zinject/Makefile.in b/zfs/zcmd/zinject/Makefile.in
deleted file mode 100644
index 6ff89ac01..000000000
--- a/zfs/zcmd/zinject/Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
-DISTFILES = Makefile.in translate.c zinject.c zinject.h
-
-CMD := zinject
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@CMDDIR@/zinject/
-HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include
-HOSTCFLAGS += -I@LIBDIR@/libport/include
-HOSTCFLAGS += -I@LIBDIR@/libavl/include
-HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
-HOSTCFLAGS += -I@LIBDIR@/libumem/include
-HOSTCFLAGS += -I@LIBDIR@/libuutil/include
-HOSTCFLAGS += -I@LIBDIR@/libzcommon/include
-HOSTCFLAGS += -I@LIBDIR@/libzfs/include
-
-HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
-HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
-HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem
-HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
-HOSTLDFLAGS += -lzport -L@LIBDIR@/libport
-HOSTLDFLAGS += -lsolcompat -L@LIBDIR@/libsolcompat
-HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
-HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs
-
-# Additional shared library paths for executing binaries in-tree
-export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libumem:@LIBDIR@/libuutil:@LIBDIR@/libport:@LIBDIR@/libsolcompat:@LIBDIR@/libzcommon:@LIBDIR@/libzfs
-
-hostprogs-y := ${CMD}
-always := $(hostprogs-y)
-
-${CMD}-objs += translate.o	# Translation support
-${CMD}-objs += zinject.o	# Core command
diff --git a/zfs/zcmd/zpool/Makefile.in b/zfs/zcmd/zpool/Makefile.in
deleted file mode 100644
index c91593300..000000000
--- a/zfs/zcmd/zpool/Makefile.in
+++ /dev/null
@@ -1,34 +0,0 @@
-DISTFILES = Makefile.in zpool_main.c zpool_iter.c zpool_util.c zpool_vdev.c zpool_util.h
-
-CMD := zpool
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@CMDDIR@/zpool/
-HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include
-HOSTCFLAGS += -I@LIBDIR@/libport/include
-HOSTCFLAGS += -I@LIBDIR@/libavl/include
-HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
-HOSTCFLAGS += -I@LIBDIR@/libumem/include
-HOSTCFLAGS += -I@LIBDIR@/libuutil/include
-HOSTCFLAGS += -I@LIBDIR@/libzcommon/include
-HOSTCFLAGS += -I@LIBDIR@/libzfs/include
-
-HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
-HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
-HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem
-HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
-HOSTLDFLAGS += -lzport -L@LIBDIR@/libport
-HOSTLDFLAGS += -lsolcompat -L@LIBDIR@/libsolcompat
-HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
-HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs
-
-# Additional shared library paths for executing binaries in-tree
-export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libumem:@LIBDIR@/libuutil:@LIBDIR@/libport:@LIBDIR@/libsolcompat:@LIBDIR@/libzcommon:@LIBDIR@/libzfs
-
-hostprogs-y := ${CMD}
-always := $(hostprogs-y)
-
-${CMD}-objs += zpool_main.o	# Arg processing
-${CMD}-objs += zpool_iter.o	# Iterator support
-${CMD}-objs += zpool_util.o	# Misc support
-${CMD}-objs += zpool_vdev.o	# Converts vdevs to nvlists for libzfs
diff --git a/zfs/zcmd/ztest/Makefile.in b/zfs/zcmd/ztest/Makefile.in
deleted file mode 100644
index af0719f61..000000000
--- a/zfs/zcmd/ztest/Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
-DISTFILES = Makefile.in ztest.c
-
-CMD := ztest
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@CMDDIR@/ztest/
-HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include
-HOSTCFLAGS += -I@LIBDIR@/libport/include
-HOSTCFLAGS += -I@LIBDIR@/libavl/include
-HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
-HOSTCFLAGS += -I@LIBDIR@/libumem/include
-HOSTCFLAGS += -I@LIBDIR@/libuutil/include
-HOSTCFLAGS += -I@LIBDIR@/libzcommon/include
-HOSTCFLAGS += -I@LIBDIR@/libzfs/include
-
-HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
-HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
-HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem
-HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
-HOSTLDFLAGS += -lzport -L@LIBDIR@/libport
-HOSTLDFLAGS += -lsolcompat -L@LIBDIR@/libsolcompat
-HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
-HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs
-
-# Additional shared library paths for executing binaries in-tree
-export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libumem:@LIBDIR@/libuutil:@LIBDIR@/libport:@LIBDIR@/libsolcompat:@LIBDIR@/libzcommon:@LIBDIR@/libzfs
-
-hostprogs-y := ${CMD}
-always := $(hostprogs-y)
-
-${CMD}-objs += ztest.o	# Core command
-