From fbf2338b24ac8f1c2de58a604d2e2f4046209e86 Mon Sep 17 00:00:00 2001 From: Turbo Fredriksson Date: Mon, 9 Jun 2014 23:55:31 +0200 Subject: [PATCH] Add VPATH and remove $(top_srcdir)/... to make sure it's possible to do the build in a different directory and not clutter the source with build results (such as Makefiles, *.o and *.a files etc). Closes: #1082 --- Makefile.am | 11 +- cmd/Makefile.am | 2 + cmd/arcstat/Makefile.am | 4 +- cmd/dbufstat/Makefile.am | 4 +- cmd/fsck_zfs/Makefile.am | 4 +- cmd/vdev_id/Makefile.am | 4 +- config/Rules.am | 2 + dracut/90zfs/Makefile.am | 10 +- dracut/Makefile.am | 2 + etc/Makefile.am | 2 + etc/init.d/Makefile.am | 12 +- etc/modules-load.d/Makefile.am | 6 +- etc/systemd/Makefile.am | 2 + etc/systemd/system/Makefile.am | 30 ++-- etc/zfs/Makefile.am | 10 +- include/Makefile.am | 32 ++-- include/linux/Makefile.am | 10 +- include/sys/Makefile.am | 162 ++++++++++---------- include/sys/fm/Makefile.am | 6 +- include/sys/fm/fs/Makefile.am | 4 +- include/sys/fs/Makefile.am | 4 +- lib/Makefile.am | 2 + lib/libspl/asm-generic/Makefile.am | 2 +- lib/libspl/asm-i386/Makefile.am | 4 +- lib/libspl/asm-x86_64/Makefile.am | 5 +- lib/libspl/include/Makefile.am | 50 +++--- lib/libspl/include/ia32/Makefile.am | 2 + lib/libspl/include/ia32/sys/Makefile.am | 4 +- lib/libspl/include/rpc/Makefile.am | 6 +- lib/libspl/include/sys/Makefile.am | 104 +++++++------ lib/libspl/include/sys/dktp/Makefile.am | 4 +- lib/libspl/include/sys/sysevent/Makefile.am | 4 +- lib/libspl/include/util/Makefile.am | 4 +- man/Makefile.am | 2 + man/man1/Makefile.am | 11 +- man/man5/Makefile.am | 7 +- man/man8/Makefile.am | 20 +-- module/Makefile.in | 2 + module/avl/Makefile.in | 2 + module/nvpair/Makefile.in | 2 + module/unicode/Makefile.in | 2 + module/zcommon/Makefile.in | 2 + module/zfs/Makefile.in | 2 + module/zpios/Makefile.in | 2 + rpm/Makefile.am | 2 + rpm/fedora/Makefile.am | 2 + rpm/generic/Makefile.am | 2 + scripts/Makefile.am | 20 +-- scripts/zpios-profile/Makefile.am | 12 +- scripts/zpios-test/Makefile.am | 24 +-- scripts/zpool-config/Makefile.am | 58 +++---- udev/Makefile.am | 2 + udev/rules.d/Makefile.am | 10 +- 53 files changed, 406 insertions(+), 294 deletions(-) diff --git a/Makefile.am b/Makefile.am index dfb006b75745..d3f63918e1e5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,10 @@ +VPATH = @abs_top_srcdir@ ACLOCAL_AMFLAGS = -I config -include $(top_srcdir)/config/rpm.am -include $(top_srcdir)/config/deb.am -include $(top_srcdir)/config/tgz.am +include config/rpm.am +include config/deb.am +include config/tgz.am SUBDIRS = include rpm if CONFIG_USER @@ -45,11 +46,11 @@ checkstyle: ! -name '*.mod.c' -type f -exec scripts/cstyle.pl {} \+ ctags: - $(RM) $(top_srcdir)/tags + $(RM) tags find $(top_srcdir) -name .git -prune -o -name '*.[hc]' | xargs ctags etags: - $(RM) $(top_srcdir)/TAGS + $(RM) TAGS find $(top_srcdir) -name .pc -prune -o -name '*.[hc]' | xargs etags -a tags: ctags etags diff --git a/cmd/Makefile.am b/cmd/Makefile.am index 968c6c181a8c..64c0f4d59966 100644 --- a/cmd/Makefile.am +++ b/cmd/Makefile.am @@ -1,2 +1,4 @@ +VPATH = @abs_top_srcdir@ + SUBDIRS = zfs zpool zdb zhack zinject zstreamdump ztest zpios SUBDIRS += mount_zfs fsck_zfs zvol_id vdev_id arcstat dbufstat zed diff --git a/cmd/arcstat/Makefile.am b/cmd/arcstat/Makefile.am index 802b8e1d9e01..ce17d8082eef 100644 --- a/cmd/arcstat/Makefile.am +++ b/cmd/arcstat/Makefile.am @@ -1,2 +1,4 @@ -bin_SCRIPTS = arcstat.py +VPATH = @abs_top_srcdir@ + +bin_SCRIPTS = $(top_srcdir)/cmd/arcstat/arcstat.py EXTRA_DIST = $(bin_SCRIPTS) diff --git a/cmd/dbufstat/Makefile.am b/cmd/dbufstat/Makefile.am index 0548b240c308..76de885a22d2 100644 --- a/cmd/dbufstat/Makefile.am +++ b/cmd/dbufstat/Makefile.am @@ -1,2 +1,4 @@ -bin_SCRIPTS = dbufstat.py +VPATH = @abs_top_srcdir@ + +bin_SCRIPTS = $(top_srcdir)/cmd/dbufstat/dbufstat.py EXTRA_DIST = $(bin_SCRIPTS) diff --git a/cmd/fsck_zfs/Makefile.am b/cmd/fsck_zfs/Makefile.am index 2380f56fa4d4..ddc8884919ba 100644 --- a/cmd/fsck_zfs/Makefile.am +++ b/cmd/fsck_zfs/Makefile.am @@ -1 +1,3 @@ -dist_sbin_SCRIPTS = fsck.zfs +VPATH = @abs_top_srcdir@ + +dist_sbin_SCRIPTS = $(top_srcdir)/cmd/fsck_zfs/fsck.zfs diff --git a/cmd/vdev_id/Makefile.am b/cmd/vdev_id/Makefile.am index fb815faad084..9ea5fea7547d 100644 --- a/cmd/vdev_id/Makefile.am +++ b/cmd/vdev_id/Makefile.am @@ -1 +1,3 @@ -dist_udev_SCRIPTS = vdev_id +VPATH = @abs_top_srcdir@ + +dist_udev_SCRIPTS = $(top_srcdir)/cmd/vdev_id/vdev_id diff --git a/config/Rules.am b/config/Rules.am index 4fb40c4e456a..c120074a3651 100644 --- a/config/Rules.am +++ b/config/Rules.am @@ -1,3 +1,5 @@ +VPATH = @abs_top_srcdir@ + DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h AM_LIBTOOLFLAGS = --silent diff --git a/dracut/90zfs/Makefile.am b/dracut/90zfs/Makefile.am index 759aae81dcbf..5a9dd225b68a 100644 --- a/dracut/90zfs/Makefile.am +++ b/dracut/90zfs/Makefile.am @@ -1,8 +1,10 @@ +VPATH = @abs_top_srcdir@ + pkgdracutdir = $(dracutdir)/modules.d/90zfs pkgdracut_SCRIPTS = \ - $(top_srcdir)/dracut/90zfs/module-setup.sh \ - $(top_srcdir)/dracut/90zfs/mount-zfs.sh \ - $(top_srcdir)/dracut/90zfs/parse-zfs.sh + module-setup.sh \ + mount-zfs.sh \ + parse-zfs.sh EXTRA_DIST = \ $(top_srcdir)/dracut/90zfs/module-setup.sh.in \ @@ -15,7 +17,7 @@ $(pkgdracut_SCRIPTS): -e 's,@udevdir\@,$(udevdir),g' \ -e 's,@udevruledir\@,$(udevruledir),g' \ -e 's,@sysconfdir\@,$(sysconfdir),g' \ - '$@.in' >'$@' + "$(abs_top_srcdir)/dracut/90zfs/$@.in' >'$@' distclean-local:: -$(RM) $(pkgdracut_SCRIPTS) diff --git a/dracut/Makefile.am b/dracut/Makefile.am index 35b88c36fbc0..899b85008c2d 100644 --- a/dracut/Makefile.am +++ b/dracut/Makefile.am @@ -1,3 +1,5 @@ +VPATH = @abs_top_srcdir@ + SUBDIRS = 90zfs EXTRA_DIST = README.dracut.markdown diff --git a/etc/Makefile.am b/etc/Makefile.am index a62678b4e561..8e75d09707f3 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -1,2 +1,4 @@ +VPATH = @abs_top_srcdir@ + SUBDIRS = zfs $(ZFS_INIT_SYSTEMD) $(ZFS_INIT_SYSV) $(ZFS_MODULE_LOAD) DIST_SUBDIRS = init.d zfs systemd modules-load.d diff --git a/etc/init.d/Makefile.am b/etc/init.d/Makefile.am index 72093484c477..43879a87a8aa 100644 --- a/etc/init.d/Makefile.am +++ b/etc/init.d/Makefile.am @@ -1,12 +1,14 @@ +VPATH = @abs_top_srcdir@ + initdir = $(DEFAULT_INIT_DIR) init_SCRIPTS = zfs EXTRA_DIST = \ - $(top_srcdir)/etc/init.d/zfs.fedora.in \ - $(top_srcdir)/etc/init.d/zfs.gentoo.in \ - $(top_srcdir)/etc/init.d/zfs.lsb.in \ - $(top_srcdir)/etc/init.d/zfs.lunar.in \ - $(top_srcdir)/etc/init.d/zfs.redhat.in + etc/init.d/zfs.fedora.in \ + etc/init.d/zfs.gentoo.in \ + etc/init.d/zfs.lsb.in \ + etc/init.d/zfs.lunar.in \ + etc/init.d/zfs.redhat.in $(init_SCRIPTS): -$(SED) -e 's,@bindir\@,$(bindir),g' \ diff --git a/etc/modules-load.d/Makefile.am b/etc/modules-load.d/Makefile.am index 980cb851995e..ec83e648044c 100644 --- a/etc/modules-load.d/Makefile.am +++ b/etc/modules-load.d/Makefile.am @@ -1,5 +1,7 @@ +VPATH = @abs_top_srcdir@ + modulesload_DATA = \ - $(top_srcdir)/etc/modules-load.d/zfs.conf + zfs.conf EXTRA_DIST = \ $(top_srcdir)/etc/modules-load.d/zfs.conf.in @@ -7,7 +9,7 @@ EXTRA_DIST = \ $(modulesload_DATA): -$(SED) \ -e '' \ - '$@.in' >'$@' + "$(top_srcdir)/etc/modules-load.d/$@.in" >'$@' distclean-local:: -$(RM) $(modulesload_DATA) diff --git a/etc/systemd/Makefile.am b/etc/systemd/Makefile.am index d4008c0dd037..d07e5a277412 100644 --- a/etc/systemd/Makefile.am +++ b/etc/systemd/Makefile.am @@ -1 +1,3 @@ +VPATH = @abs_top_srcdir@ + SUBDIRS = system diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am index b7a8db2435c3..54f587f01738 100644 --- a/etc/systemd/system/Makefile.am +++ b/etc/systemd/system/Makefile.am @@ -1,21 +1,23 @@ +VPATH = @abs_top_srcdir@ + systemdpreset_DATA = \ - $(top_srcdir)/etc/systemd/system/50-zfs.preset + etc/systemd/system/50-zfs.preset systemdunit_DATA = \ - $(top_srcdir)/etc/systemd/system/zed.service \ - $(top_srcdir)/etc/systemd/system/zfs-import-cache.service \ - $(top_srcdir)/etc/systemd/system/zfs-import-scan.service \ - $(top_srcdir)/etc/systemd/system/zfs-mount.service \ - $(top_srcdir)/etc/systemd/system/zfs-share.service \ - $(top_srcdir)/etc/systemd/system/zfs.target + etc/systemd/system/zed.service \ + etc/systemd/system/zfs-import-cache.service \ + etc/systemd/system/zfs-import-scan.service \ + etc/systemd/system/zfs-mount.service \ + etc/systemd/system/zfs-share.service \ + etc/systemd/system/zfs.target EXTRA_DIST = \ - $(top_srcdir)/etc/systemd/system/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.target.in \ - $(top_srcdir)/etc/systemd/system/50-zfs.preset.in + etc/systemd/system/zed.service.in \ + etc/systemd/system/zfs-import-cache.service.in \ + etc/systemd/system/zfs-import-scan.service.in \ + etc/systemd/system/zfs-mount.service.in \ + etc/systemd/system/zfs-share.service.in \ + etc/systemd/system/zfs.target.in \ + etc/systemd/system/50-zfs.preset.in $(systemdunit_DATA): -$(SED) -e 's,@bindir\@,$(bindir),g' \ diff --git a/etc/zfs/Makefile.am b/etc/zfs/Makefile.am index ff35469fe7bb..2daadf07c007 100644 --- a/etc/zfs/Makefile.am +++ b/etc/zfs/Makefile.am @@ -1,9 +1,11 @@ +VPATH = @abs_top_srcdir@ + pkgsysconfdir = $(sysconfdir)/zfs pkgsysconf_DATA = \ - vdev_id.conf.alias.example \ - vdev_id.conf.sas_direct.example \ - vdev_id.conf.sas_switch.example \ - vdev_id.conf.multipath.example + etc/zfs/vdev_id.conf.alias.example \ + etc/zfs/vdev_id.conf.sas_direct.example \ + etc/zfs/vdev_id.conf.sas_switch.example \ + etc/zfs/vdev_id.conf.multipath.example EXTRA_DIST = $(pkgsysconf_DATA) diff --git a/include/Makefile.am b/include/Makefile.am index 2e1c31aaf81c..65b67bcefee7 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,25 +1,27 @@ +VPATH = @abs_top_srcdir@ + SUBDIRS = linux sys COMMON_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 \ - $(top_srcdir)/include/zpios-ctl.h + include/zfeature_common.h \ + include/zfs_comutil.h \ + include/zfs_deleg.h \ + include/zfs_fletcher.h \ + include/zfs_namecheck.h \ + include/zfs_prop.h \ + include/zpios-ctl.h KERNEL_H = \ - $(top_srcdir)/include/zpios-internal.h + include/zpios-internal.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 + include/libnvpair.h \ + include/libuutil_common.h \ + include/libuutil.h \ + include/libuutil_impl.h \ + include/libzfs.h \ + include/libzfs_core.h \ + include/libzfs_impl.h EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am index c2a74912180c..64468eaac854 100644 --- a/include/linux/Makefile.am +++ b/include/linux/Makefile.am @@ -1,10 +1,12 @@ +VPATH = @abs_top_srcdir@ + COMMON_H = KERNEL_H = \ - $(top_srcdir)/include/linux/dcache_compat.h \ - $(top_srcdir)/include/linux/xattr_compat.h \ - $(top_srcdir)/include/linux/vfs_compat.h \ - $(top_srcdir)/include/linux/blkdev_compat.h + include/linux/dcache_compat.h \ + include/linux/xattr_compat.h \ + include/linux/vfs_compat.h \ + include/linux/blkdev_compat.h USER_H = diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am index 9d77566277bd..a55e1b0d6f03 100644 --- a/include/sys/Makefile.am +++ b/include/sys/Makefile.am @@ -1,89 +1,91 @@ +VPATH = @abs_top_srcdir@ + SUBDIRS = fm fs COMMON_H = \ - $(top_srcdir)/include/sys/arc.h \ - $(top_srcdir)/include/sys/avl.h \ - $(top_srcdir)/include/sys/avl_impl.h \ - $(top_srcdir)/include/sys/bplist.h \ - $(top_srcdir)/include/sys/bpobj.h \ - $(top_srcdir)/include/sys/bptree.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_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_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_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/efi_partition.h \ - $(top_srcdir)/include/sys/metaslab.h \ - $(top_srcdir)/include/sys/metaslab_impl.h \ - $(top_srcdir)/include/sys/nvpair.h \ - $(top_srcdir)/include/sys/nvpair_impl.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/spa_boot.h \ - $(top_srcdir)/include/sys/space_map.h \ - $(top_srcdir)/include/sys/spa.h \ - $(top_srcdir)/include/sys/spa_impl.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/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/zfeature.h \ - $(top_srcdir)/include/sys/zfs_acl.h \ - $(top_srcdir)/include/sys/zfs_context.h \ - $(top_srcdir)/include/sys/zfs_ctldir.h \ - $(top_srcdir)/include/sys/zfs_debug.h \ - $(top_srcdir)/include/sys/zfs_delay.h \ - $(top_srcdir)/include/sys/zfs_dir.h \ - $(top_srcdir)/include/sys/zfs_fuid.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_vfsops.h \ - $(top_srcdir)/include/sys/zfs_vnops.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.h \ - $(top_srcdir)/include/sys/zio_impl.h \ - $(top_srcdir)/include/sys/zrlock.h + include/sys/arc.h \ + include/sys/avl.h \ + include/sys/avl_impl.h \ + include/sys/bplist.h \ + include/sys/bpobj.h \ + include/sys/bptree.h \ + include/sys/dbuf.h \ + include/sys/ddt.h \ + include/sys/dmu.h \ + include/sys/dmu_impl.h \ + include/sys/dmu_objset.h \ + include/sys/dmu_send.h \ + include/sys/dmu_traverse.h \ + include/sys/dmu_tx.h \ + include/sys/dmu_zfetch.h \ + include/sys/dnode.h \ + include/sys/dsl_dataset.h \ + include/sys/dsl_deadlist.h \ + include/sys/dsl_deleg.h \ + include/sys/dsl_destroy.h \ + include/sys/dsl_dir.h \ + include/sys/dsl_pool.h \ + include/sys/dsl_prop.h \ + include/sys/dsl_scan.h \ + include/sys/dsl_synctask.h \ + include/sys/dsl_userhold.h \ + include/sys/efi_partition.h \ + include/sys/metaslab.h \ + include/sys/metaslab_impl.h \ + include/sys/nvpair.h \ + include/sys/nvpair_impl.h \ + include/sys/refcount.h \ + include/sys/rrwlock.h \ + include/sys/sa.h \ + include/sys/sa_impl.h \ + include/sys/spa_boot.h \ + include/sys/space_map.h \ + include/sys/spa.h \ + include/sys/spa_impl.h \ + include/sys/txg.h \ + include/sys/txg_impl.h \ + include/sys/u8_textprep_data.h \ + include/sys/u8_textprep.h \ + include/sys/uberblock.h \ + include/sys/uberblock_impl.h \ + include/sys/uio_impl.h \ + include/sys/unique.h \ + include/sys/uuid.h \ + include/sys/vdev_disk.h \ + include/sys/vdev_file.h \ + include/sys/vdev.h \ + include/sys/vdev_impl.h \ + include/sys/xvattr.h \ + include/sys/zap.h \ + include/sys/zap_impl.h \ + include/sys/zap_leaf.h \ + include/sys/zfeature.h \ + include/sys/zfs_acl.h \ + include/sys/zfs_context.h \ + include/sys/zfs_ctldir.h \ + include/sys/zfs_debug.h \ + include/sys/zfs_delay.h \ + include/sys/zfs_dir.h \ + include/sys/zfs_fuid.h \ + include/sys/zfs_rlock.h \ + include/sys/zfs_sa.h \ + include/sys/zfs_stat.h \ + include/sys/zfs_vfsops.h \ + include/sys/zfs_vnops.h \ + include/sys/zfs_znode.h \ + include/sys/zil.h \ + include/sys/zil_impl.h \ + include/sys/zio_checksum.h \ + include/sys/zio_compress.h \ + include/sys/zio.h \ + include/sys/zio_impl.h \ + include/sys/zrlock.h KERNEL_H = \ - $(top_srcdir)/include/sys/zfs_ioctl.h \ - $(top_srcdir)/include/sys/zfs_onexit.h \ + include/sys/zfs_ioctl.h \ + include/sys/zfs_onexit.h \ ${top_srcdir}/include/sys/zpl.h \ - $(top_srcdir)/include/sys/zvol.h + include/sys/zvol.h USER_H = diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am index 4dc58945d0e6..58c942bfc056 100644 --- a/include/sys/fm/Makefile.am +++ b/include/sys/fm/Makefile.am @@ -1,8 +1,10 @@ +VPATH = @abs_top_srcdir@ + SUBDIRS = fs COMMON_H = \ - $(top_srcdir)/include/sys/fm/protocol.h \ - $(top_srcdir)/include/sys/fm/util.h + include/sys/fm/protocol.h \ + include/sys/fm/util.h KERNEL_H = diff --git a/include/sys/fm/fs/Makefile.am b/include/sys/fm/fs/Makefile.am index 76b525fe68ef..421ef42397e5 100644 --- a/include/sys/fm/fs/Makefile.am +++ b/include/sys/fm/fs/Makefile.am @@ -1,5 +1,7 @@ +VPATH = @abs_top_srcdir@ + COMMON_H = \ - $(top_srcdir)/include/sys/fm/fs/zfs.h + include/sys/fm/fs/zfs.h KERNEL_H = diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am index c9fdf128d743..e9d9a51ea284 100644 --- a/include/sys/fs/Makefile.am +++ b/include/sys/fs/Makefile.am @@ -1,5 +1,7 @@ +VPATH = @abs_top_srcdir@ + COMMON_H = \ - $(top_srcdir)/include/sys/fs/zfs.h + include/sys/fs/zfs.h KERNEL_H = diff --git a/lib/Makefile.am b/lib/Makefile.am index 8e7caf2a16e9..10b81660a126 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,3 +1,5 @@ +VPATH = @abs_top_srcdir@ + # NB: GNU Automake Manual, Chapter 8.3.5: Libtool Convenience Libraries # These five libraries are intermediary build components. SUBDIRS = libspl libavl libefi libshare libunicode diff --git a/lib/libspl/asm-generic/Makefile.am b/lib/libspl/asm-generic/Makefile.am index 17fe501fa183..ce427cc6ac94 100644 --- a/lib/libspl/asm-generic/Makefile.am +++ b/lib/libspl/asm-generic/Makefile.am @@ -1,7 +1,7 @@ include $(top_srcdir)/config/Rules.am DEFAULT_INCLUDES += \ - -I$(top_srcdir)/lib/libspl/include + -Ilib/libspl/include atomic_SOURCE = atomic.c atomic_ASM = atomic.S diff --git a/lib/libspl/asm-i386/Makefile.am b/lib/libspl/asm-i386/Makefile.am index 417b640bc448..69f6c1dddc47 100644 --- a/lib/libspl/asm-i386/Makefile.am +++ b/lib/libspl/asm-i386/Makefile.am @@ -1 +1,3 @@ -noinst_HEADERS = $(top_srcdir)/lib/libspl/asm-i386/*.S +VPATH = @abs_top_srcdir@ + +noinst_HEADERS = lib/libspl/asm-i386/*.S diff --git a/lib/libspl/asm-x86_64/Makefile.am b/lib/libspl/asm-x86_64/Makefile.am index 339c18d7ccb0..3a061e638b36 100644 --- a/lib/libspl/asm-x86_64/Makefile.am +++ b/lib/libspl/asm-x86_64/Makefile.am @@ -1 +1,4 @@ -noinst_HEADERS = $(top_srcdir)/lib/libspl/asm-x86_64/*.S +VPATH = @abs_top_srcdir@ + +noinst_HEADERS = \ + $(top_srcdir)/lib/libspl/asm-x86_64/*.S diff --git a/lib/libspl/include/Makefile.am b/lib/libspl/include/Makefile.am index 626a8f46b001..1ae733bf14cc 100644 --- a/lib/libspl/include/Makefile.am +++ b/lib/libspl/include/Makefile.am @@ -1,28 +1,30 @@ +VPATH = @abs_top_srcdir@ + SUBDIRS = ia32 rpc sys util libspldir = $(includedir)/libspl libspl_HEADERS = \ - $(top_srcdir)/lib/libspl/include/assert.h \ - $(top_srcdir)/lib/libspl/include/atomic.h \ - $(top_srcdir)/lib/libspl/include/attr.h \ - $(top_srcdir)/lib/libspl/include/devid.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/note.h \ - $(top_srcdir)/lib/libspl/include/priv.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/strings.h \ - $(top_srcdir)/lib/libspl/include/stropts.h \ - $(top_srcdir)/lib/libspl/include/synch.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 + lib/libspl/include/assert.h \ + lib/libspl/include/atomic.h \ + lib/libspl/include/attr.h \ + lib/libspl/include/devid.h \ + lib/libspl/include/libdevinfo.h \ + lib/libspl/include/libgen.h \ + lib/libspl/include/libshare.h \ + lib/libspl/include/limits.h \ + lib/libspl/include/locale.h \ + lib/libspl/include/note.h \ + lib/libspl/include/priv.h \ + lib/libspl/include/statcommon.h \ + lib/libspl/include/stdio.h \ + lib/libspl/include/stdlib.h \ + lib/libspl/include/string.h \ + lib/libspl/include/strings.h \ + lib/libspl/include/stropts.h \ + lib/libspl/include/synch.h \ + lib/libspl/include/thread.h \ + lib/libspl/include/tzfile.h \ + lib/libspl/include/ucred.h \ + lib/libspl/include/umem.h \ + lib/libspl/include/unistd.h \ + lib/libspl/include/zone.h diff --git a/lib/libspl/include/ia32/Makefile.am b/lib/libspl/include/ia32/Makefile.am index 081839c48c8f..aaf4898ad1eb 100644 --- a/lib/libspl/include/ia32/Makefile.am +++ b/lib/libspl/include/ia32/Makefile.am @@ -1 +1,3 @@ +VPATH = @abs_top_srcdir@ + SUBDIRS = sys diff --git a/lib/libspl/include/ia32/sys/Makefile.am b/lib/libspl/include/ia32/sys/Makefile.am index c8136ee2ad42..abfb381890a1 100644 --- a/lib/libspl/include/ia32/sys/Makefile.am +++ b/lib/libspl/include/ia32/sys/Makefile.am @@ -1,3 +1,5 @@ +VPATH = @abs_top_srcdir@ + libspldir = $(includedir)/libspl/ia32/sys libspl_HEADERS = \ - $(top_srcdir)/lib/libspl/include/ia32/sys/asm_linkage.h + lib/libspl/include/ia32/sys/asm_linkage.h diff --git a/lib/libspl/include/rpc/Makefile.am b/lib/libspl/include/rpc/Makefile.am index 7a29aba737ae..b96222635ef1 100644 --- a/lib/libspl/include/rpc/Makefile.am +++ b/lib/libspl/include/rpc/Makefile.am @@ -1,4 +1,6 @@ +VPATH = @abs_top_srcdir@ + libspldir = $(includedir)/libspl/rpc libspl_HEADERS = \ - $(top_srcdir)/lib/libspl/include/rpc/types.h \ - $(top_srcdir)/lib/libspl/include/rpc/xdr.h + lib/libspl/include/rpc/types.h \ + lib/libspl/include/rpc/xdr.h diff --git a/lib/libspl/include/sys/Makefile.am b/lib/libspl/include/sys/Makefile.am index f55abc8fae8d..1c823becca6a 100644 --- a/lib/libspl/include/sys/Makefile.am +++ b/lib/libspl/include/sys/Makefile.am @@ -1,55 +1,57 @@ +VPATH = @abs_top_srcdir@ + SUBDIRS = dktp sysevent 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/bitmap.h \ - $(top_srcdir)/lib/libspl/include/sys/byteorder.h \ - $(top_srcdir)/lib/libspl/include/sys/callb.h \ - $(top_srcdir)/lib/libspl/include/sys/cmn_err.h \ - $(top_srcdir)/lib/libspl/include/sys/compress.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/file.h \ - $(top_srcdir)/lib/libspl/include/sys/frame.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/mntent.h \ - $(top_srcdir)/lib/libspl/include/sys/mnttab.h \ - $(top_srcdir)/lib/libspl/include/sys/mount.h \ - $(top_srcdir)/lib/libspl/include/sys/note.h \ - $(top_srcdir)/lib/libspl/include/sys/param.h \ - $(top_srcdir)/lib/libspl/include/sys/priv.h \ - $(top_srcdir)/lib/libspl/include/sys/processor.h \ - $(top_srcdir)/lib/libspl/include/sys/sdt.h \ - $(top_srcdir)/lib/libspl/include/sys/stack.h \ - $(top_srcdir)/lib/libspl/include/sys/stat.h \ - $(top_srcdir)/lib/libspl/include/sys/stropts.h \ - $(top_srcdir)/lib/libspl/include/sys/sunddi.h \ - $(top_srcdir)/lib/libspl/include/sys/sysevent.h \ - $(top_srcdir)/lib/libspl/include/sys/sysmacros.h \ - $(top_srcdir)/lib/libspl/include/sys/systeminfo.h \ - $(top_srcdir)/lib/libspl/include/sys/systm.h \ - $(top_srcdir)/lib/libspl/include/sys/time.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/utsname.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 + lib/libspl/include/sys/acl.h \ + lib/libspl/include/sys/acl_impl.h \ + lib/libspl/include/sys/bitmap.h \ + lib/libspl/include/sys/byteorder.h \ + lib/libspl/include/sys/callb.h \ + lib/libspl/include/sys/cmn_err.h \ + lib/libspl/include/sys/compress.h \ + lib/libspl/include/sys/cred.h \ + lib/libspl/include/sys/debug.h \ + lib/libspl/include/sys/dkio.h \ + lib/libspl/include/sys/dklabel.h \ + lib/libspl/include/sys/feature_tests.h \ + lib/libspl/include/sys/file.h \ + lib/libspl/include/sys/frame.h \ + lib/libspl/include/sys/int_limits.h \ + lib/libspl/include/sys/int_types.h \ + lib/libspl/include/sys/inttypes.h \ + lib/libspl/include/sys/isa_defs.h \ + lib/libspl/include/sys/kmem.h \ + lib/libspl/include/sys/kstat.h \ + lib/libspl/include/sys/list.h \ + lib/libspl/include/sys/list_impl.h \ + lib/libspl/include/sys/mhd.h \ + lib/libspl/include/sys/mkdev.h \ + lib/libspl/include/sys/mntent.h \ + lib/libspl/include/sys/mnttab.h \ + lib/libspl/include/sys/mount.h \ + lib/libspl/include/sys/note.h \ + lib/libspl/include/sys/param.h \ + lib/libspl/include/sys/priv.h \ + lib/libspl/include/sys/processor.h \ + lib/libspl/include/sys/sdt.h \ + lib/libspl/include/sys/stack.h \ + lib/libspl/include/sys/stat.h \ + lib/libspl/include/sys/stropts.h \ + lib/libspl/include/sys/sunddi.h \ + lib/libspl/include/sys/sysevent.h \ + lib/libspl/include/sys/sysmacros.h \ + lib/libspl/include/sys/systeminfo.h \ + lib/libspl/include/sys/systm.h \ + lib/libspl/include/sys/time.h \ + lib/libspl/include/sys/types32.h \ + lib/libspl/include/sys/types.h \ + lib/libspl/include/sys/tzfile.h \ + lib/libspl/include/sys/uio.h \ + lib/libspl/include/sys/utsname.h \ + lib/libspl/include/sys/va_list.h \ + lib/libspl/include/sys/varargs.h \ + lib/libspl/include/sys/vnode.h \ + lib/libspl/include/sys/vtoc.h \ + lib/libspl/include/sys/zone.h diff --git a/lib/libspl/include/sys/dktp/Makefile.am b/lib/libspl/include/sys/dktp/Makefile.am index 9887675c46e6..e4ff0308a761 100644 --- a/lib/libspl/include/sys/dktp/Makefile.am +++ b/lib/libspl/include/sys/dktp/Makefile.am @@ -1,4 +1,6 @@ +VPATH = @abs_top_srcdir@ + libspldir = $(includedir)/libspl/sys/dktp libspl_HEADERS = \ - $(top_srcdir)/lib/libspl/include/sys/dktp/fdisk.h + lib/libspl/include/sys/dktp/fdisk.h diff --git a/lib/libspl/include/sys/sysevent/Makefile.am b/lib/libspl/include/sys/sysevent/Makefile.am index b8495836dc4f..2f358e7cbdf8 100644 --- a/lib/libspl/include/sys/sysevent/Makefile.am +++ b/lib/libspl/include/sys/sysevent/Makefile.am @@ -1,3 +1,5 @@ +VPATH = @abs_top_srcdir@ + libspldir = $(includedir)/libspl/sys/sysevent libspl_HEADERS = \ - $(top_srcdir)/lib/libspl/include/sys/sysevent/eventdefs.h + lib/libspl/include/sys/sysevent/eventdefs.h diff --git a/lib/libspl/include/util/Makefile.am b/lib/libspl/include/util/Makefile.am index 060e143a89b7..9ec27f604c23 100644 --- a/lib/libspl/include/util/Makefile.am +++ b/lib/libspl/include/util/Makefile.am @@ -1,3 +1,5 @@ +VPATH = @abs_top_srcdir@ + libspldir = $(includedir)/libspl libspl_HEADERS = \ - $(top_srcdir)/lib/libspl/include/util/sscanf.h + lib/libspl/include/util/sscanf.h diff --git a/man/Makefile.am b/man/Makefile.am index 841cb9c4e6a0..64a1a5b90c54 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1 +1,3 @@ +VPATH = @abs_top_srcdir@ + SUBDIRS = man1 man5 man8 diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am index 113cd0d80e44..429fa5a9c374 100644 --- a/man/man1/Makefile.am +++ b/man/man1/Makefile.am @@ -1,5 +1,12 @@ -dist_man_MANS = zhack.1 zpios.1 ztest.1 -EXTRA_DIST = cstyle.1 +VPATH = @abs_top_srcdir@ + +dist_man_MANS = \ + $(top_srcdir)/man/man1/zhack.1 \ + $(top_srcdir)/man/man1/zpios.1 \ + $(top_srcdir)/man/man1/ztest.1 + +EXTRA_DIST = \ + $(top_srcdir)/man/man1/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 fcb73f4a0c04..7b99dd25e2a3 100644 --- a/man/man5/Makefile.am +++ b/man/man5/Makefile.am @@ -1,4 +1,9 @@ -dist_man_MANS = vdev_id.conf.5 zpool-features.5 zfs-module-parameters.5 +VPATH = @abs_top_srcdir@ + +dist_man_MANS = \ + $(top_srcdir)/man/man5/vdev_id.conf.5 \ + $(top_srcdir)/man/man5/zpool-features.5 \ + $(top_srcdir)/man/man5/zfs-module-parameters.5 install-data-local: $(INSTALL) -d -m 0755 "$(DESTDIR)$(mandir)/man5" diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am index b89e34dfd4fe..7aa140191b99 100644 --- a/man/man8/Makefile.am +++ b/man/man8/Makefile.am @@ -1,18 +1,20 @@ +VPATH = @abs_top_srcdir@ + dist_man_MANS = \ - fsck.zfs.8 \ - mount.zfs.8 \ - vdev_id.8 \ - zdb.8 \ - zfs.8 \ - zinject.8 \ - zpool.8 \ - zstreamdump.8 + $(top_srcdir)/man/man8/fsck.zfs.8 \ + $(top_srcdir)/man/man8/mount.zfs.8 \ + $(top_srcdir)/man/man8/vdev_id.8 \ + $(top_srcdir)/man/man8/zdb.8 \ + $(top_srcdir)/man/man8/zfs.8 \ + $(top_srcdir)/man/man8/zinject.8 \ + $(top_srcdir)/man/man8/zpool.8 \ + $(top_srcdir)/man/man8/zstreamdump.8 nodist_man_MANS = \ zed.8 EXTRA_DIST = \ - zed.8.in + $(top_srcdir)/man/man8/zed.8.in zed.8: $(srcdir)/zed.8.in diff --git a/module/Makefile.in b/module/Makefile.in index 4c6d38168149..e4129536e60b 100644 --- a/module/Makefile.in +++ b/module/Makefile.in @@ -1,3 +1,5 @@ +VPATH = @abs_top_srcdir@ + subdir-m += avl subdir-m += nvpair subdir-m += unicode diff --git a/module/avl/Makefile.in b/module/avl/Makefile.in index 27f9e4af4993..e26605155c5a 100644 --- a/module/avl/Makefile.in +++ b/module/avl/Makefile.in @@ -1,3 +1,5 @@ +VPATH = @abs_top_srcdir@ + MODULE := zavl EXTRA_CFLAGS = $(ZFS_MODULE_CFLAGS) @KERNELCPPFLAGS@ diff --git a/module/nvpair/Makefile.in b/module/nvpair/Makefile.in index 211fc726dfab..bf7673db94a2 100644 --- a/module/nvpair/Makefile.in +++ b/module/nvpair/Makefile.in @@ -1,3 +1,5 @@ +VPATH = @abs_top_srcdir@ + MODULE := znvpair EXTRA_CFLAGS = $(ZFS_MODULE_CFLAGS) @KERNELCPPFLAGS@ diff --git a/module/unicode/Makefile.in b/module/unicode/Makefile.in index 226e23baa8d8..38a48e5f376c 100644 --- a/module/unicode/Makefile.in +++ b/module/unicode/Makefile.in @@ -1,3 +1,5 @@ +VPATH = @abs_top_srcdir@ + MODULE := zunicode EXTRA_CFLAGS = $(ZFS_MODULE_CFLAGS) @KERNELCPPFLAGS@ diff --git a/module/zcommon/Makefile.in b/module/zcommon/Makefile.in index d4f5ba7ec70e..7063baa19e7b 100644 --- a/module/zcommon/Makefile.in +++ b/module/zcommon/Makefile.in @@ -1,3 +1,5 @@ +VPATH = @abs_top_srcdir@ + MODULE := zcommon EXTRA_CFLAGS = $(ZFS_MODULE_CFLAGS) @KERNELCPPFLAGS@ diff --git a/module/zfs/Makefile.in b/module/zfs/Makefile.in index 5552436adffa..7352c52eefe5 100644 --- a/module/zfs/Makefile.in +++ b/module/zfs/Makefile.in @@ -1,3 +1,5 @@ +VPATH = @abs_top_srcdir@ + MODULE := zfs EXTRA_CFLAGS = $(ZFS_MODULE_CFLAGS) @KERNELCPPFLAGS@ diff --git a/module/zpios/Makefile.in b/module/zpios/Makefile.in index 437bf2287637..1d7b90100a80 100644 --- a/module/zpios/Makefile.in +++ b/module/zpios/Makefile.in @@ -1,3 +1,5 @@ +VPATH = @abs_top_srcdir@ + MODULE := zpios EXTRA_CFLAGS = $(ZFS_MODULE_CFLAGS) @KERNELCPPFLAGS@ diff --git a/rpm/Makefile.am b/rpm/Makefile.am index e41cdda2e999..589cbfcc06af 100644 --- a/rpm/Makefile.am +++ b/rpm/Makefile.am @@ -1 +1,3 @@ +VPATH = @abs_top_srcdir@ + SUBDIRS = fedora generic diff --git a/rpm/fedora/Makefile.am b/rpm/fedora/Makefile.am index 89b13640d622..5a7ebd00e10d 100644 --- a/rpm/fedora/Makefile.am +++ b/rpm/fedora/Makefile.am @@ -1 +1,3 @@ +VPATH = @abs_top_srcdir@ + EXTRA_DIST = zfs.spec.in zfs-kmod.spec.in zfs-dkms.spec.in diff --git a/rpm/generic/Makefile.am b/rpm/generic/Makefile.am index 89b13640d622..5a7ebd00e10d 100644 --- a/rpm/generic/Makefile.am +++ b/rpm/generic/Makefile.am @@ -1 +1,3 @@ +VPATH = @abs_top_srcdir@ + EXTRA_DIST = zfs.spec.in zfs-kmod.spec.in zfs-dkms.spec.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 7894db49e148..fec8acb3ebf2 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -1,3 +1,5 @@ +VPATH = @abs_top_srcdir@ + SUBDIRS = zpool-config zpios-test zpios-profile EXTRA_DIST = dkms.mkconf dkms.postinst kmodtool zfs2zol-patch.sed cstyle.pl @@ -5,15 +7,15 @@ EXTRA_DIST = dkms.mkconf dkms.postinst kmodtool zfs2zol-patch.sed cstyle.pl pkgdatadir = $(datadir)/@PACKAGE@ dist_pkgdata_SCRIPTS = \ $(top_builddir)/scripts/common.sh \ - $(top_srcdir)/scripts/zconfig.sh \ - $(top_srcdir)/scripts/zfault.sh \ - $(top_srcdir)/scripts/zimport.sh \ - $(top_srcdir)/scripts/zfs.sh \ - $(top_srcdir)/scripts/zpool-create.sh \ - $(top_srcdir)/scripts/zpios.sh \ - $(top_srcdir)/scripts/zpios-sanity.sh \ - $(top_srcdir)/scripts/zpios-survey.sh \ - $(top_srcdir)/scripts/smb.sh + scripts/zconfig.sh \ + scripts/zfault.sh \ + scripts/zimport.sh \ + scripts/zfs.sh \ + scripts/zpool-create.sh \ + scripts/zpios.sh \ + scripts/zpios-sanity.sh \ + scripts/zpios-survey.sh \ + scripts/smb.sh ZFS=$(top_builddir)/scripts/zfs.sh ZCONFIG=$(top_builddir)/scripts/zconfig.sh diff --git a/scripts/zpios-profile/Makefile.am b/scripts/zpios-profile/Makefile.am index c87f1693857f..d03b3ebccab2 100644 --- a/scripts/zpios-profile/Makefile.am +++ b/scripts/zpios-profile/Makefile.am @@ -1,7 +1,9 @@ +VPATH = @abs_top_srcdir@ + pkgdataprofiledir = $(pkgdatadir)/zpios-profile dist_pkgdataprofile_SCRIPTS = \ - $(top_srcdir)/scripts/zpios-profile/zpios-profile-disk.sh \ - $(top_srcdir)/scripts/zpios-profile/zpios-profile-pids.sh \ - $(top_srcdir)/scripts/zpios-profile/zpios-profile-post.sh \ - $(top_srcdir)/scripts/zpios-profile/zpios-profile-pre.sh \ - $(top_srcdir)/scripts/zpios-profile/zpios-profile.sh + scripts/zpios-profile/zpios-profile-disk.sh \ + scripts/zpios-profile/zpios-profile-pids.sh \ + scripts/zpios-profile/zpios-profile-post.sh \ + scripts/zpios-profile/zpios-profile-pre.sh \ + scripts/zpios-profile/zpios-profile.sh diff --git a/scripts/zpios-test/Makefile.am b/scripts/zpios-test/Makefile.am index c74e24f2165a..9a29064b3249 100644 --- a/scripts/zpios-test/Makefile.am +++ b/scripts/zpios-test/Makefile.am @@ -1,13 +1,15 @@ +VPATH = @abs_top_srcdir@ + pkgdatatestdir = $(pkgdatadir)/zpios-test dist_pkgdatatest_SCRIPTS = \ - $(top_srcdir)/scripts/zpios-test/16th-8192rc-4rs-1cs-4off.sh \ - $(top_srcdir)/scripts/zpios-test/1th-16rc-4rs-1cs-4off.sh \ - $(top_srcdir)/scripts/zpios-test/1x256th-65536rc-4rs-1cs-4off.sh \ - $(top_srcdir)/scripts/zpios-test/256th-65536rc-4rs-1cs-4off.sh \ - $(top_srcdir)/scripts/zpios-test/4th-1024rc-4rs-1cs-4off.sh \ - $(top_srcdir)/scripts/zpios-test/large.sh \ - $(top_srcdir)/scripts/zpios-test/large-thread-survey.sh \ - $(top_srcdir)/scripts/zpios-test/medium.sh \ - $(top_srcdir)/scripts/zpios-test/small.sh \ - $(top_srcdir)/scripts/zpios-test/tiny.sh \ - $(top_srcdir)/scripts/zpios-test/lustre.sh + scripts/zpios-test/16th-8192rc-4rs-1cs-4off.sh \ + scripts/zpios-test/1th-16rc-4rs-1cs-4off.sh \ + scripts/zpios-test/1x256th-65536rc-4rs-1cs-4off.sh \ + scripts/zpios-test/256th-65536rc-4rs-1cs-4off.sh \ + scripts/zpios-test/4th-1024rc-4rs-1cs-4off.sh \ + scripts/zpios-test/large.sh \ + scripts/zpios-test/large-thread-survey.sh \ + scripts/zpios-test/medium.sh \ + scripts/zpios-test/small.sh \ + scripts/zpios-test/tiny.sh \ + scripts/zpios-test/lustre.sh diff --git a/scripts/zpool-config/Makefile.am b/scripts/zpool-config/Makefile.am index 2d7799413e29..30df1d61debf 100644 --- a/scripts/zpool-config/Makefile.am +++ b/scripts/zpool-config/Makefile.am @@ -1,30 +1,32 @@ +VPATH = @abs_top_srcdir@ + pkgdataconfigdir = $(pkgdatadir)/zpool-config dist_pkgdataconfig_SCRIPTS = \ - $(top_srcdir)/scripts/zpool-config/dm0-raid0.sh \ - $(top_srcdir)/scripts/zpool-config/file-raid0.sh \ - $(top_srcdir)/scripts/zpool-config/file-raid10.sh \ - $(top_srcdir)/scripts/zpool-config/file-raidz2.sh \ - $(top_srcdir)/scripts/zpool-config/file-raidz.sh \ - $(top_srcdir)/scripts/zpool-config/hda-raid0.sh \ - $(top_srcdir)/scripts/zpool-config/lo-raid0.sh \ - $(top_srcdir)/scripts/zpool-config/lo-raid10.sh \ - $(top_srcdir)/scripts/zpool-config/lo-raidz2.sh \ - $(top_srcdir)/scripts/zpool-config/lo-raidz.sh \ - $(top_srcdir)/scripts/zpool-config/lo-faulty-raid0.sh \ - $(top_srcdir)/scripts/zpool-config/lo-faulty-raid10.sh \ - $(top_srcdir)/scripts/zpool-config/lo-faulty-raidz.sh \ - $(top_srcdir)/scripts/zpool-config/lo-faulty-raidz2.sh \ - $(top_srcdir)/scripts/zpool-config/lo-faulty-raidz3.sh \ - $(top_srcdir)/scripts/zpool-config/md0-raid10.sh \ - $(top_srcdir)/scripts/zpool-config/md0-raid5.sh \ - $(top_srcdir)/scripts/zpool-config/ram0-raid0.sh \ - $(top_srcdir)/scripts/zpool-config/scsi_debug-noraid.sh \ - $(top_srcdir)/scripts/zpool-config/scsi_debug-raid0.sh \ - $(top_srcdir)/scripts/zpool-config/scsi_debug-raid10.sh \ - $(top_srcdir)/scripts/zpool-config/scsi_debug-raidz.sh \ - $(top_srcdir)/scripts/zpool-config/scsi_debug-raidz2.sh \ - $(top_srcdir)/scripts/zpool-config/scsi_debug-raidz3.sh \ - $(top_srcdir)/scripts/zpool-config/sda-raid0.sh \ - $(top_srcdir)/scripts/zpool-config/zpool-raid0.sh \ - $(top_srcdir)/scripts/zpool-config/zpool-raid10.sh \ - $(top_srcdir)/scripts/zpool-config/zpool-raidz.sh + scripts/zpool-config/dm0-raid0.sh \ + scripts/zpool-config/file-raid0.sh \ + scripts/zpool-config/file-raid10.sh \ + scripts/zpool-config/file-raidz2.sh \ + scripts/zpool-config/file-raidz.sh \ + scripts/zpool-config/hda-raid0.sh \ + scripts/zpool-config/lo-raid0.sh \ + scripts/zpool-config/lo-raid10.sh \ + scripts/zpool-config/lo-raidz2.sh \ + scripts/zpool-config/lo-raidz.sh \ + scripts/zpool-config/lo-faulty-raid0.sh \ + scripts/zpool-config/lo-faulty-raid10.sh \ + scripts/zpool-config/lo-faulty-raidz.sh \ + scripts/zpool-config/lo-faulty-raidz2.sh \ + scripts/zpool-config/lo-faulty-raidz3.sh \ + scripts/zpool-config/md0-raid10.sh \ + scripts/zpool-config/md0-raid5.sh \ + scripts/zpool-config/ram0-raid0.sh \ + scripts/zpool-config/scsi_debug-noraid.sh \ + scripts/zpool-config/scsi_debug-raid0.sh \ + scripts/zpool-config/scsi_debug-raid10.sh \ + scripts/zpool-config/scsi_debug-raidz.sh \ + scripts/zpool-config/scsi_debug-raidz2.sh \ + scripts/zpool-config/scsi_debug-raidz3.sh \ + scripts/zpool-config/sda-raid0.sh \ + scripts/zpool-config/zpool-raid0.sh \ + scripts/zpool-config/zpool-raid10.sh \ + scripts/zpool-config/zpool-raidz.sh diff --git a/udev/Makefile.am b/udev/Makefile.am index f930941fb083..676fee020cf0 100644 --- a/udev/Makefile.am +++ b/udev/Makefile.am @@ -1 +1,3 @@ +VPATH = @abs_top_srcdir@ + SUBDIRS = rules.d diff --git a/udev/rules.d/Makefile.am b/udev/rules.d/Makefile.am index 6816addb4cc6..cb3438bbcb81 100644 --- a/udev/rules.d/Makefile.am +++ b/udev/rules.d/Makefile.am @@ -1,7 +1,9 @@ +VPATH = @abs_top_srcdir@ + udevrule_DATA = \ - $(top_srcdir)/udev/rules.d/69-vdev.rules \ - $(top_srcdir)/udev/rules.d/60-zvol.rules \ - $(top_srcdir)/udev/rules.d/90-zfs.rules + 69-vdev.rules \ + 60-zvol.rules \ + 90-zfs.rules EXTRA_DIST = \ $(top_srcdir)/udev/rules.d/69-vdev.rules.in \ @@ -14,7 +16,7 @@ $(udevrule_DATA): -e 's,@udevdir\@,$(udevdir),g' \ -e 's,@udevruledir\@,$(udevruledir),g' \ -e 's,@sysconfdir\@,$(sysconfdir),g' \ - '$@.in' >'$@' + "$(abs_top_srcdir)/udev/rules.d/$@.in" > '$@' distclean-local:: -$(RM) $(udevrule_DATA)