From 5cdca5b1da7884c54260db473f892354bc79951b Mon Sep 17 00:00:00 2001 From: наб Date: Sat, 9 Apr 2022 04:09:55 +0200 Subject: autoconf: use include directives instead of recursing down cmd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No installation diff, dist lost -zfs-2.1.99/cmd/fsck_zfs/fsck.zfs which was distributed erroneously, since it's generated Also clean gitrev on clean Also add -e 'any possible bashisms' to default checkbashisms flags, and fully parallelise it and shellcheck, and it works out-of-tree, too Also align the Release in the dist META file correctly Reviewed-by: Brian Behlendorf Signed-off-by: Ahelenia Ziemiańska Closes #13316 --- cmd/zhack/.gitignore | 1 - cmd/zhack/Makefile.am | 18 +++++++----------- 2 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 cmd/zhack/.gitignore (limited to 'cmd/zhack') diff --git a/cmd/zhack/.gitignore b/cmd/zhack/.gitignore deleted file mode 100644 index 763a18898..000000000 --- a/cmd/zhack/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/zhack diff --git a/cmd/zhack/Makefile.am b/cmd/zhack/Makefile.am index fa911e9e3..94fa76d14 100644 --- a/cmd/zhack/Makefile.am +++ b/cmd/zhack/Makefile.am @@ -1,16 +1,12 @@ -include $(top_srcdir)/config/Rules.am +zhack_CPPFLAGS = $(AM_CPPFLAGS) $(FORCEDEBUG_CPPFLAGS) -AM_CPPFLAGS += $(FORCEDEBUG_CPPFLAGS) - -sbin_PROGRAMS = zhack +sbin_PROGRAMS += zhack +CPPCHECKTARGETS += zhack zhack_SOURCES = \ - zhack.c + %D%/zhack.c zhack_LDADD = \ - $(abs_top_builddir)/libzpool.la \ - $(abs_top_builddir)/libzfs_core.la \ - $(abs_top_builddir)/libnvpair.la - -include $(top_srcdir)/config/CppCheck.am -CPPCHECKTARGETS += zhack + libzpool.la \ + libzfs_core.la \ + libnvpair.la -- cgit v1.2.3