* cfg.mk (sc_prohibit_trailing_blank_lines): Delete; this is adequately covered by maint.mk's sc_prohibit_empty_lines_at_EOF. * .x-sc_prohibit_empty_lines_at_EOF: New file, to exempt raw patches. * Makefile.am (EXTRA_DIST): Include new exemption. --- I'm pushing this under the build-breaker rule, since my previous patch made 'make syntax-check' fail for not one, but two identical syntax checks. .x-sc_prohibit_empty_lines_at_EOF | 1 + Makefile.am | 1 + cfg.mk | 9 --------- 3 files changed, 2 insertions(+), 9 deletions(-) create mode 100644 .x-sc_prohibit_empty_lines_at_EOF diff --git a/.x-sc_prohibit_empty_lines_at_EOF b/.x-sc_prohibit_empty_lines_at_EOF new file mode 100644 index 0000000..f481a09 --- /dev/null +++ b/.x-sc_prohibit_empty_lines_at_EOF @@ -0,0 +1 @@ +^docs/api_extension/.* diff --git a/Makefile.am b/Makefile.am index b51bd2b..26c6488 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,6 +25,7 @@ EXTRA_DIST = \ .x-sc_avoid_write \ .x-sc_m4_quote_check \ .x-sc_prohibit_asprintf \ + .x-sc_prohibit_empty_lines_at_EOF \ .x-sc_prohibit_gethostby \ .x-sc_prohibit_gethostname \ .x-sc_prohibit_gettext_noop \ diff --git a/cfg.mk b/cfg.mk index d50ffb7..d238a5f 100644 --- a/cfg.mk +++ b/cfg.mk @@ -406,15 +406,6 @@ sc_prohibit_newline_at_end_of_diagnostic: && { echo '$(ME): newline at end of message(s)' 1>&2; \ exit 1; } || : -# Disallow trailing blank lines. -sc_prohibit_trailing_blank_lines: - @$(VC_LIST_EXCEPT) | xargs perl -ln -0777 -e \ - '/\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; \ - test $$found = 0 - # Regex for grep -E that exempts generated files from style rules. preprocessor_exempt = ((qemu|remote)_(driver|protocol)\.h)$$ # Enforce recommended preprocessor indentation style. -- 1.7.2.3