From b19e2dc8e8eb258d7f58fbbe9da3060f9567ff39 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Sun, 20 Mar 2011 09:56:57 +0100
Subject: maint: stop using .x-sc_* files to list syntax-check exemptions

Instead, use the new mechanism with which you merely use a
variable (derived from the rule name) defined in cfg.mk to an ERE
matching the exempted file names.
* gnulib: Update to latest, to get maint.mk that implements this.
* .x-sc_cast_of_argument_to_free: Remove file.
* .x-sc_program_name: Likewise.
* .x-sc_prohibit_always_true_header_tests: Likewise.
* .x-sc_require_config_h: Likewise.
* .x-sc_require_config_h_first: Likewise.
* Makefile.am (EXTRA_DIST): Remove them from here, too.
* cfg.mk: Define variables to exempt the same files.
---
 .x-sc_cast_of_argument_to_free          | 1 -
 .x-sc_program_name                      | 1 -
 .x-sc_prohibit_always_true_header_tests | 2 --
 .x-sc_require_config_h                  | 2 --
 .x-sc_require_config_h_first            | 2 --
 Makefile.am                             | 2 --
 cfg.mk                                  | 9 +++++++++
 7 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100644 .x-sc_cast_of_argument_to_free
 delete mode 100644 .x-sc_program_name
 delete mode 100644 .x-sc_prohibit_always_true_header_tests
 delete mode 100644 .x-sc_require_config_h
 delete mode 100644 .x-sc_require_config_h_first

diff --git a/.x-sc_cast_of_argument_to_free b/.x-sc_cast_of_argument_to_free
deleted file mode 100644
index a0381d1..0000000
--- a/.x-sc_cast_of_argument_to_free
+++ /dev/null
@@ -1 +0,0 @@
-^src/lid\.c$
diff --git a/.x-sc_program_name b/.x-sc_program_name
deleted file mode 100644
index 3b37365..0000000
--- a/.x-sc_program_name
+++ /dev/null
@@ -1 +0,0 @@
-testsuite/
diff --git a/.x-sc_prohibit_always_true_header_tests b/.x-sc_prohibit_always_true_header_tests
deleted file mode 100644
index b476bf8..0000000
--- a/.x-sc_prohibit_always_true_header_tests
+++ /dev/null
@@ -1,2 +0,0 @@
-src/lid.c
-ChangeLog
diff --git a/.x-sc_require_config_h b/.x-sc_require_config_h
deleted file mode 100644
index 6183d47..0000000
--- a/.x-sc_require_config_h
+++ /dev/null
@@ -1,2 +0,0 @@
-^testsuite/single_file_token_bug\.c$
-^src/lid-[aegl]id\.c$
diff --git a/.x-sc_require_config_h_first b/.x-sc_require_config_h_first
deleted file mode 100644
index 6183d47..0000000
--- a/.x-sc_require_config_h_first
+++ /dev/null
@@ -1,2 +0,0 @@
-^testsuite/single_file_token_bug\.c$
-^src/lid-[aegl]id\.c$
diff --git a/Makefile.am b/Makefile.am
index ca4a382..9c5dba8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,8 +5,6 @@ SUBDIRS = lib libidu src lisp doc man gnulib-tests testsuite po
 EXTRA_DIST = \
   .prev-version \
   .version \
-  .x-sc_cast_of_argument_to_free \
-  .x-sc_require_config_h \
   cfg.mk \
   dist-check.mk \
   idutils.spec \
diff --git a/cfg.mk b/cfg.mk
index 50f56b6..9be2819 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -35,3 +35,12 @@ update-copyright-env = \
   UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79
 
 _hv_file = $(srcdir)/testsuite/help-version
+
+exclude_file_name_regexp--sc_cast_of_argument_to_free = ^src/lid\.c$$
+exclude_file_name_regexp--sc_program_name = ^testsuite/
+exclude_file_name_regexp--sc_prohibit_always_true_header_tests = src/lid\.c$$
+exclude_file_name_regexp--sc_prohibit_strcmp = ^libidu/iduglobal\.h$$
+
+config_h_exempt = ^(testsuite/single_file_token_bug\.c|src/lid-[aegl]id\.c)$$
+exclude_file_name_regexp--sc_require_config_h = $(config_h_exempt)
+exclude_file_name_regexp--sc_require_config_h_first = $(config_h_exempt)
-- 
cgit v1.2.3