Fixes for make dist

Reduce the usage of EXTRA_DIST. If files are conditionally included in
_SOURCES, _HEADERS etc, automake is smart enough to dist all files that
could possibly be included, but this does not apply to EXTRA_DIST,
resulting in make dist depending on the configuration.

Add some files that were missing altogether in various Makefile's.

The changes to disted files in this commit (excluding deleted files):

+./cmd/zed/agents/README.md
+./etc/init.d/README.md
+./lib/libspl/os/freebsd/getexecname.c
+./lib/libspl/os/freebsd/gethostid.c
+./lib/libspl/os/freebsd/getmntany.c
+./lib/libspl/os/freebsd/mnttab.c
-./lib/libzfs/libzfs_core.pc
-./lib/libzfs/libzfs.pc
+./lib/libzfs/os/freebsd/libzfs_compat.c
+./lib/libzfs/os/freebsd/libzfs_fsshare.c
+./lib/libzfs/os/freebsd/libzfs_ioctl_compat.c
+./lib/libzfs/os/freebsd/libzfs_zmount.c
+./lib/libzutil/os/freebsd/zutil_compat.c
+./lib/libzutil/os/freebsd/zutil_device_path_os.c
+./lib/libzutil/os/freebsd/zutil_import_os.c
+./module/lua/README.zfs
+./module/os/linux/spl/README.md
+./tests/README.md
+./tests/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_rm_nested.ksh
+./tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_encrypted_unloaded.ksh
+./tests/zfs-tests/tests/functional/inheritance/README.config
+./tests/zfs-tests/tests/functional/inheritance/README.state
+./tests/zfs-tests/tests/functional/rsend/rsend_016_neg.ksh
+./tests/zfs-tests/tests/perf/fio/sequential_readwrite.fio

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Arvind Sankar <[email protected]>
Closes #10501

16 files changed, 17 insertions, 93 deletions

diff --git a/lib/libavl/Makefile.am b/lib/libavl/Makefile.am
index 618cef1e1..6087b1d2f 100644
--- a/lib/libavl/Makefile.am
+++ b/lib/libavl/Makefile.am
@@ -7,13 +7,8 @@ AM_CFLAGS += $(FRAME_LARGER_THAN)
 
 noinst_LTLIBRARIES = libavl.la
 
-USER_C =
-
 KERNEL_C = \
 	avl.c
 
 nodist_libavl_la_SOURCES = \
-	$(USER_C) \
 	$(KERNEL_C)
-
-EXTRA_DIST = $(USER_C)
diff --git a/lib/libefi/Makefile.am b/lib/libefi/Makefile.am
index 73c817192..0ca04df46 100644
--- a/lib/libefi/Makefile.am
+++ b/lib/libefi/Makefile.am
@@ -5,8 +5,6 @@ noinst_LTLIBRARIES = libefi.la
 USER_C = \
 	rdwr_efi.c
 
-nodist_libefi_la_SOURCES = $(USER_C)
+libefi_la_SOURCES = $(USER_C)
 
 libefi_la_LIBADD = $(LIBUUID)
-
-EXTRA_DIST = $(USER_C)
diff --git a/lib/libnvpair/Makefile.am b/lib/libnvpair/Makefile.am
index 984ca520c..af99c84b7 100644
--- a/lib/libnvpair/Makefile.am
+++ b/lib/libnvpair/Makefile.am
@@ -20,8 +20,10 @@ KERNEL_C = \
 	nvpair.c \
 	fnvpair.c
 
+dist_libnvpair_la_SOURCES = \
+	$(USER_C)
+
 nodist_libnvpair_la_SOURCES = \
-	$(USER_C) \
 	$(KERNEL_C)
 
 if BUILD_FREEBSD
@@ -31,7 +33,3 @@ else
 libnvpair_la_LIBADD = $(LIBTIRPC_LIBS)
 libnvpair_la_LDFLAGS = -version-info 1:1:0
 endif
-
-
-
-EXTRA_DIST = $(USER_C)
diff --git a/lib/libshare/Makefile.am b/lib/libshare/Makefile.am
index b082d992b..1504644c0 100644
--- a/lib/libshare/Makefile.am
+++ b/lib/libshare/Makefile.am
@@ -10,6 +10,4 @@ USER_C = \
 	smb.c \
 	smb.h
 
-nodist_libshare_la_SOURCES = $(USER_C)
-
-EXTRA_DIST = $(USER_C)
+libshare_la_SOURCES = $(USER_C)
diff --git a/lib/libspl/Makefile.am b/lib/libspl/Makefile.am
index e11b165d7..b3d9ee79c 100644
--- a/lib/libspl/Makefile.am
+++ b/lib/libspl/Makefile.am
@@ -11,7 +11,6 @@ endif
 endif
 
 SUBDIRS = include
-DIST_SUBDIRS = include asm-generic asm-i386 asm-x86_64
 
 AM_CFLAGS += $(LIBTIRPC_CFLAGS)
 
@@ -46,10 +45,8 @@ USER_C += \
 	os/freebsd/mnttab.c
 endif
 
-nodist_libspl_la_SOURCES = \
+libspl_la_SOURCES = \
 	$(USER_C) \
 	$(TARGET_CPU_ATOMIC_SOURCE)
 
 libspl_la_LIBADD = -lrt $(LIBTIRPC_LIBS)
-
-EXTRA_DIST = $(USER_C)
diff --git a/lib/libspl/asm-generic/Makefile.am b/lib/libspl/asm-generic/Makefile.am
deleted file mode 100644
index 1d5e224b1..000000000
--- a/lib/libspl/asm-generic/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = atomic.c
diff --git a/lib/libspl/asm-i386/Makefile.am b/lib/libspl/asm-i386/Makefile.am
deleted file mode 100644
index e954ec401..000000000
--- a/lib/libspl/asm-i386/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = atomic.S
diff --git a/lib/libspl/asm-x86_64/Makefile.am b/lib/libspl/asm-x86_64/Makefile.am
deleted file mode 100644
index e954ec401..000000000
--- a/lib/libspl/asm-x86_64/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = atomic.S
diff --git a/lib/libtpool/Makefile.am b/lib/libtpool/Makefile.am
index 773469947..818f49ce4 100644
--- a/lib/libtpool/Makefile.am
+++ b/lib/libtpool/Makefile.am
@@ -6,11 +6,9 @@ USER_C = \
 	thread_pool.c \
 	thread_pool_impl.h
 
-nodist_libtpool_la_SOURCES = $(USER_C)
+libtpool_la_SOURCES = $(USER_C)
 
 libtpool_la_LIBADD = \
 	$(top_builddir)/lib/libspl/libspl.la
 
 libtpool_la_LDFLAGS = -pthread
-
-EXTRA_DIST = $(USER_C)
diff --git a/lib/libunicode/Makefile.am b/lib/libunicode/Makefile.am
index ea9439d13..fa9dd359d 100644
--- a/lib/libunicode/Makefile.am
+++ b/lib/libunicode/Makefile.am
@@ -7,14 +7,9 @@ AM_CFLAGS += $(FRAME_LARGER_THAN)
 
 noinst_LTLIBRARIES = libunicode.la
 
-USER_C =
-
 KERNEL_C = \
 	u8_textprep.c \
 	uconv.c
 
 nodist_libunicode_la_SOURCES = \
-	$(USER_C) \
 	$(KERNEL_C)
-
-EXTRA_DIST = $(USER_C)
diff --git a/lib/libuutil/Makefile.am b/lib/libuutil/Makefile.am
index 9eb81f090..37f2eb65b 100644
--- a/lib/libuutil/Makefile.am
+++ b/lib/libuutil/Makefile.am
@@ -13,7 +13,7 @@ USER_C = \
 	uu_pname.c \
 	uu_string.c
 
-nodist_libuutil_la_SOURCES = $(USER_C)
+libuutil_la_SOURCES = $(USER_C)
 
 libuutil_la_LIBADD = \
 	$(top_builddir)/lib/libavl/libavl.la \
@@ -24,5 +24,3 @@ libuutil_la_LDFLAGS = -pthread -version-info 3:0:0
 else
 libuutil_la_LDFLAGS = -pthread -version-info 1:1:0
 endif
-
-EXTRA_DIST = $(USER_C)
diff --git a/lib/libzfs/Makefile.am b/lib/libzfs/Makefile.am
index 0e1e0a53e..efdac5ea1 100644
--- a/lib/libzfs/Makefile.am
+++ b/lib/libzfs/Makefile.am
@@ -63,8 +63,10 @@ KERNEL_C = \
 	zpool_prop.c \
 	zprop_common.c
 
+dist_libzfs_la_SOURCES = \
+	$(USER_C)
+
 nodist_libzfs_la_SOURCES = \
-	$(USER_C) \
 	$(KERNEL_C)
 
 libzfs_la_LIBADD = \
@@ -87,7 +89,5 @@ endif
 
 libzfs_la_LIBADD += -lm $(LIBSSL)
 
-EXTRA_DIST = $(libzfs_pc_DATA) $(USER_C)
-
 # Licensing data
-EXTRA_DIST += THIRDPARTYLICENSE.openssl THIRDPARTYLICENSE.openssl.descrip
+EXTRA_DIST = THIRDPARTYLICENSE.openssl THIRDPARTYLICENSE.openssl.descrip
diff --git a/lib/libzfs_core/Makefile.am b/lib/libzfs_core/Makefile.am
index 617b1cf32..69ddabd88 100644
--- a/lib/libzfs_core/Makefile.am
+++ b/lib/libzfs_core/Makefile.am
@@ -5,7 +5,7 @@ lib_LTLIBRARIES = libzfs_core.la
 USER_C = \
 	libzfs_core.c
 
-nodist_libzfs_core_la_SOURCES = $(USER_C)
+libzfs_core_la_SOURCES = $(USER_C)
 
 libzfs_core_la_LIBADD = \
 	$(top_builddir)/lib/libnvpair/libnvpair.la \
@@ -18,4 +18,3 @@ libzfs_core_la_LIBADD += -lutil -lgeom
 else
 libzfs_core_la_LDFLAGS = -version-info 1:0:0
 endif
-EXTRA_DIST = $(USER_C)
diff --git a/lib/libzfs_core/libzfs_core_compat.h b/lib/libzfs_core/libzfs_core_compat.h
deleted file mode 100644
index 6527c4b25..000000000
--- a/lib/libzfs_core/libzfs_core_compat.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (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
- */
-
-/*
- * Copyright (c) 2013 by Martin Matuska <[email protected]>. All rights reserved.
- */
-
-#ifndef	_LIBZFS_CORE_COMPAT_H
-#define	_LIBZFS_CORE_COMPAT_H
-
-#include <libnvpair.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/fs/zfs.h>
-#include <sys/zfs_ioctl.h>
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-int lzc_compat_pre(zfs_cmd_t *, zfs_ioc_t *, nvlist_t **);
-void lzc_compat_post(zfs_cmd_t *, const zfs_ioc_t);
-int lzc_compat_outnvl(zfs_cmd_t *, const zfs_ioc_t, nvlist_t **);
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* _LIBZFS_CORE_COMPAT_H */
diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am
index 0e6a1058e..46befa7d4 100644
--- a/lib/libzpool/Makefile.am
+++ b/lib/libzpool/Makefile.am
@@ -189,8 +189,10 @@ LUA_C = \
 	lvm.c \
 	lzio.c
 
+dist_libzpool_la_SOURCES = \
+	$(USER_C)
+
 nodist_libzpool_la_SOURCES = \
-	$(USER_C) \
 	$(KERNEL_C) \
 	$(LUA_C)
 
@@ -208,8 +210,6 @@ libzpool_la_LIBADD += $(ZLIB) -ldl
 libzpool_la_LDFLAGS = -pthread -version-info 2:0:0
 endif
 
-EXTRA_DIST = $(USER_C)
-
 if TARGET_CPU_POWERPC
 vdev_raidz_math_powerpc_altivec.$(OBJEXT): CFLAGS += -maltivec
 vdev_raidz_math_powerpc_altivec.l$(OBJEXT): CFLAGS += -maltivec
diff --git a/lib/libzutil/Makefile.am b/lib/libzutil/Makefile.am
index a41a765f0..c11da9e9d 100644
--- a/lib/libzutil/Makefile.am
+++ b/lib/libzutil/Makefile.am
@@ -28,7 +28,7 @@ USER_C += \
 	os/freebsd/zutil_compat.c
 endif
 
-nodist_libzutil_la_SOURCES = $(USER_C)
+libzutil_la_SOURCES = $(USER_C)
 
 libzutil_la_LIBADD = \
 	$(top_builddir)/lib/libavl/libavl.la \
@@ -40,5 +40,3 @@ libzutil_la_LIBADD += \
 endif
 
 libzutil_la_LIBADD += -lm $(LIBBLKID) $(LIBUDEV)
-
-EXTRA_DIST = $(USER_C)