X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=cfg.mk;h=1d02b24b3463919e294b460120c80b2323779521;hp=7130cea575eed041698c5a15eef771db3bd7237b;hb=e05ddc70f1fa6d1e8253d69c5d17e69bfad2be90;hpb=4c2c2793bad56ce05caf6244e10fd5bcd7023383

diff --git a/cfg.mk b/cfg.mk
index 7130cea..1d02b24 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -63,15 +63,12 @@ local-checks-to-skip =			\
   sc_useless_cpp_parens
 
 disable_temporarily =			\
-  sc_makefile_TAB_only_indentation	\
   sc_unmarked_diagnostics		\
   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.
@@ -136,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;							\