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/zstream/.gitignore | 1 - cmd/zstream/Makefile.am | 25 +++++++++++-------------- 2 files changed, 11 insertions(+), 15 deletions(-) delete mode 100644 cmd/zstream/.gitignore (limited to 'cmd/zstream') diff --git a/cmd/zstream/.gitignore b/cmd/zstream/.gitignore deleted file mode 100644 index fd1240d55..000000000 --- a/cmd/zstream/.gitignore +++ /dev/null @@ -1 +0,0 @@ -zstream diff --git a/cmd/zstream/Makefile.am b/cmd/zstream/Makefile.am index 7749e94ba..9b2716ae0 100644 --- a/cmd/zstream/Makefile.am +++ b/cmd/zstream/Makefile.am @@ -1,21 +1,18 @@ -include $(top_srcdir)/config/Rules.am - -sbin_PROGRAMS = zstream +sbin_PROGRAMS += zstream +CPPCHECKTARGETS += zstream zstream_SOURCES = \ - zstream.c \ - zstream.h \ - zstream_dump.c \ - zstream_redup.c \ - zstream_token.c + %D%/zstream.c \ + %D%/zstream.h \ + %D%/zstream_dump.c \ + %D%/zstream_redup.c \ + %D%/zstream_token.c zstream_LDADD = \ - $(abs_top_builddir)/libzfs.la \ - $(abs_top_builddir)/libzfs_core.la \ - $(abs_top_builddir)/libnvpair.la - -include $(top_srcdir)/config/CppCheck.am -CPPCHECKTARGETS += zstream + libzfs.la \ + libzfs_core.la \ + libnvpair.la +PHONY += install-exec-hook install-exec-hook: cd $(DESTDIR)$(sbindir) && $(LN_S) -f zstream zstreamdump -- cgit v1.2.3