zstreamdump: -d option is not documented in manpage

[mirror_zfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 50b80b945d53656d419aaee09460c8db3690d173..02e10443485c190bd5c5157f95490eee71f45ab5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,8 +23,21 @@ EXTRA_DIST  = autogen.sh copy-builtin
 EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am
 EXTRA_DIST += META AUTHORS COPYRIGHT LICENSE NEWS NOTICE README.md
 
+# Include all the extra licensing information for modules
+EXTRA_DIST += module/icp/algs/skein/THIRDPARTYLICENSE module/icp/algs/skein/THIRDPARTYLICENSE.descrip
+EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman.descrip
+EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl.descrip
+EXTRA_DIST += module/spl/THIRDPARTYLICENSE.gplv2 module/spl/THIRDPARTYLICENSE.gplv2.descrip
+EXTRA_DIST += module/zfs/THIRDPARTYLICENSE.cityhash module/zfs/THIRDPARTYLICENSE.cityhash.descrip
+
 @CODE_COVERAGE_RULES@
 
+.PHONY: gitrev
+gitrev:
+       -${top_srcdir}/scripts/make_gitrev.sh
+
+BUILT_SOURCES = gitrev
+
 distclean-local::
        -$(RM) -R autom4te*.cache
        -find . \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \
@@ -40,7 +53,8 @@ distclean-local::
 all-local:
        -${top_srcdir}/scripts/zfs-tests.sh -c
 
-dist-hook:
+dist-hook: gitrev
+       cp ${top_srcdir}/include/zfs_gitrev.h $(distdir)/include; \
        sed -i 's/Release:[[:print:]]*/Release:      $(RELEASE)/' \
                $(distdir)/META
 
@@ -61,7 +75,7 @@ install-data-hook:
        ln -fs zfs.release spl.release
 endif
 
-codecheck: cstyle shellcheck flake8 mancheck testscheck
+codecheck: cstyle shellcheck flake8 mancheck testscheck vcscheck
 
 checkstyle: codecheck commitcheck
 
@@ -103,6 +117,12 @@ testscheck:
                xargs -r stat -c '%A %n' | \
                awk '{c++; print} END {if(c>0) exit 1}'
 
+vcscheck:
+       @if git rev-parse --git-dir > /dev/null 2>&1; then \
+               git ls-files . --exclude-standard --others | \
+               awk '{c++; print} END {if(c>0) exit 1}' ; \
+       fi
+
 lint: cppcheck paxcheck
 
 cppcheck:
@@ -110,7 +130,7 @@ cppcheck:
                cppcheck --quiet --force --error-exitcode=2 --inline-suppr \
                        --suppressions-list=.github/suppressions.txt \
                        -UHAVE_SSE2 -UHAVE_AVX512F -UHAVE_UIO_ZEROCOPY \
-                       -UHAVE_DNLC ${top_srcdir}; \
+                       ${top_srcdir}; \
        else \
                echo "skipping cppcheck because cppcheck is not installed"; \
        fi