From 75138073208674967d0fb238f1b6210da224db36 Mon Sep 17 00:00:00 2001 From: Arvind Sankar Date: Mon, 22 Jun 2020 17:30:40 -0400 Subject: [PATCH] Drop unnecessary srcdir paths There's no need to specify the srcdir explicitly in _HEADERS and EXTRA_DIST. Reviewed-by: Ryan Moeller Reviewed-by: Brian Behlendorf Signed-off-by: Arvind Sankar Closes #10493 --- contrib/bpftrace/Makefile.am | 4 +- .../dracut/02zfsexpandknowledge/Makefile.am | 2 +- contrib/dracut/90zfs/Makefile.am | 22 +- contrib/initramfs/Makefile.am | 2 +- contrib/initramfs/hooks/Makefile.am | 4 +- etc/default/Makefile.am | 2 +- etc/init.d/Makefile.am | 8 +- etc/modules-load.d/Makefile.am | 2 +- etc/sudoers.d/Makefile.am | 2 +- etc/systemd/system-generators/Makefile.am | 2 +- etc/systemd/system/Makefile.am | 20 +- include/Makefile.am | 32 +-- include/os/freebsd/linux/Makefile.am | 4 +- include/os/freebsd/spl/acl/Makefile.am | 2 +- include/os/freebsd/spl/rpc/Makefile.am | 2 +- include/os/freebsd/spl/sys/Makefile.am | 138 +++++----- include/os/freebsd/zfs/sys/Makefile.am | 22 +- include/os/linux/kernel/linux/Makefile.am | 26 +- include/os/linux/spl/rpc/Makefile.am | 2 +- include/os/linux/spl/sys/Makefile.am | 116 ++++---- include/os/linux/zfs/sys/Makefile.am | 48 ++-- include/sys/Makefile.am | 258 +++++++++--------- include/sys/crypto/Makefile.am | 6 +- include/sys/fm/Makefile.am | 4 +- include/sys/fm/fs/Makefile.am | 2 +- include/sys/fs/Makefile.am | 2 +- include/sys/lua/Makefile.am | 8 +- include/sys/sysevent/Makefile.am | 4 +- lib/libspl/include/Makefile.am | 36 +-- lib/libspl/include/ia32/sys/Makefile.am | 2 +- lib/libspl/include/os/freebsd/sys/Makefile.am | 18 +- lib/libspl/include/os/linux/sys/Makefile.am | 16 +- lib/libspl/include/rpc/Makefile.am | 2 +- lib/libspl/include/sys/Makefile.am | 86 +++--- lib/libspl/include/sys/dktp/Makefile.am | 2 +- lib/libspl/include/util/Makefile.am | 2 +- scripts/Makefile.am | 10 +- udev/rules.d/Makefile.am | 6 +- 38 files changed, 463 insertions(+), 463 deletions(-) diff --git a/contrib/bpftrace/Makefile.am b/contrib/bpftrace/Makefile.am index c4359e6c8..327bc6442 100644 --- a/contrib/bpftrace/Makefile.am +++ b/contrib/bpftrace/Makefile.am @@ -1,3 +1,3 @@ EXTRA_DIST = \ - $(top_srcdir)/contrib/bpftrace/taskqlatency.bt \ - $(top_srcdir)/contrib/bpftrace/zfs-trace.sh + taskqlatency.bt \ + zfs-trace.sh diff --git a/contrib/dracut/02zfsexpandknowledge/Makefile.am b/contrib/dracut/02zfsexpandknowledge/Makefile.am index 6e553e8d4..8c2637b60 100644 --- a/contrib/dracut/02zfsexpandknowledge/Makefile.am +++ b/contrib/dracut/02zfsexpandknowledge/Makefile.am @@ -3,7 +3,7 @@ pkgdracut_SCRIPTS = \ module-setup.sh EXTRA_DIST = \ - $(top_srcdir)/contrib/dracut/02zfsexpandknowledge/module-setup.sh.in + module-setup.sh.in $(pkgdracut_SCRIPTS):%:%.in -$(SED) -e 's,@bindir\@,$(bindir),g' \ diff --git a/contrib/dracut/90zfs/Makefile.am b/contrib/dracut/90zfs/Makefile.am index 08667a134..5ce757cdf 100644 --- a/contrib/dracut/90zfs/Makefile.am +++ b/contrib/dracut/90zfs/Makefile.am @@ -15,17 +15,17 @@ pkgdracut_DATA = \ zfs-rollback-bootfs.service EXTRA_DIST = \ - $(top_srcdir)/contrib/dracut/90zfs/export-zfs.sh.in \ - $(top_srcdir)/contrib/dracut/90zfs/module-setup.sh.in \ - $(top_srcdir)/contrib/dracut/90zfs/mount-zfs.sh.in \ - $(top_srcdir)/contrib/dracut/90zfs/parse-zfs.sh.in \ - $(top_srcdir)/contrib/dracut/90zfs/zfs-generator.sh.in \ - $(top_srcdir)/contrib/dracut/90zfs/zfs-load-key.sh.in \ - $(top_srcdir)/contrib/dracut/90zfs/zfs-needshutdown.sh.in \ - $(top_srcdir)/contrib/dracut/90zfs/zfs-lib.sh.in \ - $(top_srcdir)/contrib/dracut/90zfs/zfs-env-bootfs.service.in \ - $(top_srcdir)/contrib/dracut/90zfs/zfs-snapshot-bootfs.service.in \ - $(top_srcdir)/contrib/dracut/90zfs/zfs-rollback-bootfs.service.in + export-zfs.sh.in \ + module-setup.sh.in \ + mount-zfs.sh.in \ + parse-zfs.sh.in \ + zfs-generator.sh.in \ + zfs-load-key.sh.in \ + zfs-needshutdown.sh.in \ + zfs-lib.sh.in \ + zfs-env-bootfs.service.in \ + zfs-snapshot-bootfs.service.in \ + zfs-rollback-bootfs.service.in $(pkgdracut_SCRIPTS) $(pkgdracut_DATA) :%:%.in -$(SED) -e 's,@bindir\@,$(bindir),g' \ diff --git a/contrib/initramfs/Makefile.am b/contrib/initramfs/Makefile.am index ee17de096..5eac6e215 100644 --- a/contrib/initramfs/Makefile.am +++ b/contrib/initramfs/Makefile.am @@ -6,4 +6,4 @@ dist_initrd_SCRIPTS = \ SUBDIRS = conf.d conf-hooks.d hooks scripts EXTRA_DIST = \ - $(top_srcdir)/contrib/initramfs/README.initramfs.markdown + README.initramfs.markdown diff --git a/contrib/initramfs/hooks/Makefile.am b/contrib/initramfs/hooks/Makefile.am index 9b20c080a..8da1c4835 100644 --- a/contrib/initramfs/hooks/Makefile.am +++ b/contrib/initramfs/hooks/Makefile.am @@ -5,8 +5,8 @@ hooks_SCRIPTS = \ zfsunlock EXTRA_DIST = \ - $(top_srcdir)/contrib/initramfs/hooks/zfs.in \ - $(top_srcdir)/contrib/initramfs/hooks/zfsunlock.in + zfs.in \ + zfsunlock.in $(hooks_SCRIPTS):%:%.in Makefile -$(SED) -e 's,@sbindir\@,$(sbindir),g' \ diff --git a/etc/default/Makefile.am b/etc/default/Makefile.am index f35abd8e5..afc3a81f6 100644 --- a/etc/default/Makefile.am +++ b/etc/default/Makefile.am @@ -2,7 +2,7 @@ initconfdir = $(DEFAULT_INITCONF_DIR) initconf_SCRIPTS = zfs EXTRA_DIST = \ - $(top_srcdir)/etc/default/zfs.in + zfs.in $(initconf_SCRIPTS):%:%.in Makefile $(SED) \ diff --git a/etc/init.d/Makefile.am b/etc/init.d/Makefile.am index 19fa76a2b..c40975df5 100644 --- a/etc/init.d/Makefile.am +++ b/etc/init.d/Makefile.am @@ -4,10 +4,10 @@ init_SCRIPTS = zfs-import zfs-mount zfs-share zfs-zed initconfdir = $(DEFAULT_INITCONF_DIR) EXTRA_DIST = \ - $(top_srcdir)/etc/init.d/zfs-share.in \ - $(top_srcdir)/etc/init.d/zfs-import.in \ - $(top_srcdir)/etc/init.d/zfs-mount.in \ - $(top_srcdir)/etc/init.d/zfs-zed.in + zfs-share.in \ + zfs-import.in \ + zfs-mount.in \ + zfs-zed.in $(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 47762b7d0..02d9b734a 100644 --- a/etc/modules-load.d/Makefile.am +++ b/etc/modules-load.d/Makefile.am @@ -2,7 +2,7 @@ modulesload_DATA = \ zfs.conf EXTRA_DIST = \ - $(top_srcdir)/etc/modules-load.d/zfs.conf.in + zfs.conf.in $(modulesload_DATA):%:%.in -$(SED) \ diff --git a/etc/sudoers.d/Makefile.am b/etc/sudoers.d/Makefile.am index ca9186a7e..6f7ac8dbf 100644 --- a/etc/sudoers.d/Makefile.am +++ b/etc/sudoers.d/Makefile.am @@ -2,4 +2,4 @@ sudoersddir = $(sysconfdir)/sudoers.d sudoersd_DATA = zfs EXTRA_DIST = \ - $(top_srcdir)/etc/sudoers.d/zfs + zfs diff --git a/etc/systemd/system-generators/Makefile.am b/etc/systemd/system-generators/Makefile.am index b4df01322..946f798c1 100644 --- a/etc/systemd/system-generators/Makefile.am +++ b/etc/systemd/system-generators/Makefile.am @@ -2,7 +2,7 @@ systemdgenerator_SCRIPTS = \ zfs-mount-generator EXTRA_DIST = \ - $(top_srcdir)/etc/systemd/system-generators/zfs-mount-generator.in + zfs-mount-generator.in $(systemdgenerator_SCRIPTS): %: %.in -$(SED) -e 's,@bindir\@,$(bindir),g' \ diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am index 4e14467a0..8ffb14a38 100644 --- a/etc/systemd/system/Makefile.am +++ b/etc/systemd/system/Makefile.am @@ -13,16 +13,16 @@ systemdunit_DATA = \ zfs.target EXTRA_DIST = \ - $(top_srcdir)/etc/systemd/system/zfs-zed.service.in \ - $(top_srcdir)/etc/systemd/system/zfs-import-cache.service.in \ - $(top_srcdir)/etc/systemd/system/zfs-import-scan.service.in \ - $(top_srcdir)/etc/systemd/system/zfs-mount.service.in \ - $(top_srcdir)/etc/systemd/system/zfs-share.service.in \ - $(top_srcdir)/etc/systemd/system/zfs-import.target.in \ - $(top_srcdir)/etc/systemd/system/zfs-volume-wait.service.in \ - $(top_srcdir)/etc/systemd/system/zfs-volumes.target.in \ - $(top_srcdir)/etc/systemd/system/zfs.target.in \ - $(top_srcdir)/etc/systemd/system/50-zfs.preset.in + zfs-zed.service.in \ + zfs-import-cache.service.in \ + zfs-import-scan.service.in \ + zfs-mount.service.in \ + zfs-share.service.in \ + zfs-import.target.in \ + zfs-volume-wait.service.in \ + zfs-volumes.target.in \ + zfs.target.in \ + 50-zfs.preset.in $(systemdunit_DATA) $(systemdpreset_DATA):%:%.in -$(SED) -e 's,@bindir\@,$(bindir),g' \ diff --git a/include/Makefile.am b/include/Makefile.am index 9591d4423..6c36d9ad9 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,24 +1,24 @@ SUBDIRS = sys os COMMON_H = \ - $(top_srcdir)/include/cityhash.h \ - $(top_srcdir)/include/zfeature_common.h \ - $(top_srcdir)/include/zfs_comutil.h \ - $(top_srcdir)/include/zfs_deleg.h \ - $(top_srcdir)/include/zfs_fletcher.h \ - $(top_srcdir)/include/zfs_namecheck.h \ - $(top_srcdir)/include/zfs_prop.h + cityhash.h \ + zfeature_common.h \ + zfs_comutil.h \ + zfs_deleg.h \ + zfs_fletcher.h \ + zfs_namecheck.h \ + zfs_prop.h USER_H = \ - $(top_srcdir)/include/libnvpair.h \ - $(top_srcdir)/include/libuutil_common.h \ - $(top_srcdir)/include/libuutil.h \ - $(top_srcdir)/include/libuutil_impl.h \ - $(top_srcdir)/include/libzfs.h \ - $(top_srcdir)/include/libzfs_core.h \ - $(top_srcdir)/include/libzfs_impl.h \ - $(top_srcdir)/include/libzutil.h \ - $(top_srcdir)/include/thread_pool.h + libnvpair.h \ + libuutil_common.h \ + libuutil.h \ + libuutil_impl.h \ + libzfs.h \ + libzfs_core.h \ + libzfs_impl.h \ + libzutil.h \ + thread_pool.h EXTRA_DIST = $(COMMON_H) $(USER_H) diff --git a/include/os/freebsd/linux/Makefile.am b/include/os/freebsd/linux/Makefile.am index 936cf2131..7168fc7a1 100644 --- a/include/os/freebsd/linux/Makefile.am +++ b/include/os/freebsd/linux/Makefile.am @@ -1,5 +1,5 @@ KERNEL_H = \ - $(top_srcdir)/include/os/freebsd/linux/compiler.h \ - $(top_srcdir)/include/os/freebsd/linux/types.h + compiler.h \ + types.h EXTRA_DIST = $(KERNEL_H) diff --git a/include/os/freebsd/spl/acl/Makefile.am b/include/os/freebsd/spl/acl/Makefile.am index 65a03ea17..4aabfd357 100644 --- a/include/os/freebsd/spl/acl/Makefile.am +++ b/include/os/freebsd/spl/acl/Makefile.am @@ -1,4 +1,4 @@ KERNEL_H = \ - $(top_srcdir)/include/os/freebsd/spl/acl/acl_common.h + acl_common.h EXTRA_DIST = $(KERNEL_H) diff --git a/include/os/freebsd/spl/rpc/Makefile.am b/include/os/freebsd/spl/rpc/Makefile.am index 266a3b759..8bd6e9b09 100644 --- a/include/os/freebsd/spl/rpc/Makefile.am +++ b/include/os/freebsd/spl/rpc/Makefile.am @@ -1,7 +1,7 @@ COMMON_H = KERNEL_H = \ - $(top_srcdir)/include/os/freebsd/spl/rpc/xdr.h + xdr.h USER_H = diff --git a/include/os/freebsd/spl/sys/Makefile.am b/include/os/freebsd/spl/sys/Makefile.am index 29a39cacf..ac80f68cd 100644 --- a/include/os/freebsd/spl/sys/Makefile.am +++ b/include/os/freebsd/spl/sys/Makefile.am @@ -1,72 +1,72 @@ KERNEL_H = \ - $(top_srcdir)/include/os/freebsd/spl/sys/acl_impl.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/acl.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/atomic.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/byteorder.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/callb.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/ccompile.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/cmn_err.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/condvar.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/console.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/cred.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/ctype.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/debug.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/dirent.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/disp.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/dkio.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/endian.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/extdirent.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/file.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/freebsd_rwlock.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/inttypes.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/isa_defs.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/kmem_cache.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/kmem.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/kstat.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/list_impl.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/list.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/lock.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/Makefile.am \ - $(top_srcdir)/include/os/freebsd/spl/sys/misc.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/mod_os.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/mode.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/mount.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/mutex.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/param.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/policy.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/proc.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/processor.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/procfs_list.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/random.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/rwlock.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/sdt.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/sid.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/sig.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/simd_x86.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/simd.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/spl_condvar.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/string.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/strings.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/sunddi.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/sysmacros.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/systeminfo.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/systm.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/taskq.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/thread.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/time.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/timer.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/trace_zfs.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/trace.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/types.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/types32.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/uio.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/uuid.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/vfs.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/vm.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/vmsystm.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/vnode_impl.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/vnode.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/zmod.h \ - $(top_srcdir)/include/os/freebsd/spl/sys/zone.h + acl_impl.h \ + acl.h \ + atomic.h \ + byteorder.h \ + callb.h \ + ccompile.h \ + cmn_err.h \ + condvar.h \ + console.h \ + cred.h \ + ctype.h \ + debug.h \ + dirent.h \ + disp.h \ + dkio.h \ + endian.h \ + extdirent.h \ + file.h \ + freebsd_rwlock.h \ + inttypes.h \ + isa_defs.h \ + kmem_cache.h \ + kmem.h \ + kstat.h \ + list_impl.h \ + list.h \ + lock.h \ + Makefile.am \ + misc.h \ + mod_os.h \ + mode.h \ + mount.h \ + mutex.h \ + param.h \ + policy.h \ + proc.h \ + processor.h \ + procfs_list.h \ + random.h \ + rwlock.h \ + sdt.h \ + sid.h \ + sig.h \ + simd_x86.h \ + simd.h \ + spl_condvar.h \ + string.h \ + strings.h \ + sunddi.h \ + sysmacros.h \ + systeminfo.h \ + systm.h \ + taskq.h \ + thread.h \ + time.h \ + timer.h \ + trace_zfs.h \ + trace.h \ + types.h \ + types32.h \ + uio.h \ + uuid.h \ + vfs.h \ + vm.h \ + vmsystm.h \ + vnode_impl.h \ + vnode.h \ + zmod.h \ + zone.h EXTRA_DIST = $(KERNEL_H) diff --git a/include/os/freebsd/zfs/sys/Makefile.am b/include/os/freebsd/zfs/sys/Makefile.am index 1dec5ef5f..56c0f6e90 100644 --- a/include/os/freebsd/zfs/sys/Makefile.am +++ b/include/os/freebsd/zfs/sys/Makefile.am @@ -1,14 +1,14 @@ KERNEL_H = \ - $(top_srcdir)/include/os/freebsd/zfs/sys/freebsd_crypto.h \ - $(top_srcdir)/include/os/freebsd/zfs/sys/sha2.h \ - $(top_srcdir)/include/os/freebsd/zfs/sys/vdev_os.h \ - $(top_srcdir)/include/os/freebsd/zfs/sys/zfs_context_os.h \ - $(top_srcdir)/include/os/freebsd/zfs/sys/zfs_ctldir.h \ - $(top_srcdir)/include/os/freebsd/zfs/sys/zfs_dir.h \ - $(top_srcdir)/include/os/freebsd/zfs/sys/zfs_ioctl_compat.h \ - $(top_srcdir)/include/os/freebsd/zfs/sys/zfs_vfsops.h \ - $(top_srcdir)/include/os/freebsd/zfs/sys/zfs_vnops.h \ - $(top_srcdir)/include/os/freebsd/zfs/sys/zfs_znode_impl.h \ - $(top_srcdir)/include/os/freebsd/zfs/sys/zpl.h + freebsd_crypto.h \ + sha2.h \ + vdev_os.h \ + zfs_context_os.h \ + zfs_ctldir.h \ + zfs_dir.h \ + zfs_ioctl_compat.h \ + zfs_vfsops.h \ + zfs_vnops.h \ + zfs_znode_impl.h \ + zpl.h EXTRA_DIST = $(KERNEL_H) diff --git a/include/os/linux/kernel/linux/Makefile.am b/include/os/linux/kernel/linux/Makefile.am index 6b9b2a30c..7f84cbd1d 100644 --- a/include/os/linux/kernel/linux/Makefile.am +++ b/include/os/linux/kernel/linux/Makefile.am @@ -1,19 +1,19 @@ COMMON_H = KERNEL_H = \ - $(top_srcdir)/include/os/linux/kernel/linux/dcache_compat.h \ - $(top_srcdir)/include/os/linux/kernel/linux/xattr_compat.h \ - $(top_srcdir)/include/os/linux/kernel/linux/vfs_compat.h \ - $(top_srcdir)/include/os/linux/kernel/linux/blkdev_compat.h \ - $(top_srcdir)/include/os/linux/kernel/linux/utsname_compat.h \ - $(top_srcdir)/include/os/linux/kernel/linux/kmap_compat.h \ - $(top_srcdir)/include/os/linux/kernel/linux/simd.h \ - $(top_srcdir)/include/os/linux/kernel/linux/simd_x86.h \ - $(top_srcdir)/include/os/linux/kernel/linux/simd_aarch64.h \ - $(top_srcdir)/include/os/linux/kernel/linux/simd_powerpc.h \ - $(top_srcdir)/include/os/linux/kernel/linux/mod_compat.h \ - $(top_srcdir)/include/os/linux/kernel/linux/page_compat.h \ - $(top_srcdir)/include/os/linux/kernel/linux/compiler_compat.h + dcache_compat.h \ + xattr_compat.h \ + vfs_compat.h \ + blkdev_compat.h \ + utsname_compat.h \ + kmap_compat.h \ + simd.h \ + simd_x86.h \ + simd_aarch64.h \ + simd_powerpc.h \ + mod_compat.h \ + page_compat.h \ + compiler_compat.h USER_H = diff --git a/include/os/linux/spl/rpc/Makefile.am b/include/os/linux/spl/rpc/Makefile.am index 9477dd59d..13d804fce 100644 --- a/include/os/linux/spl/rpc/Makefile.am +++ b/include/os/linux/spl/rpc/Makefile.am @@ -1,5 +1,5 @@ KERNEL_H = \ - $(top_srcdir)/include/os/linux/spl/rpc/xdr.h + xdr.h if CONFIG_KERNEL kerneldir = @prefix@/src/zfs-$(VERSION)/include/spl/rpc diff --git a/include/os/linux/spl/sys/Makefile.am b/include/os/linux/spl/sys/Makefile.am index 63b5ba71b..0fd4cd37a 100644 --- a/include/os/linux/spl/sys/Makefile.am +++ b/include/os/linux/spl/sys/Makefile.am @@ -1,62 +1,62 @@ KERNEL_H = \ - $(top_srcdir)/include/os/linux/spl/sys/acl.h \ - $(top_srcdir)/include/os/linux/spl/sys/atomic.h \ - $(top_srcdir)/include/os/linux/spl/sys/byteorder.h \ - $(top_srcdir)/include/os/linux/spl/sys/callb.h \ - $(top_srcdir)/include/os/linux/spl/sys/callo.h \ - $(top_srcdir)/include/os/linux/spl/sys/cmn_err.h \ - $(top_srcdir)/include/os/linux/spl/sys/condvar.h \ - $(top_srcdir)/include/os/linux/spl/sys/console.h \ - $(top_srcdir)/include/os/linux/spl/sys/cred.h \ - $(top_srcdir)/include/os/linux/spl/sys/ctype.h \ - $(top_srcdir)/include/os/linux/spl/sys/debug.h \ - $(top_srcdir)/include/os/linux/spl/sys/disp.h \ - $(top_srcdir)/include/os/linux/spl/sys/dkio.h \ - $(top_srcdir)/include/os/linux/spl/sys/errno.h \ - $(top_srcdir)/include/os/linux/spl/sys/fcntl.h \ - $(top_srcdir)/include/os/linux/spl/sys/file.h \ - $(top_srcdir)/include/os/linux/spl/sys/inttypes.h \ - $(top_srcdir)/include/os/linux/spl/sys/isa_defs.h \ - $(top_srcdir)/include/os/linux/spl/sys/kmem_cache.h \ - $(top_srcdir)/include/os/linux/spl/sys/kmem.h \ - $(top_srcdir)/include/os/linux/spl/sys/kstat.h \ - $(top_srcdir)/include/os/linux/spl/sys/list.h \ - $(top_srcdir)/include/os/linux/spl/sys/mod_os.h \ - $(top_srcdir)/include/os/linux/spl/sys/mutex.h \ - $(top_srcdir)/include/os/linux/spl/sys/param.h \ - $(top_srcdir)/include/os/linux/spl/sys/processor.h \ - $(top_srcdir)/include/os/linux/spl/sys/proc.h \ - $(top_srcdir)/include/os/linux/spl/sys/procfs_list.h \ - $(top_srcdir)/include/os/linux/spl/sys/random.h \ - $(top_srcdir)/include/os/linux/spl/sys/rwlock.h \ - $(top_srcdir)/include/os/linux/spl/sys/shrinker.h \ - $(top_srcdir)/include/os/linux/spl/sys/sid.h \ - $(top_srcdir)/include/os/linux/spl/sys/signal.h \ - $(top_srcdir)/include/os/linux/spl/sys/simd.h \ - $(top_srcdir)/include/os/linux/spl/sys/stat.h \ - $(top_srcdir)/include/os/linux/spl/sys/strings.h \ - $(top_srcdir)/include/os/linux/spl/sys/sunddi.h \ - $(top_srcdir)/include/os/linux/spl/sys/sysmacros.h \ - $(top_srcdir)/include/os/linux/spl/sys/systeminfo.h \ - $(top_srcdir)/include/os/linux/spl/sys/taskq.h \ - $(top_srcdir)/include/os/linux/spl/sys/thread.h \ - $(top_srcdir)/include/os/linux/spl/sys/time.h \ - $(top_srcdir)/include/os/linux/spl/sys/timer.h \ - $(top_srcdir)/include/os/linux/spl/sys/trace.h \ - $(top_srcdir)/include/os/linux/spl/sys/trace_spl.h \ - $(top_srcdir)/include/os/linux/spl/sys/trace_taskq.h \ - $(top_srcdir)/include/os/linux/spl/sys/tsd.h \ - $(top_srcdir)/include/os/linux/spl/sys/types32.h \ - $(top_srcdir)/include/os/linux/spl/sys/types.h \ - $(top_srcdir)/include/os/linux/spl/sys/uio.h \ - $(top_srcdir)/include/os/linux/spl/sys/user.h \ - $(top_srcdir)/include/os/linux/spl/sys/vfs.h \ - $(top_srcdir)/include/os/linux/spl/sys/vmem.h \ - $(top_srcdir)/include/os/linux/spl/sys/vmsystm.h \ - $(top_srcdir)/include/os/linux/spl/sys/vnode.h \ - $(top_srcdir)/include/os/linux/spl/sys/wait.h \ - $(top_srcdir)/include/os/linux/spl/sys/zmod.h \ - $(top_srcdir)/include/os/linux/spl/sys/zone.h + acl.h \ + atomic.h \ + byteorder.h \ + callb.h \ + callo.h \ + cmn_err.h \ + condvar.h \ + console.h \ + cred.h \ + ctype.h \ + debug.h \ + disp.h \ + dkio.h \ + errno.h \ + fcntl.h \ + file.h \ + inttypes.h \ + isa_defs.h \ + kmem_cache.h \ + kmem.h \ + kstat.h \ + list.h \ + mod_os.h \ + mutex.h \ + param.h \ + processor.h \ + proc.h \ + procfs_list.h \ + random.h \ + rwlock.h \ + shrinker.h \ + sid.h \ + signal.h \ + simd.h \ + stat.h \ + strings.h \ + sunddi.h \ + sysmacros.h \ + systeminfo.h \ + taskq.h \ + thread.h \ + time.h \ + timer.h \ + trace.h \ + trace_spl.h \ + trace_taskq.h \ + tsd.h \ + types32.h \ + types.h \ + uio.h \ + user.h \ + vfs.h \ + vmem.h \ + vmsystm.h \ + vnode.h \ + wait.h \ + zmod.h \ + zone.h if CONFIG_KERNEL kerneldir = @prefix@/src/zfs-$(VERSION)/include/spl/sys diff --git a/include/os/linux/zfs/sys/Makefile.am b/include/os/linux/zfs/sys/Makefile.am index 16df22c6c..732d94ee8 100644 --- a/include/os/linux/zfs/sys/Makefile.am +++ b/include/os/linux/zfs/sys/Makefile.am @@ -1,28 +1,28 @@ KERNEL_H = \ - $(top_srcdir)/include/os/linux/zfs/sys/policy.h \ - $(top_srcdir)/include/os/linux/zfs/sys/sha2.h \ - $(top_srcdir)/include/os/linux/zfs/sys/trace_acl.h \ - $(top_srcdir)/include/os/linux/zfs/sys/trace_arc.h \ - $(top_srcdir)/include/os/linux/zfs/sys/trace_common.h \ - $(top_srcdir)/include/os/linux/zfs/sys/trace_zfs.h \ - $(top_srcdir)/include/os/linux/zfs/sys/trace_dbgmsg.h \ - $(top_srcdir)/include/os/linux/zfs/sys/trace_dbuf.h \ - $(top_srcdir)/include/os/linux/zfs/sys/trace_dmu.h \ - $(top_srcdir)/include/os/linux/zfs/sys/trace_dnode.h \ - $(top_srcdir)/include/os/linux/zfs/sys/trace_multilist.h \ - $(top_srcdir)/include/os/linux/zfs/sys/trace_rrwlock.h \ - $(top_srcdir)/include/os/linux/zfs/sys/trace_txg.h \ - $(top_srcdir)/include/os/linux/zfs/sys/trace_vdev.h \ - $(top_srcdir)/include/os/linux/zfs/sys/trace_zil.h \ - $(top_srcdir)/include/os/linux/zfs/sys/trace_zio.h \ - $(top_srcdir)/include/os/linux/zfs/sys/trace_zrlock.h \ - $(top_srcdir)/include/os/linux/zfs/sys/zfs_context_os.h \ - $(top_srcdir)/include/os/linux/zfs/sys/zfs_ctldir.h \ - $(top_srcdir)/include/os/linux/zfs/sys/zfs_dir.h \ - $(top_srcdir)/include/os/linux/zfs/sys/zfs_vfsops.h \ - $(top_srcdir)/include/os/linux/zfs/sys/zfs_vnops.h \ - $(top_srcdir)/include/os/linux/zfs/sys/zfs_znode_impl.h \ - $(top_srcdir)/include/os/linux/zfs/sys/zpl.h + policy.h \ + sha2.h \ + trace_acl.h \ + trace_arc.h \ + trace_common.h \ + trace_zfs.h \ + trace_dbgmsg.h \ + trace_dbuf.h \ + trace_dmu.h \ + trace_dnode.h \ + trace_multilist.h \ + trace_rrwlock.h \ + trace_txg.h \ + trace_vdev.h \ + trace_zil.h \ + trace_zio.h \ + trace_zrlock.h \ + zfs_context_os.h \ + zfs_ctldir.h \ + zfs_dir.h \ + zfs_vfsops.h \ + zfs_vnops.h \ + zfs_znode_impl.h \ + zpl.h if CONFIG_KERNEL kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am index 17d78658c..f559f188e 100644 --- a/include/sys/Makefile.am +++ b/include/sys/Makefile.am @@ -1,137 +1,137 @@ SUBDIRS = fm fs crypto lua sysevent COMMON_H = \ - $(top_srcdir)/include/sys/abd.h \ - $(top_srcdir)/include/sys/abd_impl.h \ - $(top_srcdir)/include/sys/aggsum.h \ - $(top_srcdir)/include/sys/arc.h \ - $(top_srcdir)/include/sys/arc_impl.h \ - $(top_srcdir)/include/sys/avl.h \ - $(top_srcdir)/include/sys/avl_impl.h \ - $(top_srcdir)/include/sys/bitops.h \ - $(top_srcdir)/include/sys/blkptr.h \ - $(top_srcdir)/include/sys/bplist.h \ - $(top_srcdir)/include/sys/bpobj.h \ - $(top_srcdir)/include/sys/bptree.h \ - $(top_srcdir)/include/sys/btree.h \ - $(top_srcdir)/include/sys/bqueue.h \ - $(top_srcdir)/include/sys/dataset_kstats.h \ - $(top_srcdir)/include/sys/dbuf.h \ - $(top_srcdir)/include/sys/ddt.h \ - $(top_srcdir)/include/sys/dmu.h \ - $(top_srcdir)/include/sys/dmu_impl.h \ - $(top_srcdir)/include/sys/dmu_objset.h \ - $(top_srcdir)/include/sys/dmu_recv.h \ - $(top_srcdir)/include/sys/dmu_redact.h \ - $(top_srcdir)/include/sys/dmu_send.h \ - $(top_srcdir)/include/sys/dmu_traverse.h \ - $(top_srcdir)/include/sys/dmu_tx.h \ - $(top_srcdir)/include/sys/dmu_zfetch.h \ - $(top_srcdir)/include/sys/dnode.h \ - $(top_srcdir)/include/sys/dsl_bookmark.h \ - $(top_srcdir)/include/sys/dsl_dataset.h \ - $(top_srcdir)/include/sys/dsl_deadlist.h \ - $(top_srcdir)/include/sys/dsl_deleg.h \ - $(top_srcdir)/include/sys/dsl_destroy.h \ - $(top_srcdir)/include/sys/dsl_dir.h \ - $(top_srcdir)/include/sys/dsl_crypt.h \ - $(top_srcdir)/include/sys/dsl_pool.h \ - $(top_srcdir)/include/sys/dsl_prop.h \ - $(top_srcdir)/include/sys/dsl_scan.h \ - $(top_srcdir)/include/sys/dsl_synctask.h \ - $(top_srcdir)/include/sys/dsl_userhold.h \ - $(top_srcdir)/include/sys/edonr.h \ - $(top_srcdir)/include/sys/efi_partition.h \ - $(top_srcdir)/include/sys/frame.h \ - $(top_srcdir)/include/sys/hkdf.h \ - $(top_srcdir)/include/sys/metaslab.h \ - $(top_srcdir)/include/sys/metaslab_impl.h \ - $(top_srcdir)/include/sys/mmp.h \ - $(top_srcdir)/include/sys/mntent.h \ - $(top_srcdir)/include/sys/mod.h \ - $(top_srcdir)/include/sys/multilist.h \ - $(top_srcdir)/include/sys/note.h \ - $(top_srcdir)/include/sys/nvpair.h \ - $(top_srcdir)/include/sys/nvpair_impl.h \ - $(top_srcdir)/include/sys/objlist.h \ - $(top_srcdir)/include/sys/pathname.h \ - $(top_srcdir)/include/sys/qat.h \ - $(top_srcdir)/include/sys/range_tree.h \ - $(top_srcdir)/include/sys/refcount.h \ - $(top_srcdir)/include/sys/rrwlock.h \ - $(top_srcdir)/include/sys/sa.h \ - $(top_srcdir)/include/sys/sa_impl.h \ - $(top_srcdir)/include/sys/skein.h \ - $(top_srcdir)/include/sys/spa_boot.h \ - $(top_srcdir)/include/sys/spa_checkpoint.h \ - $(top_srcdir)/include/sys/spa_log_spacemap.h \ - $(top_srcdir)/include/sys/space_map.h \ - $(top_srcdir)/include/sys/space_reftree.h \ - $(top_srcdir)/include/sys/spa.h \ - $(top_srcdir)/include/sys/spa_impl.h \ - $(top_srcdir)/include/sys/spa_checksum.h \ - $(top_srcdir)/include/sys/sysevent.h \ - $(top_srcdir)/include/sys/txg.h \ - $(top_srcdir)/include/sys/txg_impl.h \ - $(top_srcdir)/include/sys/u8_textprep_data.h \ - $(top_srcdir)/include/sys/u8_textprep.h \ - $(top_srcdir)/include/sys/uberblock.h \ - $(top_srcdir)/include/sys/uberblock_impl.h \ - $(top_srcdir)/include/sys/uio_impl.h \ - $(top_srcdir)/include/sys/unique.h \ - $(top_srcdir)/include/sys/uuid.h \ - $(top_srcdir)/include/sys/vdev_disk.h \ - $(top_srcdir)/include/sys/vdev_file.h \ - $(top_srcdir)/include/sys/vdev.h \ - $(top_srcdir)/include/sys/vdev_impl.h \ - $(top_srcdir)/include/sys/vdev_indirect_births.h \ - $(top_srcdir)/include/sys/vdev_indirect_mapping.h \ - $(top_srcdir)/include/sys/vdev_initialize.h \ - $(top_srcdir)/include/sys/vdev_raidz.h \ - $(top_srcdir)/include/sys/vdev_raidz_impl.h \ - $(top_srcdir)/include/sys/vdev_removal.h \ - $(top_srcdir)/include/sys/vdev_trim.h \ - $(top_srcdir)/include/sys/xvattr.h \ - $(top_srcdir)/include/sys/zap.h \ - $(top_srcdir)/include/sys/zap_impl.h \ - $(top_srcdir)/include/sys/zap_leaf.h \ - $(top_srcdir)/include/sys/zcp.h \ - $(top_srcdir)/include/sys/zcp_global.h \ - $(top_srcdir)/include/sys/zcp_iter.h \ - $(top_srcdir)/include/sys/zcp_prop.h \ - $(top_srcdir)/include/sys/zcp_set.h \ - $(top_srcdir)/include/sys/zfeature.h \ - $(top_srcdir)/include/sys/zfs_acl.h \ - $(top_srcdir)/include/sys/zfs_context.h \ - $(top_srcdir)/include/sys/zfs_debug.h \ - $(top_srcdir)/include/sys/zfs_delay.h \ - $(top_srcdir)/include/sys/zfs_file.h \ - $(top_srcdir)/include/sys/zfs_fuid.h \ - $(top_srcdir)/include/sys/zfs_project.h \ - $(top_srcdir)/include/sys/zfs_quota.h \ - $(top_srcdir)/include/sys/zfs_ratelimit.h \ - $(top_srcdir)/include/sys/zfs_rlock.h \ - $(top_srcdir)/include/sys/zfs_sa.h \ - $(top_srcdir)/include/sys/zfs_stat.h \ - $(top_srcdir)/include/sys/zfs_sysfs.h \ - $(top_srcdir)/include/sys/zfs_znode.h \ - $(top_srcdir)/include/sys/zil.h \ - $(top_srcdir)/include/sys/zil_impl.h \ - $(top_srcdir)/include/sys/zio_checksum.h \ - $(top_srcdir)/include/sys/zio_compress.h \ - $(top_srcdir)/include/sys/zio_crypt.h \ - $(top_srcdir)/include/sys/zio.h \ - $(top_srcdir)/include/sys/zio_impl.h \ - $(top_srcdir)/include/sys/zio_priority.h \ - $(top_srcdir)/include/sys/zrlock.h \ - $(top_srcdir)/include/sys/zthr.h + abd.h \ + abd_impl.h \ + aggsum.h \ + arc.h \ + arc_impl.h \ + avl.h \ + avl_impl.h \ + bitops.h \ + blkptr.h \ + bplist.h \ + bpobj.h \ + bptree.h \ + btree.h \ + bqueue.h \ + dataset_kstats.h \ + dbuf.h \ + ddt.h \ + dmu.h \ + dmu_impl.h \ + dmu_objset.h \ + dmu_recv.h \ + dmu_redact.h \ + dmu_send.h \ + dmu_traverse.h \ + dmu_tx.h \ + dmu_zfetch.h \ + dnode.h \ + dsl_bookmark.h \ + dsl_dataset.h \ + dsl_deadlist.h \ + dsl_deleg.h \ + dsl_destroy.h \ + dsl_dir.h \ + dsl_crypt.h \ + dsl_pool.h \ + dsl_prop.h \ + dsl_scan.h \ + dsl_synctask.h \ + dsl_userhold.h \ + edonr.h \ + efi_partition.h \ + frame.h \ + hkdf.h \ + metaslab.h \ + metaslab_impl.h \ + mmp.h \ + mntent.h \ + mod.h \ + multilist.h \ + note.h \ + nvpair.h \ + nvpair_impl.h \ + objlist.h \ + pathname.h \ + qat.h \ + range_tree.h \ + refcount.h \ + rrwlock.h \ + sa.h \ + sa_impl.h \ + skein.h \ + spa_boot.h \ + spa_checkpoint.h \ + spa_log_spacemap.h \ + space_map.h \ + space_reftree.h \ + spa.h \ + spa_impl.h \ + spa_checksum.h \ + sysevent.h \ + txg.h \ + txg_impl.h \ + u8_textprep_data.h \ + u8_textprep.h \ + uberblock.h \ + uberblock_impl.h \ + uio_impl.h \ + unique.h \ + uuid.h \ + vdev_disk.h \ + vdev_file.h \ + vdev.h \ + vdev_impl.h \ + vdev_indirect_births.h \ + vdev_indirect_mapping.h \ + vdev_initialize.h \ + vdev_raidz.h \ + vdev_raidz_impl.h \ + vdev_removal.h \ + vdev_trim.h \ + xvattr.h \ + zap.h \ + zap_impl.h \ + zap_leaf.h \ + zcp.h \ + zcp_global.h \ + zcp_iter.h \ + zcp_prop.h \ + zcp_set.h \ + zfeature.h \ + zfs_acl.h \ + zfs_context.h \ + zfs_debug.h \ + zfs_delay.h \ + zfs_file.h \ + zfs_fuid.h \ + zfs_project.h \ + zfs_quota.h \ + zfs_ratelimit.h \ + zfs_rlock.h \ + zfs_sa.h \ + zfs_stat.h \ + zfs_sysfs.h \ + zfs_znode.h \ + zil.h \ + zil_impl.h \ + zio_checksum.h \ + zio_compress.h \ + zio_crypt.h \ + zio.h \ + zio_impl.h \ + zio_priority.h \ + zrlock.h \ + zthr.h KERNEL_H = \ - $(top_srcdir)/include/sys/zfs_ioctl.h \ - $(top_srcdir)/include/sys/zfs_ioctl_impl.h \ - $(top_srcdir)/include/sys/zfs_onexit.h \ - $(top_srcdir)/include/sys/zvol.h \ - $(top_srcdir)/include/sys/zvol_impl.h + zfs_ioctl.h \ + zfs_ioctl_impl.h \ + zfs_onexit.h \ + zvol.h \ + zvol_impl.h USER_H = diff --git a/include/sys/crypto/Makefile.am b/include/sys/crypto/Makefile.am index 7f8156b8f..60dc3e137 100644 --- a/include/sys/crypto/Makefile.am +++ b/include/sys/crypto/Makefile.am @@ -1,7 +1,7 @@ COMMON_H = \ - $(top_srcdir)/include/sys/crypto/api.h \ - $(top_srcdir)/include/sys/crypto/common.h \ - $(top_srcdir)/include/sys/crypto/icp.h + api.h \ + common.h \ + icp.h KERNEL_H = diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am index 8bca5d846..718f23fb0 100644 --- a/include/sys/fm/Makefile.am +++ b/include/sys/fm/Makefile.am @@ -1,8 +1,8 @@ SUBDIRS = fs COMMON_H = \ - $(top_srcdir)/include/sys/fm/protocol.h \ - $(top_srcdir)/include/sys/fm/util.h + protocol.h \ + util.h KERNEL_H = diff --git a/include/sys/fm/fs/Makefile.am b/include/sys/fm/fs/Makefile.am index fdc9eb545..d9adcd1fe 100644 --- a/include/sys/fm/fs/Makefile.am +++ b/include/sys/fm/fs/Makefile.am @@ -1,5 +1,5 @@ COMMON_H = \ - $(top_srcdir)/include/sys/fm/fs/zfs.h + zfs.h KERNEL_H = diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am index 0859b9f67..4d9400ee6 100644 --- a/include/sys/fs/Makefile.am +++ b/include/sys/fs/Makefile.am @@ -1,5 +1,5 @@ COMMON_H = \ - $(top_srcdir)/include/sys/fs/zfs.h + zfs.h KERNEL_H = diff --git a/include/sys/lua/Makefile.am b/include/sys/lua/Makefile.am index 5f224dcb1..85f7c74e0 100644 --- a/include/sys/lua/Makefile.am +++ b/include/sys/lua/Makefile.am @@ -1,8 +1,8 @@ COMMON_H = \ - $(top_srcdir)/include/sys/lua/lua.h \ - $(top_srcdir)/include/sys/lua/luaconf.h \ - $(top_srcdir)/include/sys/lua/lualib.h \ - $(top_srcdir)/include/sys/lua/lauxlib.h + lua.h \ + luaconf.h \ + lualib.h \ + lauxlib.h KERNEL_H = diff --git a/include/sys/sysevent/Makefile.am b/include/sys/sysevent/Makefile.am index e9af2684f..348539782 100644 --- a/include/sys/sysevent/Makefile.am +++ b/include/sys/sysevent/Makefile.am @@ -1,6 +1,6 @@ COMMON_H = \ - $(top_srcdir)/include/sys/sysevent/eventdefs.h \ - $(top_srcdir)/include/sys/sysevent/dev.h + eventdefs.h \ + dev.h KERNEL_H = diff --git a/lib/libspl/include/Makefile.am b/lib/libspl/include/Makefile.am index 2fd0c15ff..9ca08b2bc 100644 --- a/lib/libspl/include/Makefile.am +++ b/lib/libspl/include/Makefile.am @@ -2,21 +2,21 @@ SUBDIRS = ia32 rpc sys util os libspldir = $(includedir)/libspl libspl_HEADERS = \ - $(top_srcdir)/lib/libspl/include/assert.h \ - $(top_srcdir)/lib/libspl/include/atomic.h \ - $(top_srcdir)/lib/libspl/include/libdevinfo.h \ - $(top_srcdir)/lib/libspl/include/libgen.h \ - $(top_srcdir)/lib/libspl/include/libshare.h \ - $(top_srcdir)/lib/libspl/include/limits.h \ - $(top_srcdir)/lib/libspl/include/locale.h \ - $(top_srcdir)/lib/libspl/include/statcommon.h \ - $(top_srcdir)/lib/libspl/include/stdio.h \ - $(top_srcdir)/lib/libspl/include/stdlib.h \ - $(top_srcdir)/lib/libspl/include/string.h \ - $(top_srcdir)/lib/libspl/include/stropts.h \ - $(top_srcdir)/lib/libspl/include/thread.h \ - $(top_srcdir)/lib/libspl/include/tzfile.h \ - $(top_srcdir)/lib/libspl/include/ucred.h \ - $(top_srcdir)/lib/libspl/include/umem.h \ - $(top_srcdir)/lib/libspl/include/unistd.h \ - $(top_srcdir)/lib/libspl/include/zone.h + assert.h \ + atomic.h \ + libdevinfo.h \ + libgen.h \ + libshare.h \ + limits.h \ + locale.h \ + statcommon.h \ + stdio.h \ + stdlib.h \ + string.h \ + stropts.h \ + thread.h \ + tzfile.h \ + ucred.h \ + umem.h \ + unistd.h \ + zone.h diff --git a/lib/libspl/include/ia32/sys/Makefile.am b/lib/libspl/include/ia32/sys/Makefile.am index c8136ee2a..683288460 100644 --- a/lib/libspl/include/ia32/sys/Makefile.am +++ b/lib/libspl/include/ia32/sys/Makefile.am @@ -1,3 +1,3 @@ libspldir = $(includedir)/libspl/ia32/sys libspl_HEADERS = \ - $(top_srcdir)/lib/libspl/include/ia32/sys/asm_linkage.h + asm_linkage.h diff --git a/lib/libspl/include/os/freebsd/sys/Makefile.am b/lib/libspl/include/os/freebsd/sys/Makefile.am index 1f85b208e..6775522f5 100644 --- a/lib/libspl/include/os/freebsd/sys/Makefile.am +++ b/lib/libspl/include/os/freebsd/sys/Makefile.am @@ -1,11 +1,11 @@ libspldir = $(includedir)/libspl/sys libspl_HEADERS = \ - $(top_srcdir)/lib/libspl/include/os/freebsd/sys/byteorder.h \ - $(top_srcdir)/lib/libspl/include/os/freebsd/sys/file.h \ - $(top_srcdir)/lib/libspl/include/os/freebsd/sys/mnttab.h \ - $(top_srcdir)/lib/libspl/include/os/freebsd/sys/mount.h \ - $(top_srcdir)/lib/libspl/include/os/freebsd/sys/param.h \ - $(top_srcdir)/lib/libspl/include/os/freebsd/sys/stat.h \ - $(top_srcdir)/lib/libspl/include/os/freebsd/sys/sysmacros.h \ - $(top_srcdir)/lib/libspl/include/os/freebsd/sys/vfs.h \ - $(top_srcdir)/lib/libspl/include/os/freebsd/sys/zfs_context_os.h + byteorder.h \ + file.h \ + mnttab.h \ + mount.h \ + param.h \ + stat.h \ + sysmacros.h \ + vfs.h \ + zfs_context_os.h diff --git a/lib/libspl/include/os/linux/sys/Makefile.am b/lib/libspl/include/os/linux/sys/Makefile.am index b7019fc37..1ec07a76d 100644 --- a/lib/libspl/include/os/linux/sys/Makefile.am +++ b/lib/libspl/include/os/linux/sys/Makefile.am @@ -1,10 +1,10 @@ libspldir = $(includedir)/libspl/sys libspl_HEADERS = \ - $(top_srcdir)/lib/libspl/include/os/linux/sys/byteorder.h \ - $(top_srcdir)/lib/libspl/include/os/linux/sys/errno.h \ - $(top_srcdir)/lib/libspl/include/os/linux/sys/mnttab.h \ - $(top_srcdir)/lib/libspl/include/os/linux/sys/mount.h \ - $(top_srcdir)/lib/libspl/include/os/linux/sys/param.h \ - $(top_srcdir)/lib/libspl/include/os/linux/sys/stat.h \ - $(top_srcdir)/lib/libspl/include/os/linux/sys/sysmacros.h \ - $(top_srcdir)/lib/libspl/include/os/linux/sys/zfs_context_os.h + byteorder.h \ + errno.h \ + mnttab.h \ + mount.h \ + param.h \ + stat.h \ + sysmacros.h \ + zfs_context_os.h diff --git a/lib/libspl/include/rpc/Makefile.am b/lib/libspl/include/rpc/Makefile.am index 78ee5a29e..7fe1d7fea 100644 --- a/lib/libspl/include/rpc/Makefile.am +++ b/lib/libspl/include/rpc/Makefile.am @@ -1,3 +1,3 @@ libspldir = $(includedir)/libspl/rpc libspl_HEADERS = \ - $(top_srcdir)/lib/libspl/include/rpc/xdr.h + xdr.h diff --git a/lib/libspl/include/sys/Makefile.am b/lib/libspl/include/sys/Makefile.am index 5125b8ac3..53a36f6bf 100644 --- a/lib/libspl/include/sys/Makefile.am +++ b/lib/libspl/include/sys/Makefile.am @@ -2,46 +2,46 @@ SUBDIRS = dktp libspldir = $(includedir)/libspl/sys libspl_HEADERS = \ - $(top_srcdir)/lib/libspl/include/sys/acl.h \ - $(top_srcdir)/lib/libspl/include/sys/acl_impl.h \ - $(top_srcdir)/lib/libspl/include/sys/callb.h \ - $(top_srcdir)/lib/libspl/include/sys/cmn_err.h \ - $(top_srcdir)/lib/libspl/include/sys/cred.h \ - $(top_srcdir)/lib/libspl/include/sys/debug.h \ - $(top_srcdir)/lib/libspl/include/sys/dkio.h \ - $(top_srcdir)/lib/libspl/include/sys/dklabel.h \ - $(top_srcdir)/lib/libspl/include/sys/feature_tests.h \ - $(top_srcdir)/lib/libspl/include/sys/int_limits.h \ - $(top_srcdir)/lib/libspl/include/sys/int_types.h \ - $(top_srcdir)/lib/libspl/include/sys/inttypes.h \ - $(top_srcdir)/lib/libspl/include/sys/isa_defs.h \ - $(top_srcdir)/lib/libspl/include/sys/kmem.h \ - $(top_srcdir)/lib/libspl/include/sys/kstat.h \ - $(top_srcdir)/lib/libspl/include/sys/list.h \ - $(top_srcdir)/lib/libspl/include/sys/list_impl.h \ - $(top_srcdir)/lib/libspl/include/sys/mhd.h \ - $(top_srcdir)/lib/libspl/include/sys/mkdev.h \ - $(top_srcdir)/lib/libspl/include/sys/policy.h \ - $(top_srcdir)/lib/libspl/include/sys/poll.h \ - $(top_srcdir)/lib/libspl/include/sys/priv.h \ - $(top_srcdir)/lib/libspl/include/sys/processor.h \ - $(top_srcdir)/lib/libspl/include/sys/sha2.h \ - $(top_srcdir)/lib/libspl/include/sys/simd.h \ - $(top_srcdir)/lib/libspl/include/sys/stack.h \ - $(top_srcdir)/lib/libspl/include/sys/stdtypes.h \ - $(top_srcdir)/lib/libspl/include/sys/strings.h \ - $(top_srcdir)/lib/libspl/include/sys/stropts.h \ - $(top_srcdir)/lib/libspl/include/sys/sunddi.h \ - $(top_srcdir)/lib/libspl/include/sys/systeminfo.h \ - $(top_srcdir)/lib/libspl/include/sys/time.h \ - $(top_srcdir)/lib/libspl/include/sys/trace_spl.h \ - $(top_srcdir)/lib/libspl/include/sys/trace_zfs.h \ - $(top_srcdir)/lib/libspl/include/sys/types32.h \ - $(top_srcdir)/lib/libspl/include/sys/types.h \ - $(top_srcdir)/lib/libspl/include/sys/tzfile.h \ - $(top_srcdir)/lib/libspl/include/sys/uio.h \ - $(top_srcdir)/lib/libspl/include/sys/va_list.h \ - $(top_srcdir)/lib/libspl/include/sys/varargs.h \ - $(top_srcdir)/lib/libspl/include/sys/vnode.h \ - $(top_srcdir)/lib/libspl/include/sys/vtoc.h \ - $(top_srcdir)/lib/libspl/include/sys/zone.h + acl.h \ + acl_impl.h \ + callb.h \ + cmn_err.h \ + cred.h \ + debug.h \ + dkio.h \ + dklabel.h \ + feature_tests.h \ + int_limits.h \ + int_types.h \ + inttypes.h \ + isa_defs.h \ + kmem.h \ + kstat.h \ + list.h \ + list_impl.h \ + mhd.h \ + mkdev.h \ + policy.h \ + poll.h \ + priv.h \ + processor.h \ + sha2.h \ + simd.h \ + stack.h \ + stdtypes.h \ + strings.h \ + stropts.h \ + sunddi.h \ + systeminfo.h \ + time.h \ + trace_spl.h \ + trace_zfs.h \ + types32.h \ + types.h \ + tzfile.h \ + uio.h \ + va_list.h \ + varargs.h \ + vnode.h \ + vtoc.h \ + zone.h diff --git a/lib/libspl/include/sys/dktp/Makefile.am b/lib/libspl/include/sys/dktp/Makefile.am index 9887675c4..4ad3695d8 100644 --- a/lib/libspl/include/sys/dktp/Makefile.am +++ b/lib/libspl/include/sys/dktp/Makefile.am @@ -1,4 +1,4 @@ libspldir = $(includedir)/libspl/sys/dktp libspl_HEADERS = \ - $(top_srcdir)/lib/libspl/include/sys/dktp/fdisk.h + fdisk.h diff --git a/lib/libspl/include/util/Makefile.am b/lib/libspl/include/util/Makefile.am index 060e143a8..ab553bc80 100644 --- a/lib/libspl/include/util/Makefile.am +++ b/lib/libspl/include/util/Makefile.am @@ -1,3 +1,3 @@ libspldir = $(includedir)/libspl libspl_HEADERS = \ - $(top_srcdir)/lib/libspl/include/util/sscanf.h + sscanf.h diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 176304439..2ef9071f1 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -1,11 +1,11 @@ pkgdatadir = $(datadir)/@PACKAGE@ dist_pkgdata_SCRIPTS = \ - $(top_srcdir)/scripts/zimport.sh \ - $(top_srcdir)/scripts/zfs.sh \ - $(top_srcdir)/scripts/zfs-tests.sh \ - $(top_srcdir)/scripts/zloop.sh \ - $(top_srcdir)/scripts/zfs-helpers.sh + zimport.sh \ + zfs.sh \ + zfs-tests.sh \ + zloop.sh \ + zfs-helpers.sh EXTRA_DIST = \ commitcheck.sh \ diff --git a/udev/rules.d/Makefile.am b/udev/rules.d/Makefile.am index 86c33fc69..4d536f5de 100644 --- a/udev/rules.d/Makefile.am +++ b/udev/rules.d/Makefile.am @@ -4,9 +4,9 @@ udevrule_DATA = \ 90-zfs.rules EXTRA_DIST = \ - $(top_srcdir)/udev/rules.d/69-vdev.rules.in \ - $(top_srcdir)/udev/rules.d/60-zvol.rules.in \ - $(top_srcdir)/udev/rules.d/90-zfs.rules.in + 69-vdev.rules.in \ + 60-zvol.rules.in \ + 90-zfs.rules.in $(udevrule_DATA):%:%.in -$(SED) -e 's,@bindir\@,$(bindir),g' \