-remove debug message

[oweals/gnunet.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index daa2946a7e0ddccc9466a83a4bc5a8b924924cc4..f072d0cae57d809ae9f4369d0e1e846765b42c3b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,19 +1,25 @@
 # This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
+# only documentation (ALL of the documentation)
 if DOCUMENTATION_ONLY
-  SUBDIRS = doc
+  SUBDIRS = bin doc
 else
-  SUBDIRS = m4 src po pkgconfig
+  SUBDIRS = m4 bin src po pkgconfig
+endif
+
+# documentation on / off switch (affects all of the documentation)
 if DOCUMENTATION
   SUBDIRS += doc
 endif
-endif
 
-if !TALER_ONLY
-  SUBDIRS += contrib
+# only manpages, needs "doc" subdir
+if INCLUDE_MANPAGES
+  SUBDIRS += doc
 endif
 
+SUBDIRS += contrib
+
 EXTRA_DIST = \
  ABOUT-NLS \
  config.rpath \
@@ -28,17 +34,41 @@ doc_DATA = COPYING README
 
 ACLOCAL_AMFLAGS = -I m4
 
-# Check for bashisms in shell scripts
-# Very verbose, need to exclude more files.
-check-bashism:
-       printf "Run checkbashism on all .sh files.\n"
-       printf "Currently this expects checkbashism.pl at a fixed location."
-       find . -type f ! -path '*/.*' ! -path '*/_*' -name '*.sh' -print0 | xargs -0 ~/src/scripts/src/checkbashisms.pl -f 2>&1 | tee $(top_srcdir)/bashism.log || true
+if HAVE_UNCRUSTIFY_BINARY
+MCRUSTIFY = find $(top_srcdir) -type f -name '*.c' -or -name '*.h' -print0 | xargs -0 uncrustify -c $(top_srcdir)/uncrustify.cfg -q --replace --no-backup 2>&1 || true
+else
+MCRUSTIFY = echo "crustify: skipped"
+endif
 
-check-python:
-       printf "Running flake8 and 2to3 if detected.\n"
-       $(top_srcdir)/contrib/scripts/lint-python.sh || true
+if HAVE_YAPF_BINARY
+MYAPF = find $(top_srcdir) -type f -name '*.py' -or -name '*.py.in' -print0 | xargs -0 $(YAPF_BINARY) -i 2>&1 || true
+else
+MYAPF = echo "yapf: skipped"
+endif
+
+pretty:
+       $(MCRUSTIFY)
+       $(MYAPF)
+
+lint: check-bashisms check-texinfo check-man check-python
+
+check-bashisms:
+if HAVE_CHECKBASHISMS
+       printf "If checkbashisms.pl is in PATH, run checkbashism on all .sh files.\n"
+       find '.' -type f ! -path '*/.*' ! -path '*/_*' -name '*.sh' -print0 | xargs -0 checkbashisms.pl -f 2>&1 | tee $(srcdir)/bashism.log || true
+else
+       printf "No checkbashisms in PATH, skipped"
+endif
 
 check-man:
        printf "Running lint-man.sh in doc/man.\n"
-       @cd $(top_srcdir)/doc/man ; $(top_srcdir)/../../contrib/scripts/lint-man.sh || true
+       @cd $(top_srcdir)/doc/man ; ../../contrib/scripts/lint/lint-man.sh || true
+
+check-python:
+       printf "Running flake8 and 2to3 if detected.\n"
+       $(top_srcdir)/contrib/scripts/lint/lint-python.sh || true
+
+if HAVE_AWK
+check-texinfo:
+       @cd $(top_srcdir); find . -type f ! -path '*/.*' -name '*.texi' -print0 | xargs -0 ./contrib/scripts/check-texinfo.awk > $(srcdir)/texinfo_lint.log || true
+endif