From 6b99fc0620f00fcfd201595b2bc6d279031dcb09 Mon Sep 17 00:00:00 2001 From: Arvind Sankar Date: Thu, 25 Jun 2020 14:14:54 -0400 Subject: 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 Signed-off-by: Arvind Sankar Closes #10501 --- include/sys/lua/Makefile.am | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'include/sys/lua') diff --git a/include/sys/lua/Makefile.am b/include/sys/lua/Makefile.am index 85f7c74e0..e9d1185a4 100644 --- a/include/sys/lua/Makefile.am +++ b/include/sys/lua/Makefile.am @@ -4,18 +4,12 @@ COMMON_H = \ lualib.h \ lauxlib.h -KERNEL_H = - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - if CONFIG_USER libzfsdir = $(includedir)/libzfs/sys/lua -libzfs_HEADERS = $(COMMON_H) $(USER_H) +libzfs_HEADERS = $(COMMON_H) endif if CONFIG_KERNEL kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/lua -kernel_HEADERS = $(COMMON_H) $(KERNEL_H) +kernel_HEADERS = $(COMMON_H) endif -- cgit v1.2.3