diff options
| author | наб <[email protected]> | 2022-04-09 04:09:55 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2022-05-10 10:18:38 -0700 |
| commit | 5cdca5b1da7884c54260db473f892354bc79951b (patch) | |
| tree | 6bdce13ac507fd450359dde2b3fa10405a480c54 /cmd/zfs | |
| parent | 3ff81c460114e0b3f69a9993d4777ec2c590fb16 (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/zfs')
| -rw-r--r-- | cmd/zfs/.gitignore | 1 | ||||
| -rw-r--r-- | cmd/zfs/Makefile.am | 28 |
2 files changed, 12 insertions, 17 deletions
diff --git a/cmd/zfs/.gitignore b/cmd/zfs/.gitignore deleted file mode 100644 index 0fd9cc63a..000000000 --- a/cmd/zfs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/zfs diff --git a/cmd/zfs/Makefile.am b/cmd/zfs/Makefile.am index ca5e823aa..8a3c13a1f 100644 --- a/cmd/zfs/Makefile.am +++ b/cmd/zfs/Makefile.am @@ -1,26 +1,22 @@ -include $(top_srcdir)/config/Rules.am - -sbin_PROGRAMS = zfs +sbin_PROGRAMS += zfs +CPPCHECKTARGETS += zfs zfs_SOURCES = \ - zfs_iter.c \ - zfs_iter.h \ - zfs_main.c \ - zfs_util.h \ - zfs_project.c \ - zfs_projectutil.h + %D%/zfs_iter.c \ + %D%/zfs_iter.h \ + %D%/zfs_main.c \ + %D%/zfs_project.c \ + %D%/zfs_projectutil.h \ + %D%/zfs_util.h zfs_LDADD = \ - $(abs_top_builddir)/libzfs.la \ - $(abs_top_builddir)/libzfs_core.la \ - $(abs_top_builddir)/libnvpair.la \ - $(abs_top_builddir)/libuutil.la + libzfs.la \ + libzfs_core.la \ + libnvpair.la \ + libuutil.la zfs_LDADD += $(LTLIBINTL) if BUILD_FREEBSD zfs_LDADD += -lgeom -ljail endif - -include $(top_srcdir)/config/CppCheck.am -CPPCHECKTARGETS += zfs |