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 <behlendorf1@llnl.gov>
Co-authored-by: Rapptz <rapptz@gmail.com>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13316
This commit is contained in:
наб
2022-04-10 00:16:59 +02:00
committed by Brian Behlendorf
parent 674a9f3727
commit 50d2c9e4fd
21 changed files with 112 additions and 167 deletions
+35 -7
View File
@@ -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)
@@ -1,4 +0,0 @@
confhooksddir = /usr/share/initramfs-tools/conf-hooks.d
dist_confhooksd_DATA = \
zfs
-4
View File
@@ -1,4 +0,0 @@
confddir = /usr/share/initramfs-tools/conf.d
dist_confd_DATA = \
zfs
-13
View File
@@ -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)
-12
View File
@@ -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)
@@ -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)