[PATCH 2/3] maint: move syntax check exemptions into cfg.mk

[Eric Blake]

It's easier to maintain exemptions in a single file than it is
to maintain a bunch of hidden .x files.

* .x-sc_prohibit_tab_based_indentation: Delete file.
* .x-update-copyright: Likewise.
* Makefile.am (syntax_check_exceptions): Delete rule.
* cfg.mk (exclude_file_name_regexp): Move exemptions here.
(local-checks-to-skip): Re-enable copyright check.

Signed-off-by: Eric Blake <address@hidden>
---
 .x-sc_prohibit_tab_based_indentation | 5 -----
 .x-update-copyright                  | 1 -
 ChangeLog                            | 7 +++++++
 Makefile.am                          | 6 +-----
 cfg.mk                               | 7 +++++--
 5 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 .x-sc_prohibit_tab_based_indentation
 delete mode 100644 .x-update-copyright

diff --git a/.x-sc_prohibit_tab_based_indentation 
b/.x-sc_prohibit_tab_based_indentation
deleted file mode 100644
index bd9127e..0000000
--- a/.x-sc_prohibit_tab_based_indentation
+++ /dev/null
@@ -1,5 +0,0 @@
-^GNUMakefile$
-Makefile\.am$
-\.mk$
-^HACKING$
-ChangeLog.*
diff --git a/.x-update-copyright b/.x-update-copyright
deleted file mode 100644
index 725ba40..0000000
--- a/.x-update-copyright
+++ /dev/null
@@ -1 +0,0 @@
-m4/gnulib-cache.m4
diff --git a/ChangeLog b/ChangeLog
index b9cf1f0..fbc9885 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2012-12-22  Eric Blake  <address@hidden>

+       maint: move syntax check exemptions into cfg.mk
+       * .x-sc_prohibit_tab_based_indentation: Delete file.
+       * .x-update-copyright: Likewise.
+       * Makefile.am (syntax_check_exceptions): Delete rule.
+       * cfg.mk (exclude_file_name_regexp): Move exemptions here.
+       (local-checks-to-skip): Re-enable copyright check.
+
        build: update to latest gnulib
        * gnulib: Update to latest.

diff --git a/Makefile.am b/Makefile.am
index 1556fd0..2e077f8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,12 +21,8 @@

 SUBDIRS = . examples lib src doc checks tests

-syntax_check_exceptions =              \
-  .x-sc_prohibit_tab_based_indentation \
-  .x-update-copyright
-
 EXTRA_DIST = bootstrap c-boxes.el cfg.mk maint.mk \
-       .prev-version .version m4/gnulib-cache.m4 $(syntax_check_exceptions)
+       .prev-version .version m4/gnulib-cache.m4
 DISTCLEANFILES = stamp-h
 ## maintainer-clean should remove as much as possible that ./bootstrap can
 ## recreate.  In the m4 directory, keep only gnulib-cache.m4.
diff --git a/cfg.mk b/cfg.mk
index 31de2de..6be77f2 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -28,8 +28,6 @@ local-checks-to-skip =
 local-checks-to-skip += sc_bindtextdomain
 # M4 intentionally uses a coding style that compiles under C++.
 local-checks-to-skip += sc_cast_of_x_alloc_return_value
-# sc_copyright_check is currently broken for multi-line copyrights.
-local-checks-to-skip += sc_copyright_check

 # Our files include "m4.h", which in turn includes <config.h> first.
 config_h_header = "m4\.h"
@@ -42,3 +40,8 @@ sc_prohibit_tab_based_indentation:
  @re='^ *    '                                               \
  msg='TAB in indentation; use only spaces'                   \
    $(_prohibit_regexp)
+
+# List all syntax-check exemptions:
+exclude_file_name_regexp--sc_prohibit_tab_based_indentation = \
+  (^(GNU)?Makefile(\.am)?|\.mk|^HACKING|^ChangeLog.*)$$
+exclude_file_name_regexp--update-copyright = ^m4/gnulib-cache.m4$$
-- 
1.8.0.2