summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Youngman <jay@gnu.org>2011-06-12 01:58:44 +0100
committerJames Youngman <jay@gnu.org>2011-06-12 03:28:58 +0100
commit6ef19832c05864502da4bc82c9ab510e7e6780f2 (patch)
treeb5978c61cd6ca7221935615cee23b117ce1399af
parentf92ac3bc3fc089eaabd4dcc3fd16cb5cb0f23291 (diff)
downloadfindutils-6ef19832c05864502da4bc82c9ab510e7e6780f2.tar.gz
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.
-rw-r--r--.x-sc_bindtextdomain1
-rw-r--r--.x-sc_prohibit_empty_lines_at_EOF10
-rw-r--r--ChangeLog9
-rw-r--r--cfg.mk5
4 files changed, 14 insertions, 11 deletions
diff --git a/.x-sc_bindtextdomain b/.x-sc_bindtextdomain
deleted file mode 100644
index a8d94e6f..00000000
--- 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 3231e1bd..00000000
--- 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 52104b44..b83bb1b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2011-06-12 James Youngman <jay@gnu.org>
+ 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 52441065..48ebc676 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