diff options
55 files changed, 86 insertions, 261 deletions
diff --git a/Makefile.am b/Makefile.am index 6ba5ac388..1b6d431e4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,6 +32,7 @@ EXTRA_DIST = autogen.sh copy-builtin EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am EXTRA_DIST += META AUTHORS COPYRIGHT LICENSE NEWS NOTICE README.md EXTRA_DIST += CODE_OF_CONDUCT.md +EXTRA_DIST += module/lua/README.zfs module/os/linux/spl/README.md # Include all the extra licensing information for modules EXTRA_DIST += module/icp/algs/skein/THIRDPARTYLICENSE diff --git a/cmd/arc_summary/Makefile.am b/cmd/arc_summary/Makefile.am index e9dbb779a..ee758006e 100644 --- a/cmd/arc_summary/Makefile.am +++ b/cmd/arc_summary/Makefile.am @@ -1,17 +1,14 @@ -EXTRA_DIST = arc_summary2 arc_summary3 - transform = $(program_transform_name) if USING_PYTHON_2 -dist_bin_SCRIPTS = arc_summary2 -install-exec-hook: - before=$$(echo arc_summary2 | sed '$(transform)'); \ - after=$$(echo arc_summary | sed '$(transform)'); \ - mv "$(DESTDIR)$(bindir)/$$before" "$(DESTDIR)$(bindir)/$$after" +SCRIPT = arc_summary2 else -dist_bin_SCRIPTS = arc_summary3 +SCRIPT = arc_summary3 +endif + +dist_bin_SCRIPTS = $(SCRIPT) + install-exec-hook: - before=$$(echo arc_summary3 | sed '$(transform)'); \ + before=$$(echo $(SCRIPT) | sed '$(transform)'); \ after=$$(echo arc_summary | sed '$(transform)'); \ mv "$(DESTDIR)$(bindir)/$$before" "$(DESTDIR)$(bindir)/$$after" -endif diff --git a/cmd/zed/Makefile.am b/cmd/zed/Makefile.am index 82b000ce1..b6c89bfc3 100644 --- a/cmd/zed/Makefile.am +++ b/cmd/zed/Makefile.am @@ -43,3 +43,5 @@ zed_LDADD = \ zed_LDADD += -lrt zed_LDFLAGS = -pthread + +EXTRA_DIST = agents/README.md diff --git a/config/kernel-acl-refcount.m4 b/config/kernel-acl-refcount.m4 deleted file mode 100644 index 43e3c442d..000000000 --- a/config/kernel-acl-refcount.m4 +++ /dev/null @@ -1,20 +0,0 @@ -dnl # -dnl # 4.16 kernel: check if struct posix_acl acl.a_refcount is a refcount_t. -dnl # It's an atomic_t on older kernels. -dnl # -AC_DEFUN([ZFS_AC_KERNEL_ACL_HAS_REFCOUNT], [ - AC_MSG_CHECKING([whether posix_acl has refcount_t]) - ZFS_LINUX_TRY_COMPILE([ - #include <linux/backing-dev.h> - #include <linux/refcount.h> - #include <linux/posix_acl.h> - ],[ - struct posix_acl acl; - refcount_t *r __attribute__ ((unused)) = &acl.a_refcount; - ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_ACL_REFCOUNT, 1, [posix_acl has refcount_t]) - ],[ - AC_MSG_RESULT(no) - ]) -]) diff --git a/configure.ac b/configure.ac index a0a2926e5..861c02e61 100644 --- a/configure.ac +++ b/configure.ac @@ -143,9 +143,6 @@ AC_CONFIG_FILES([ lib/libnvpair/Makefile lib/libshare/Makefile lib/libspl/Makefile - lib/libspl/asm-generic/Makefile - lib/libspl/asm-i386/Makefile - lib/libspl/asm-x86_64/Makefile lib/libspl/include/Makefile lib/libspl/include/ia32/Makefile lib/libspl/include/ia32/sys/Makefile diff --git a/contrib/dracut/02zfsexpandknowledge/Makefile.am b/contrib/dracut/02zfsexpandknowledge/Makefile.am index 8c2637b60..11f2a84af 100644 --- a/contrib/dracut/02zfsexpandknowledge/Makefile.am +++ b/contrib/dracut/02zfsexpandknowledge/Makefile.am @@ -15,10 +15,4 @@ $(pkgdracut_SCRIPTS):%:%.in -e 's,@sysconfdir\@,$(sysconfdir),g' \ $< >'$@' -# Double-colon rules are allowed; there are multiple independent definitions. -clean-local:: - -$(RM) $(pkgdracut_SCRIPTS) - -# Double-colon rules are allowed; there are multiple independent definitions. -distclean-local:: - -$(RM) $(pkgdracut_SCRIPTS) +CLEANFILES = $(pkgdracut_SCRIPTS) diff --git a/contrib/dracut/90zfs/Makefile.am b/contrib/dracut/90zfs/Makefile.am index 5ce757cdf..645808e44 100644 --- a/contrib/dracut/90zfs/Makefile.am +++ b/contrib/dracut/90zfs/Makefile.am @@ -37,6 +37,4 @@ $(pkgdracut_SCRIPTS) $(pkgdracut_DATA) :%:%.in -e 's,@mounthelperdir\@,$(mounthelperdir),g' \ $< >'$@' -# Double-colon rules are allowed; there are multiple independent definitions. -distclean-local:: - -$(RM) $(pkgdracut_SCRIPTS) $(pkgdracut_DATA) +CLEANFILES = $(pkgdracut_SCRIPTS) $(pkgdracut_DATA) diff --git a/contrib/pam_zfs_key/Makefile.am b/contrib/pam_zfs_key/Makefile.am index 0f038bb78..7feabcdcb 100644 --- a/contrib/pam_zfs_key/Makefile.am +++ b/contrib/pam_zfs_key/Makefile.am @@ -14,5 +14,4 @@ pam_zfs_key_la_LDFLAGS = -version-info 1:0:0 -avoid-version -module -shared pam_zfs_key_la_LIBADD += -lpam $(LIBSSL) -pamconfigs_DATA = zfs_key -EXTRA_DIST = $(pamconfigs_DATA) +dist_pamconfigs_DATA = zfs_key diff --git a/etc/init.d/Makefile.am b/etc/init.d/Makefile.am index c40975df5..f97459803 100644 --- a/etc/init.d/Makefile.am +++ b/etc/init.d/Makefile.am @@ -7,7 +7,8 @@ EXTRA_DIST = \ zfs-share.in \ zfs-import.in \ zfs-mount.in \ - zfs-zed.in + zfs-zed.in \ + README.md $(init_SCRIPTS):%:%.in Makefile -(if [ -e /etc/debian_version ]; then \ diff --git a/etc/modules-load.d/Makefile.am b/etc/modules-load.d/Makefile.am index 02d9b734a..1c1f8458a 100644 --- a/etc/modules-load.d/Makefile.am +++ b/etc/modules-load.d/Makefile.am @@ -9,6 +9,4 @@ $(modulesload_DATA):%:%.in -e '' \ $< >'$@' -# Double-colon rules are allowed; there are multiple independent definitions. -distclean-local:: - -$(RM) $(modulesload_DATA) +CLEANFILES = $(modulesload_DATA) diff --git a/etc/systemd/system-generators/Makefile.am b/etc/systemd/system-generators/Makefile.am index 946f798c1..1a3efce32 100644 --- a/etc/systemd/system-generators/Makefile.am +++ b/etc/systemd/system-generators/Makefile.am @@ -11,6 +11,4 @@ $(systemdgenerator_SCRIPTS): %: %.in -e 's,@sysconfdir\@,$(sysconfdir),g' \ $< >'$@' -# Double-colon rules are allowed; there are multiple independent definitions. -distclean-local:: - -$(RM) $(systemdgenerator_SCRIPTS) +CLEANFILES = $(systemdgenerator_SCRIPTS) diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am index 8ffb14a38..6476fb1bd 100644 --- a/etc/systemd/system/Makefile.am +++ b/etc/systemd/system/Makefile.am @@ -35,6 +35,4 @@ install-data-hook: $(MKDIR_P) "$(DESTDIR)$(systemdunitdir)" ln -sf /dev/null "$(DESTDIR)$(systemdunitdir)/zfs-import.service" -# Double-colon rules are allowed; there are multiple independent definitions. -distclean-local:: - -$(RM) $(systemdunit_DATA) $(systemdpreset_DATA) +CLEANFILES = $(systemdunit_DATA) $(systemdpreset_DATA) diff --git a/etc/zfs/Makefile.am b/etc/zfs/Makefile.am index 5370f41bd..8e44affaa 100644 --- a/etc/zfs/Makefile.am +++ b/etc/zfs/Makefile.am @@ -1,7 +1,7 @@ pkgsysconfdir = $(sysconfdir)/zfs initconfdir = $(DEFAULT_INITCONF_DIR) -pkgsysconf_DATA = \ +dist_pkgsysconf_DATA = \ vdev_id.conf.alias.example \ vdev_id.conf.sas_direct.example \ vdev_id.conf.sas_switch.example \ @@ -10,26 +10,13 @@ pkgsysconf_DATA = \ pkgsysconf_SCRIPTS = \ zfs-functions -EXTRA_DIST = $(pkgsysconf_DATA) \ - zfs-functions.in +EXTRA_DIST = zfs-functions.in $(pkgsysconf_SCRIPTS):%:%.in Makefile - -(if [ -e /etc/debian_version ]; then \ - NFS_SRV=nfs-kernel-server; \ - else \ - NFS_SRV=nfs; \ - fi; \ - if [ -e /sbin/openrc-run ]; then \ - SHELL=/sbin/openrc-run; \ - else \ - SHELL=/bin/sh; \ - fi; \ - $(SED) \ + -$(SED) \ -e 's,@sbindir\@,$(sbindir),g' \ -e 's,@sysconfdir\@,$(sysconfdir),g' \ -e 's,@initconfdir\@,$(initconfdir),g' \ - $< >'$@'; \ - [ '$@' = 'zfs-functions' ] || \ - chmod +x '$@') + $< >'$@' CLEANFILES = $(pkgsysconf_SCRIPTS) diff --git a/include/Makefile.am b/include/Makefile.am index 6c36d9ad9..ba02142df 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -20,8 +20,6 @@ USER_H = \ libzutil.h \ thread_pool.h -EXTRA_DIST = $(COMMON_H) $(USER_H) - if CONFIG_USER libzfsdir = $(includedir)/libzfs libzfs_HEADERS = $(COMMON_H) $(USER_H) diff --git a/include/os/freebsd/linux/Makefile.am b/include/os/freebsd/linux/Makefile.am index 7168fc7a1..df902b87a 100644 --- a/include/os/freebsd/linux/Makefile.am +++ b/include/os/freebsd/linux/Makefile.am @@ -2,4 +2,7 @@ KERNEL_H = \ compiler.h \ types.h -EXTRA_DIST = $(KERNEL_H) +if CONFIG_KERNEL +kerneldir = @prefix@/src/zfs-$(VERSION)/include/linux +kernel_HEADERS = $(KERNEL_H) +endif diff --git a/include/os/freebsd/spl/acl/Makefile.am b/include/os/freebsd/spl/acl/Makefile.am index 4aabfd357..3028ebabe 100644 --- a/include/os/freebsd/spl/acl/Makefile.am +++ b/include/os/freebsd/spl/acl/Makefile.am @@ -1,4 +1,7 @@ KERNEL_H = \ acl_common.h -EXTRA_DIST = $(KERNEL_H) +if CONFIG_KERNEL +kerneldir = @prefix@/src/zfs-$(VERSION)/include/spl/acl +kernel_HEADERS = $(KERNEL_H) +endif diff --git a/include/os/freebsd/spl/rpc/Makefile.am b/include/os/freebsd/spl/rpc/Makefile.am index 8bd6e9b09..13d804fce 100644 --- a/include/os/freebsd/spl/rpc/Makefile.am +++ b/include/os/freebsd/spl/rpc/Makefile.am @@ -1,8 +1,7 @@ -COMMON_H = - KERNEL_H = \ xdr.h -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) +if CONFIG_KERNEL +kerneldir = @prefix@/src/zfs-$(VERSION)/include/spl/rpc +kernel_HEADERS = $(KERNEL_H) +endif diff --git a/include/os/freebsd/spl/sys/Makefile.am b/include/os/freebsd/spl/sys/Makefile.am index ac80f68cd..c95c9d65a 100644 --- a/include/os/freebsd/spl/sys/Makefile.am +++ b/include/os/freebsd/spl/sys/Makefile.am @@ -69,4 +69,7 @@ KERNEL_H = \ zmod.h \ zone.h -EXTRA_DIST = $(KERNEL_H) +if CONFIG_KERNEL +kerneldir = @prefix@/src/zfs-$(VERSION)/include/spl/sys +kernel_HEADERS = $(KERNEL_H) +endif diff --git a/include/os/freebsd/zfs/sys/Makefile.am b/include/os/freebsd/zfs/sys/Makefile.am index 56c0f6e90..8a1f8b313 100644 --- a/include/os/freebsd/zfs/sys/Makefile.am +++ b/include/os/freebsd/zfs/sys/Makefile.am @@ -11,4 +11,7 @@ KERNEL_H = \ zfs_znode_impl.h \ zpl.h -EXTRA_DIST = $(KERNEL_H) +if CONFIG_KERNEL +kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys +kernel_HEADERS = $(KERNEL_H) +endif diff --git a/include/os/linux/kernel/linux/Makefile.am b/include/os/linux/kernel/linux/Makefile.am index 7f84cbd1d..c142aac33 100644 --- a/include/os/linux/kernel/linux/Makefile.am +++ b/include/os/linux/kernel/linux/Makefile.am @@ -1,5 +1,3 @@ -COMMON_H = - KERNEL_H = \ dcache_compat.h \ xattr_compat.h \ @@ -15,16 +13,7 @@ KERNEL_H = \ page_compat.h \ compiler_compat.h -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - -if CONFIG_USER -libzfsdir = $(includedir)/libzfs/linux -libzfs_HEADERS = $(COMMON_H) $(USER_H) -endif - if CONFIG_KERNEL kerneldir = @prefix@/src/zfs-$(VERSION)/include/linux -kernel_HEADERS = $(COMMON_H) $(KERNEL_H) +kernel_HEADERS = $(KERNEL_H) endif 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 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) diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am index de5432861..cbfbcc0f3 100644 --- a/man/man1/Makefile.am +++ b/man/man1/Makefile.am @@ -1,5 +1,2 @@ dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1 arcstat.1 EXTRA_DIST = cstyle.1 - -install-data-local: - $(INSTALL) -d -m 0755 "$(DESTDIR)$(mandir)/man1" diff --git a/man/man5/Makefile.am b/man/man5/Makefile.am index 1c0683ee3..08d04133b 100644 --- a/man/man5/Makefile.am +++ b/man/man5/Makefile.am @@ -4,6 +4,3 @@ dist_man_MANS = \ spl-module-parameters.5 \ zfs-module-parameters.5 \ zfs-events.5 - -install-data-local: - $(INSTALL) -d -m 0755 "$(DESTDIR)$(mandir)/man5" diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am index 7284ba800..0298961b3 100644 --- a/man/man8/Makefile.am +++ b/man/man8/Makefile.am @@ -97,8 +97,5 @@ $(nodist_man_MANS): %: %.in -e 's,@sysconfdir\@,$(sysconfdir),g' \ $< >'$@' -install-data-local: - $(INSTALL) -d -m 0755 "$(DESTDIR)$(mandir)/man8" - CLEANFILES = \ $(nodist_man_MANS) diff --git a/tests/Makefile.am b/tests/Makefile.am index 28d6e95c3..f13b19613 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1 +1,3 @@ SUBDIRS = runfiles test-runner zfs-tests + +EXTRA_DIST = README.md diff --git a/tests/zfs-tests/include/Makefile.am b/tests/zfs-tests/include/Makefile.am index 929adc98d..5e9a4f386 100644 --- a/tests/zfs-tests/include/Makefile.am +++ b/tests/zfs-tests/include/Makefile.am @@ -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 diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_clone/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_clone/Makefile.am index 0a6c2eb85..06099c0c2 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_clone/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_clone/Makefile.am @@ -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 diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_send/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_send/Makefile.am index 2a476f3dc..9a492f323 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_send/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_send/Makefile.am @@ -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 diff --git a/tests/zfs-tests/tests/functional/inheritance/Makefile.am b/tests/zfs-tests/tests/functional/inheritance/Makefile.am index 82de708d6..3c624621f 100644 --- a/tests/zfs-tests/tests/functional/inheritance/Makefile.am +++ b/tests/zfs-tests/tests/functional/inheritance/Makefile.am @@ -4,6 +4,8 @@ dist_pkgdata_SCRIPTS = \ inherit_001_pos.ksh dist_pkgdata_DATA = \ + README.config \ + README.state \ inherit.kshlib \ config001.cfg \ config002.cfg \ diff --git a/tests/zfs-tests/tests/functional/pyzfs/Makefile.am b/tests/zfs-tests/tests/functional/pyzfs/Makefile.am index 0c68c252b..f7aa56b95 100644 --- a/tests/zfs-tests/tests/functional/pyzfs/Makefile.am +++ b/tests/zfs-tests/tests/functional/pyzfs/Makefile.am @@ -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) diff --git a/tests/zfs-tests/tests/functional/rsend/Makefile.am b/tests/zfs-tests/tests/functional/rsend/Makefile.am index ab3a1c6c3..cf6c727df 100644 --- a/tests/zfs-tests/tests/functional/rsend/Makefile.am +++ b/tests/zfs-tests/tests/functional/rsend/Makefile.am @@ -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 \ diff --git a/tests/zfs-tests/tests/perf/fio/Makefile.am b/tests/zfs-tests/tests/perf/fio/Makefile.am index 619251682..e9f854d9e 100644 --- a/tests/zfs-tests/tests/perf/fio/Makefile.am +++ b/tests/zfs-tests/tests/perf/fio/Makefile.am @@ -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 diff --git a/udev/rules.d/Makefile.am b/udev/rules.d/Makefile.am index 4d536f5de..82f13e078 100644 --- a/udev/rules.d/Makefile.am +++ b/udev/rules.d/Makefile.am @@ -16,6 +16,4 @@ $(udevrule_DATA):%:%.in -e 's,@sysconfdir\@,$(sysconfdir),g' \ $< > '$@' -# Double-colon rules are allowed; there are multiple independent definitions. -distclean-local:: - -$(RM) $(udevrule_DATA) +CLEANFILES = $(udevrule_DATA) |