aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/zinject
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/zinject
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/zinject')
-rw-r--r--cmd/zinject/.gitignore1
-rw-r--r--cmd/zinject/Makefile.am20
2 files changed, 8 insertions, 13 deletions
diff --git a/cmd/zinject/.gitignore b/cmd/zinject/.gitignore
deleted file mode 100644
index bded84009..000000000
--- a/cmd/zinject/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/zinject
diff --git a/cmd/zinject/Makefile.am b/cmd/zinject/Makefile.am
index 94a48f48b..c90f73fc0 100644
--- a/cmd/zinject/Makefile.am
+++ b/cmd/zinject/Makefile.am
@@ -1,16 +1,12 @@
-include $(top_srcdir)/config/Rules.am
-
-sbin_PROGRAMS = zinject
+sbin_PROGRAMS += zinject
+CPPCHECKTARGETS += zinject
zinject_SOURCES = \
- translate.c \
- zinject.c \
- zinject.h
+ %D%/translate.c \
+ %D%/zinject.c \
+ %D%/zinject.h
zinject_LDADD = \
- $(abs_top_builddir)/libzfs.la \
- $(abs_top_builddir)/libzfs_core.la \
- $(abs_top_builddir)/libnvpair.la
-
-include $(top_srcdir)/config/CppCheck.am
-CPPCHECKTARGETS += zinject
+ libzfs.la \
+ libzfs_core.la \
+ libnvpair.la