* cfg.mk: Move definition of which files we should not check to exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF, instead of .x-sc_prohibit_empty_lines_at_EOF. Move contents of .x-sc_bindtextdomain into exclude_file_name_regexp--sc_bindtextdomain. .x-sc_prohibit_empty_lines_at_EOF: Delete. .x-sc_bindtextdomain: Delete. --- .x-sc_bindtextdomain | 1 - .x-sc_prohibit_empty_lines_at_EOF | 10 ---------- ChangeLog | 9 +++++++++ cfg.mk | 5 +++++ 4 files changed, 14 insertions(+), 11 deletions(-) delete mode 100644 .x-sc_bindtextdomain delete mode 100644 .x-sc_prohibit_empty_lines_at_EOF
diff --git a/.x-sc_bindtextdomain b/.x-sc_bindtextdomain deleted file mode 100644 index a8d94e6..0000000 --- a/.x-sc_bindtextdomain +++ /dev/null @@ -1 +0,0 @@ -lib/regexprops\.c diff --git a/.x-sc_prohibit_empty_lines_at_EOF b/.x-sc_prohibit_empty_lines_at_EOF deleted file mode 100644 index 3231e1b..0000000 --- a/.x-sc_prohibit_empty_lines_at_EOF +++ /dev/null @@ -1,10 +0,0 @@ -xargs/testsuite/xargs\..*/.*\.xo -xargs/testsuite/inputs/.*\.xi -locate/testsuite/locate\.gnu/.*\.xo -find/testsuite/find\..*/.*\.xo -COPYING -doc/regexprops.texi -m4/order-good\.bin -m4/order-bad\.bin -locate/testsuite/locate\.gnu/locateddb\.old\.x86\.xi -locate/testsuite/locate\.gnu/locateddb\.old\.powerpc\.xi diff --git a/ChangeLog b/ChangeLog index 52104b4..b83bb1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2011-06-12 James Youngman <[email protected]> + Eliminate .x-sc_prohibit_empty_lines_at_EOF and .x-sc_bindtextdomain + * cfg.mk: Move definition of which files we should not check to + exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF, instead + of .x-sc_prohibit_empty_lines_at_EOF. + Move contents of .x-sc_bindtextdomain into + exclude_file_name_regexp--sc_bindtextdomain. + .x-sc_prohibit_empty_lines_at_EOF: Delete. + .x-sc_bindtextdomain: Delete. + Enable sc_makefile_at_at_check; fix problems it identifies. * lib/Makefile.am: Use $(FINDLIBOBJS) instead of @FINDLIBOBJS@. * find/Makefile.am (LDADD): Use $(FINDLIBS) instead of @FINDLIBS@. diff --git a/cfg.mk b/cfg.mk index 5244106..48ebc67 100644 --- a/cfg.mk +++ b/cfg.mk @@ -33,6 +33,11 @@ local-checks-to-skip += sc_two_space_separator_in_usage exclude_file_name_regexp--sc_trailing_blank = \ ^COPYING|(po/.*\.po)|(find/testsuite/find.gnu/printf\.xo)|(xargs/testsuite/(inputs/.*\.xi|xargs\.(gnu|posix|sysv)/.*\.(x[oe])))$$ +exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \ + ^(.*/testsuite/.*\.(xo|xi|xe))|COPYING|doc/regexprops\.texi|m4/order-(bad|good)\.bin$$ +exclude_file_name_regexp--sc_bindtextdomain = \ + ^lib/regexprops\.c$$ + # sc_texinfo_acronym: perms.texi from coreutils uses @acronym{GNU}. exclude_file_name_regexp--sc_texinfo_acronym = doc/perm\.texi -- 1.7.2.5
