diff options
| author | Arvind Sankar <[email protected]> | 2020-06-25 14:14:54 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2020-06-26 14:20:02 -0700 |
| commit | 6b99fc0620f00fcfd201595b2bc6d279031dcb09 (patch) | |
| tree | cc5149529e1148acaae62dc46b47b39c5090439e /lib/libspl/Makefile.am | |
| 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 <[email protected]>
Signed-off-by: Arvind Sankar <[email protected]>
Closes #10501
Diffstat (limited to 'lib/libspl/Makefile.am')
| -rw-r--r-- | lib/libspl/Makefile.am | 5 |
1 files changed, 1 insertions, 4 deletions
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) |