aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/zstream
diff options
context:
space:
mode:
authorнаб <[email protected]>2022-04-09 04:09:55 +0200
committerBrian Behlendorf <[email protected]>2022-05-10 10:18:38 -0700
commit5cdca5b1da7884c54260db473f892354bc79951b (patch)
tree6bdce13ac507fd450359dde2b3fa10405a480c54 /cmd/zstream
parent3ff81c460114e0b3f69a9993d4777ec2c590fb16 (diff)
autoconf: use include directives instead of recursing down cmd
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 <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes #13316
Diffstat (limited to 'cmd/zstream')
-rw-r--r--cmd/zstream/.gitignore1
-rw-r--r--cmd/zstream/Makefile.am25
2 files changed, 11 insertions, 15 deletions
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