autoconf: use include directives instead of recursing down contrib

Also make the pyzfs build actually out-of-tree and quiet by default

Reviewed-by: Brian Behlendorf <[email protected]>
Co-authored-by: Rapptz <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #13316

6 files changed, 35 insertions, 48 deletions

diff --git a/contrib/initramfs/Makefile.am b/contrib/initramfs/Makefile.am
index 5ee8e16a0..6917b517f 100644
--- a/contrib/initramfs/Makefile.am
+++ b/contrib/initramfs/Makefile.am
@@ -1,11 +1,39 @@
-include $(top_srcdir)/config/Shellcheck.am
+i_tdir = /usr/share/initramfs-tools
+dist_i_t_SCRIPTS = \
+	%D%/zfsunlock
 
-initrddir = /usr/share/initramfs-tools
 
-dist_initrd_SCRIPTS = \
-	zfsunlock
+i_t_confhooks_ddir = $(i_tdir)/conf-hooks.d
+dist_i_t_confhooks_d_DATA = \
+	%D%/conf-hooks.d/zfs
 
-SUBDIRS = conf.d conf-hooks.d hooks scripts
-SHELLCHECKDIRS = hooks scripts
 
-EXTRA_DIST = README.md
+i_t_conf_ddir = $(i_tdir)/conf.d
+dist_i_t_conf_d_DATA = \
+	%D%/conf.d/zfs
+
+
+i_t_hooksdir = $(i_tdir)/hooks
+i_t_hooks_SCRIPTS = \
+	%D%/hooks/zfs \
+	%D%/hooks/zfsunlock
+
+SUBSTFILES += $(i_t_hooks_SCRIPTS)
+
+
+i_t_scriptsdir = $(i_tdir)/scripts
+dist_i_t_scripts_SCRIPTS = \
+	%D%/scripts/zfs
+
+
+i_t_scripts_localtopdir = $(i_t_scriptsdir)/local-top
+dist_i_t_scripts_localtop_SCRIPTS = \
+	%D%/scripts/local-top/zfs
+
+
+i_t_check_scripts    = $(dist_i_t_SCRIPTS) $(i_t_hooks_SCRIPTS) $(dist_i_t_scripts_SCRIPTS) $(dist_i_t_scripts_localtop_SCRIPTS)
+SHELLCHECKSCRIPTS   += $(i_t_check_scripts)
+$(call SHELLCHECK_OPTS,$(i_t_check_scripts)): SHELLCHECK_SHELL = sh
+
+
+EXTRA_DIST += $(addprefix %D%/,README.md)
diff --git a/contrib/initramfs/conf-hooks.d/Makefile.am b/contrib/initramfs/conf-hooks.d/Makefile.am
deleted file mode 100644
index f84ba5cc7..000000000
--- a/contrib/initramfs/conf-hooks.d/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-confhooksddir = /usr/share/initramfs-tools/conf-hooks.d
-
-dist_confhooksd_DATA = \
-	zfs
diff --git a/contrib/initramfs/conf.d/Makefile.am b/contrib/initramfs/conf.d/Makefile.am
deleted file mode 100644
index 5ef27e0aa..000000000
--- a/contrib/initramfs/conf.d/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-confddir = /usr/share/initramfs-tools/conf.d
-
-dist_confd_DATA = \
-	zfs
diff --git a/contrib/initramfs/hooks/Makefile.am b/contrib/initramfs/hooks/Makefile.am
deleted file mode 100644
index e872c0a00..000000000
--- a/contrib/initramfs/hooks/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-CLEANFILES =
-EXTRA_DIST =
-include $(top_srcdir)/config/Substfiles.am
-include $(top_srcdir)/config/Shellcheck.am
-
-hooksdir = /usr/share/initramfs-tools/hooks
-
-hooks_SCRIPTS = \
-	zfs \
-	zfsunlock
-
-SUBSTFILES += $(hooks_SCRIPTS)
-SHELLCHECKSCRIPTS += $(hooks_SCRIPTS)
diff --git a/contrib/initramfs/scripts/Makefile.am b/contrib/initramfs/scripts/Makefile.am
deleted file mode 100644
index 8b48f2056..000000000
--- a/contrib/initramfs/scripts/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-include $(top_srcdir)/config/Shellcheck.am
-
-scriptsdir = /usr/share/initramfs-tools/scripts
-
-dist_scripts_SCRIPTS = \
-	zfs
-
-SUBDIRS = local-top
-
-SHELLCHECKDIRS = $(SUBDIRS)
-SHELLCHECK_SHELL = sh
-SHELLCHECKSCRIPTS += $(dist_scripts_SCRIPTS)
diff --git a/contrib/initramfs/scripts/local-top/Makefile.am b/contrib/initramfs/scripts/local-top/Makefile.am
deleted file mode 100644
index f64665f4b..000000000
--- a/contrib/initramfs/scripts/local-top/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/config/Shellcheck.am
-
-localtopdir = /usr/share/initramfs-tools/scripts/local-top
-
-dist_localtop_SCRIPTS = \
-	zfs
-
-SHELLCHECKSCRIPTS += $(dist_scripts_SCRIPTS)