OpenZFS 7340 - receive manual origin should override automatic origin

[mirror_zfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b0d23d00c3760b552af4ab84f1246f30755831e7..e009212f4552013347703195d2e1dce8760bf129 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ include config/tgz.am
 
 SUBDIRS = include rpm
 if CONFIG_USER
-SUBDIRS += udev etc man scripts tests lib cmd contrib
+SUBDIRS += udev etc man scripts lib tests cmd contrib
 endif
 if CONFIG_KERNEL
 SUBDIRS += module
@@ -39,11 +39,11 @@ dist-hook:
        sed -i 's/Release:[[:print:]]*/Release:      $(RELEASE)/' \
                $(distdir)/META
 
-checkstyle: cstyle shellcheck
+checkstyle: cstyle shellcheck flake8
 
 cstyle:
        @find ${top_srcdir} -name '*.[hc]' ! -name 'zfs_config.*' \
-               ! -name '*.mod.c' -type f -exec scripts/cstyle.pl {} \+
+               ! -name '*.mod.c' -type f -exec scripts/cstyle.pl -cpP {} \+
 
 shellcheck:
        @if type shellcheck > /dev/null 2>&1; then \
@@ -55,11 +55,21 @@ shellcheck:
                 done; \
         fi
 
-lint: cppcheck
+lint: cppcheck paxcheck
 
 cppcheck:
        @if type cppcheck > /dev/null 2>&1; then \
-               cppcheck --quiet --force ${top_srcdir}; \
+               cppcheck --quiet --force --error-exitcode=2 ${top_srcdir}; \
+       fi
+
+paxcheck:
+       @if type scanelf > /dev/null 2>&1; then \
+               scripts/paxcheck.sh ${top_srcdir}; \
+       fi
+
+flake8:
+       @if type flake8 > /dev/null 2>&1; then \
+               flake8 ${top_srcdir}; \
        fi
 
 ctags: