X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=cfg.mk;h=1d02b24b3463919e294b460120c80b2323779521;hp=5d2f225be5dafe0a03189d44fae39ca36b4294b4;hb=2b891ceef355ce2d6532d65f8febbe3833d4399e;hpb=a3cceb6f1c9e55759f5d6a07bf5c74a7ea825dcd

diff --git a/cfg.mk b/cfg.mk
index 5d2f225..1d02b24 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -63,17 +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_const_long_option			\
-  sc_avoid_write			\
-  sc_trailing_blank
+  sc_avoid_write
 
 # Avoid uses of write(2).  Either switch to streams (fwrite), or use
 # the safewrite wrapper.
@@ -108,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; } || :
 
@@ -138,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;							\