diff options
author | Arvind Sankar <nivedita@alum.mit.edu> | 2020-06-25 14:14:54 -0400 |
---|---|---|
committer | Brian Behlendorf <behlendorf1@llnl.gov> | 2020-06-26 14:20:02 -0700 |
commit | 6b99fc0620f00fcfd201595b2bc6d279031dcb09 (patch) | |
tree | cc5149529e1148acaae62dc46b47b39c5090439e /include/sys | |
parent | 7c902a5178496f1321ecb9f33df743a77278089e (diff) |
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 <behlendorf1@llnl.gov>
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Closes #10501
Diffstat (limited to 'include/sys')
-rw-r--r-- | include/sys/Makefile.am | 6 | ||||
-rw-r--r-- | include/sys/crypto/Makefile.am | 10 | ||||
-rw-r--r-- | include/sys/fm/Makefile.am | 10 | ||||
-rw-r--r-- | include/sys/fm/fs/Makefile.am | 10 | ||||
-rw-r--r-- | include/sys/fs/Makefile.am | 10 | ||||
-rw-r--r-- | include/sys/lua/Makefile.am | 10 | ||||
-rw-r--r-- | include/sys/sysevent/Makefile.am | 10 |
7 files changed, 13 insertions, 53 deletions
diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am index f559f188e..3d7bd191b 100644 --- a/include/sys/Makefile.am +++ b/include/sys/Makefile.am @@ -133,13 +133,9 @@ KERNEL_H = \ zvol.h \ zvol_impl.h -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - if CONFIG_USER libzfsdir = $(includedir)/libzfs/sys -libzfs_HEADERS = $(COMMON_H) $(USER_H) +libzfs_HEADERS = $(COMMON_H) endif if CONFIG_KERNEL diff --git a/include/sys/crypto/Makefile.am b/include/sys/crypto/Makefile.am index 60dc3e137..79a5adfae 100644 --- a/include/sys/crypto/Makefile.am +++ b/include/sys/crypto/Makefile.am @@ -3,18 +3,12 @@ COMMON_H = \ common.h \ icp.h -KERNEL_H = - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - if CONFIG_USER libzfsdir = $(includedir)/libzfs/sys/crypto -libzfs_HEADERS = $(COMMON_H) $(USER_H) +libzfs_HEADERS = $(COMMON_H) endif if CONFIG_KERNEL kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/crypto -kernel_HEADERS = $(COMMON_H) $(KERNEL_H) +kernel_HEADERS = $(COMMON_H) endif diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am index 718f23fb0..fd735e187 100644 --- a/include/sys/fm/Makefile.am +++ b/include/sys/fm/Makefile.am @@ -4,18 +4,12 @@ COMMON_H = \ protocol.h \ util.h -KERNEL_H = - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - if CONFIG_USER libzfsdir = $(includedir)/libzfs/sys/fm -libzfs_HEADERS = $(COMMON_H) $(USER_H) +libzfs_HEADERS = $(COMMON_H) endif if CONFIG_KERNEL kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm -kernel_HEADERS = $(COMMON_H) $(KERNEL_H) +kernel_HEADERS = $(COMMON_H) endif diff --git a/include/sys/fm/fs/Makefile.am b/include/sys/fm/fs/Makefile.am index d9adcd1fe..7f33a1532 100644 --- a/include/sys/fm/fs/Makefile.am +++ b/include/sys/fm/fs/Makefile.am @@ -1,18 +1,12 @@ COMMON_H = \ zfs.h -KERNEL_H = - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - if CONFIG_USER libzfsdir = $(includedir)/libzfs/sys/fm/fs -libzfs_HEADERS = $(COMMON_H) $(USER_H) +libzfs_HEADERS = $(COMMON_H) endif if CONFIG_KERNEL kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm/fs -kernel_HEADERS = $(COMMON_H) $(KERNEL_H) +kernel_HEADERS = $(COMMON_H) endif diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am index 4d9400ee6..351745786 100644 --- a/include/sys/fs/Makefile.am +++ b/include/sys/fs/Makefile.am @@ -1,18 +1,12 @@ COMMON_H = \ zfs.h -KERNEL_H = - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - if CONFIG_USER libzfsdir = $(includedir)/libzfs/sys/fs -libzfs_HEADERS = $(COMMON_H) $(USER_H) +libzfs_HEADERS = $(COMMON_H) endif if CONFIG_KERNEL kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fs -kernel_HEADERS = $(COMMON_H) $(KERNEL_H) +kernel_HEADERS = $(COMMON_H) endif 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 diff --git a/include/sys/sysevent/Makefile.am b/include/sys/sysevent/Makefile.am index 348539782..18949913e 100644 --- a/include/sys/sysevent/Makefile.am +++ b/include/sys/sysevent/Makefile.am @@ -2,18 +2,12 @@ COMMON_H = \ eventdefs.h \ dev.h -KERNEL_H = - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - if CONFIG_USER libzfsdir = $(includedir)/libzfs/sys/sysevent -libzfs_HEADERS = $(COMMON_H) $(USER_H) +libzfs_HEADERS = $(COMMON_H) endif if CONFIG_KERNEL kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/sysevent -kernel_HEADERS = $(COMMON_H) $(KERNEL_H) +kernel_HEADERS = $(COMMON_H) endif |