build: remove trailing blank lines; enable the syntax-check rule

[libguestfs.git] / cfg.mk

diff --git a/cfg.mk b/cfg.mk
index e92c34f..1d02b24 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -63,16 +63,12 @@ local-checks-to-skip =                      \
   sc_useless_cpp_parens
 
 disable_temporarily =                  \
-  sc_makefile_TAB_only_indentation     \
   sc_unmarked_diagnostics              \
-  sc_TAB_in_indentation                        \
   sc_prohibit_ctype_h                  \
   sc_prohibit_asprintf                 \
   sc_m4_quote_check                    \
-  sc_prohibit_trailing_blank_lines     \
   sc_avoid_ctype_macros                        \
-  sc_avoid_write                       \
-  sc_trailing_blank
+  sc_avoid_write
 
 # Avoid uses of write(2).  Either switch to streams (fwrite), or use
 # the safewrite wrapper.
@@ -107,10 +103,10 @@ sc_prohibit_ctype_h:
                1>&2; exit 1; } || :
 
 # Ensure that no C source file uses TABs for indentation.
+# Exclude some version-controlled symlinks.
 sc_TAB_in_indentation:
        @grep -lE '^ *  ' /dev/null                                     \
-            $$($(VC_LIST_EXCEPT)                                       \
-               | grep -E '\.[ch](\.in)?$$') &&                         \
+            $$($(VC_LIST_EXCEPT)) &&                                   \
          { echo '$(ME): found TAB(s) used for indentation in C sources;'\
              'use spaces' 1>&2; exit 1; } || :
 
@@ -137,8 +133,9 @@ sc_prohibit_gethostby:
 
 # Disallow trailing blank lines.
 sc_prohibit_trailing_blank_lines:
-       @$(VC_LIST_EXCEPT) | xargs perl -ln -0777 -e                    \
-         '/\n\n+$$/ and print $$ARGV' > $@-t
+       @$(VC_LIST_EXCEPT)                                              \
+         | xargs perl -ln -0777 -e                                     \
+             '-f $$ARGV or next; /\n\n+$$/ and print $$ARGV' > $@-t
        @found=0; test -s $@-t && { found=1; cat $@-t 1>&2;             \
          echo '$(ME): found trailing blank line(s)' 1>&2; };           \
        rm -f $@-t;                                                     \