diff options
author | Jim Meyering <meyering@redhat.com> | 2012-09-18 16:25:19 +0200 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2012-09-18 16:25:19 +0200 |
commit | 4eb373492e2fb171314215a2d68baa0a47c34918 (patch) | |
tree | edd47799167158bff9fff6eec82ed85db78d2808 /top/maint.mk | |
parent | 0bd094419b485b9cb8d2732a3f120097a0dc3bd6 (diff) | |
download | gnulib-4eb373492e2fb171314215a2d68baa0a47c34918.tar.gz |
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.
Diffstat (limited to 'top/maint.mk')
-rw-r--r-- | top/maint.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/top/maint.mk b/top/maint.mk index ccf09a2cdb..5d63b49338 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 \ |