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
This commit is contained in:
Arvind Sankar
2020-06-25 14:14:54 -04:00
committed by Brian Behlendorf
parent 7c902a5178
commit 6b99fc0620
55 changed files with 86 additions and 261 deletions
+1 -3
View File
@@ -17,6 +17,4 @@ $(nodist_pkgdata_DATA): %: %.in
-e 's,@sysconfdir\@,$(sysconfdir),g' \
$< >'$@'
# Double-colon rules are allowed; there are multiple independent definitions.
distclean-local::
-$(RM) default.cfg
CLEANFILES = default.cfg
@@ -13,4 +13,5 @@ dist_pkgdata_SCRIPTS = \
zfs_clone_009_neg.ksh \
zfs_clone_010_pos.ksh \
zfs_clone_encrypted.ksh \
zfs_clone_deeply_nested.ksh
zfs_clone_deeply_nested.ksh \
zfs_clone_rm_nested.ksh
@@ -10,6 +10,7 @@ dist_pkgdata_SCRIPTS = \
zfs_send_006_pos.ksh \
zfs_send_007_pos.ksh \
zfs_send_encrypted.ksh \
zfs_send_encrypted_unloaded.ksh \
zfs_send_raw.ksh \
zfs_send_sparse.ksh \
zfs_send-b.ksh
@@ -4,6 +4,8 @@ dist_pkgdata_SCRIPTS = \
inherit_001_pos.ksh
dist_pkgdata_DATA = \
README.config \
README.state \
inherit.kshlib \
config001.cfg \
config002.cfg \
@@ -14,6 +14,4 @@ $(pkgpyzfs_SCRIPTS):%:%.in
$< >'$@'
-chmod 775 $@
# Double-colon rules are allowed; there are multiple independent definitions.
distclean-local::
-$(RM) $(pkgpyzfs_SCRIPTS)
CLEANFILES = $(pkgpyzfs_SCRIPTS)
@@ -18,6 +18,7 @@ dist_pkgdata_SCRIPTS = \
rsend_012_pos.ksh \
rsend_013_pos.ksh \
rsend_014_pos.ksh \
rsend_016_neg.ksh \
rsend_019_pos.ksh \
rsend_020_pos.ksh \
rsend_021_pos.ksh \
+2 -1
View File
@@ -6,4 +6,5 @@ dist_pkgdata_DATA = \
random_readwrite_fixed.fio \
random_writes.fio \
sequential_reads.fio \
sequential_writes.fio
sequential_writes.fio \
sequential_readwrite.fio