[PATCH 1/2] maint.mk: generalize _gl_tight_scope for non-recursive make

[Jim Meyering]

I noticed that the tight-scope syntax-check rule has been skipped
since the conversion to non-recursive make.
This makes it possible for me to reenable it.
(another patch is required in coreutils)

>From 4eb373492e2fb171314215a2d68baa0a47c34918 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Tue, 18 Sep 2012 16:25:19 +0200
Subject: [PATCH 1/2] maint.mk: generalize _gl_tight_scope for non-recursive
 make

* top/maint.mk (_gl_tight_scope): Remove a hard-coded assumption
that *.h would describe additional .h files in the directory
specified by $(_gl_TS_dir).  I.e., add this...
(_gl_TS_other_headers): New variable.
---
 ChangeLog    | 6 ++++++
 top/maint.mk | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 38ad080..55ef86b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2012-09-18  Jim Meyering  <address@hidden>

+       maint.mk: generalize _gl_tight_scope for non-recursive make
+       * top/maint.mk (_gl_tight_scope): Remove a hard-coded assumption
+       that *.h would describe additional .h files in the directory
+       specified by $(_gl_TS_dir).  I.e., add this...
+       (_gl_TS_other_headers): New variable.
+
        maint.mk: exempt trailing blanks found in "binary" files
        * top/maint.mk (sc_trailing_blank): Filter out any matches found in
        "binary" files, as reported by grep.  Suggested by Richard W.M. Jones
diff --git a/top/maint.mk b/top/maint.mk
index ccf09a2..5d63b49 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1576,6 +1576,7 @@ _gl_TS_obj_files ?= *.$(OBJEXT)
 # Files in which to search for the one-line style extern declarations.
 # $(_gl_TS_dir)-relative.
 _gl_TS_headers ?= $(noinst_HEADERS)
+_gl_TS_other_headers ?= *.h

 .PHONY: _gl_tight_scope
 _gl_tight_scope: $(bin_PROGRAMS)
@@ -1598,7 +1599,8 @@ _gl_tight_scope: $(bin_PROGRAMS)
          && { echo the above functions should have static scope >&2;   \
               exit 1; } || : ;                                         \
        ( printf '^%s$$\n' '__.*' $(_gl_TS_unmarked_extern_vars);       \
-         perl -lne '$(_gl_TS_var_match) and print "^$$1\$$"' $$hdr *.h \
+         perl -lne '$(_gl_TS_var_match) and print "^$$1\$$"'           \
+               $$hdr $(_gl_TS_other_headers)                           \
        ) | sort -u > $$t;                                              \
        nm -e $(_gl_TS_obj_files) | sed -n 's/.* [BCDGRS] //p'          \
             | sort -u | grep -Ev -f $$t                                        
\
--
1.7.12.503.g5976753


>From 3ff028fd56c2aa14ce5e380e81b91e27a0bf8e2c Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Tue, 18 Sep 2012 16:25:41 +0200
Subject: [PATCH 2/2] ChangeLog: fix indentation

---
 ChangeLog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 55ef86b..06f0a2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -76,9 +76,9 @@
        poll/select: document portability problems not fixed by Gnulib.
        * doc/posix-functions/poll.texi: poll does not work well on
        pipes under Windows.  It has the same limitations as select on
-       BeOS.
+       BeOS.
        * doc/posix-functions/select.texi: select does not work well
-       on pipes under Windows.
+       on pipes under Windows.

 2012-09-10  Paul Eggert  <address@hidden>

--
1.7.12.503.g5976753