zfs(8) fixes

[mirror_zfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 10c87ddcd4b39214b9e04e12de21dc93a8791c2a..3adc161adc8a5edbd8a28edae4536e1331a7ec5e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,12 @@
-
 ACLOCAL_AMFLAGS = -I config
 
-include $(top_srcdir)/config/rpm.am
-include $(top_srcdir)/config/deb.am
-include $(top_srcdir)/config/tgz.am
+include config/rpm.am
+include config/deb.am
+include config/tgz.am
 
 SUBDIRS = include rpm
 if CONFIG_USER
-SUBDIRS += udev etc man scripts lib cmd contrib
+SUBDIRS += udev etc man scripts lib tests cmd contrib
 endif
 if CONFIG_KERNEL
 SUBDIRS += module
@@ -40,28 +39,49 @@ 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 \
-               (find ${top_srcdir} -type f -name '*.sh.in' -o -type f \
-                -name '*.sh'; find etc/init.d/zfs*.in -type f) | \
+               shellcheck --exclude=SC1090 --format gcc scripts/paxcheck.sh \
+                       scripts/zloop.sh \
+                       scripts/zfs-tests.sh \
+                       scripts/zfs.sh; \
+               (find cmd/zed/zed.d/*.sh -type f) | \
                 grep -v 'zfs-script-config' | \
                 while read file; do \
-                       shellcheck --format gcc "$$file"; \
+                       shellcheck --exclude=SC1090 --format gcc "$$file"; \
                 done; \
         fi
 
+lint: cppcheck paxcheck
+
+cppcheck:
+       @if type cppcheck > /dev/null 2>&1; then \
+               cppcheck --inline-suppr --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:
-       $(RM) $(top_srcdir)/tags
+       $(RM) tags
        find $(top_srcdir) -name .git -prune -o -name '*.[hc]' | xargs ctags
 
 etags:
-       $(RM) $(top_srcdir)/TAGS
+       $(RM) TAGS
        find $(top_srcdir) -name .pc -prune -o -name '*.[hc]' | xargs etags -a
 
 tags: ctags etags