[PATCH] maint: stop using .x-sc_* files to list syntax-check exemptions

[Jim Meyering]

FYI, clean up:

>From 9aff1f202918bc2f4aa958d4744d1216c00ee50c Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sun, 20 Mar 2011 11:03:10 +0100
Subject: [PATCH] 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_GPL_version: Remove file.
* .x-sc_prohibit_always-defined_macros: Likewise.
* Makefile.am (EXTRA_DIST): Remove them from here, too.
* cfg.mk: Define variables to exempt the same files.
---
 .x-sc_GPL_version                    |    1 -
 .x-sc_prohibit_always-defined_macros |    2 --
 Makefile.am                          |    2 --
 bootstrap.conf                       |    1 -
 cfg.mk                               |   11 +++++++++++
 gnulib                               |    2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)
 delete mode 100644 .x-sc_GPL_version
 delete mode 100644 .x-sc_prohibit_always-defined_macros

diff --git a/.x-sc_GPL_version b/.x-sc_GPL_version
deleted file mode 100644
index a7c96e0..0000000
--- a/.x-sc_GPL_version
+++ /dev/null
@@ -1 +0,0 @@
-build-aux/vc-list-files
diff --git a/.x-sc_prohibit_always-defined_macros 
b/.x-sc_prohibit_always-defined_macros
deleted file mode 100644
index 3590338..0000000
--- a/.x-sc_prohibit_always-defined_macros
+++ /dev/null
@@ -1,2 +0,0 @@
-^parted/strlist\.h$
-^parted/table\.h$
diff --git a/Makefile.am b/Makefile.am
index 70ca26b..3a69832 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,8 +8,6 @@ EXTRA_DIST =                            \
   libparted.pc.in                      \
   parted.spec.in                       \
   parted.spec                          \
-  .x-sc_GPL_version                    \
-  .x-sc_prohibit_always-defined_macros \
   scripts/data/abi/baseline_symbols.txt \
   scripts/extract_symvers              \
   cfg.mk                               \
diff --git a/bootstrap.conf b/bootstrap.conf
index eefe860..ebbd2af 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -19,7 +19,6 @@
 # We don't need these modules.
 avoided_gnulib_modules='
        --avoid=dummy
-       --avoid=lock
 '

 # gnulib modules used by this package.
diff --git a/cfg.mk b/cfg.mk
index 5cb6976..773e2ef 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -57,3 +57,14 @@ bootstrap-tools = autoconf,automake,gettext,gnulib,gperf
 update-copyright-env = \
   UPDATE_COPYRIGHT_USE_INTERVALS=1 \
   UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79
+
+#==> .j/.x-sc_GPL_version <==
+#build-aux/vc-list-files
+
+exclude_file_name_regexp--sc_bindtextdomain = ^(libparted/)?tests/.*\.c$$
+
+exclude_file_name_regexp--sc_cross_check_PATH_usage_in_tests = \
+  ^libparted/tests/t.*\.sh$$
+
+exclude_file_name_regexp--sc_prohibit_always-defined_macros = \
+  ^parted/(strlist|table)\.h$$
diff --git a/gnulib b/gnulib
index 86fd211..36152fb 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 86fd2114ac3940e03a02e99658c8df88aed8a235
+Subproject commit 36152fb50f3fbb0597793621cbfd10902ac4cf46
--
1.7.4.1.499.g53f9