[PATCH 3/3] Eliminate remaining .x-* files.

[James Youngman]

* cfg.mk: Move more .x-* files into variables.
(exclude_file_name_regexp--sc_prohibit_always_true_header_tests):
Incorporate .x-sc_prohibit_always_true_header_tests.
(exclude_file_name_regexp--sc_prohibit_test_minus_ao): Incorporate
.x-sc_prohibit_test_minus_ao.
(exclude_file_name_regexp--sc_prohibit_doubled_word): Incorporate
.x-sc_prohibit_doubled_word.
* .x-sc_prohibit_test_minus_ao: Delete.
* .x-sc_prohibit_always_true_header_tests: Delete.
* .x-sc_prohibit_doubled_word: Delete.
---
 .x-sc_prohibit_always_true_header_tests |    2 --
 .x-sc_prohibit_doubled_word             |    3 ---
 .x-sc_prohibit_test_minus_ao            |    7 -------
 cfg.mk                                  |    6 ++++++
 4 files changed, 6 insertions(+), 12 deletions(-)
 delete mode 100644 .x-sc_prohibit_always_true_header_tests
 delete mode 100644 .x-sc_prohibit_doubled_word
 delete mode 100644 .x-sc_prohibit_test_minus_ao

diff --git a/.x-sc_prohibit_always_true_header_tests 
b/.x-sc_prohibit_always_true_header_tests
deleted file mode 100644
index f4c0d62..0000000
--- a/.x-sc_prohibit_always_true_header_tests
+++ /dev/null
@@ -1,2 +0,0 @@
-build-aux/src-sniff\.py
-ChangeLog
diff --git a/.x-sc_prohibit_doubled_word b/.x-sc_prohibit_doubled_word
deleted file mode 100644
index b72f5a8..0000000
--- a/.x-sc_prohibit_doubled_word
+++ /dev/null
@@ -1,3 +0,0 @@
-xargs/testsuite/xargs\.sysv/iquotes\.xo
-ChangeLog
-po/.*\.po$
diff --git a/.x-sc_prohibit_test_minus_ao b/.x-sc_prohibit_test_minus_ao
deleted file mode 100644
index 63a723d..0000000
--- a/.x-sc_prohibit_test_minus_ao
+++ /dev/null
@@ -1,7 +0,0 @@
-ChangeLog
-find/testsuite/config/unix.exp
-locate/testsuite/config/unix.exp
-xargs/testsuite/config/unix.exp
-find/testsuite/.*\.exp
-locate/testsuite/.*\.exp
-xargs/testsuite/.*\.exp
diff --git a/cfg.mk b/cfg.mk
index 48ebc67..f301884 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -37,6 +37,12 @@ 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$$
+exclude_file_name_regexp--sc_prohibit_always_true_header_tests = \
+       ^(build-aux/src-sniff\.py)|ChangeLog$$
+exclude_file_name_regexp--sc_prohibit_test_minus_ao = \
+       ^(ChangeLog)|((find|locate|xargs)/testsuite/.*\.exp)$$
+exclude_file_name_regexp--sc_prohibit_doubled_word = \
+       ^(xargs/testsuite/xargs\.sysv/iquotes\.xo)|ChangeLog|po/.*\.po$$
 
 # sc_texinfo_acronym: perms.texi from coreutils uses @acronym{GNU}.
 exclude_file_name_regexp--sc_texinfo_acronym = doc/perm\.texi
-- 
1.7.2.5