diff options
| author | Jim Meyering <meyering@redhat.com> | 2011-05-23 09:15:20 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2011-05-23 09:15:24 +0200 |
| commit | de2a27a3e9ebc768042af8ade75fb92b966e2424 (patch) | |
| tree | a191e87d93c56a826a8e02e3ba4ad9ca73941903 | |
| parent | b19e2dc8e8eb258d7f58fbbe9da3060f9567ff39 (diff) | |
| download | idutils-de2a27a3e9ebc768042af8ade75fb92b966e2424.tar.gz idutils-de2a27a3e9ebc768042af8ade75fb92b966e2424.tar.bz2 idutils-de2a27a3e9ebc768042af8ade75fb92b966e2424.zip | |
maint: adapt to use gnulib's tight-scope rule; update gnulib to latest
* cfg.mk (_gl_TS_headers): Define.
(_gl_TS_obj_files): Likewise.
* src/Makefile.am (sc_tight_scope): Remove rule.
* gnulib: Update to latest.
| -rw-r--r-- | cfg.mk | 6 | ||||
| m--------- | gnulib | 0 | ||||
| -rw-r--r-- | src/Makefile.am | 27 |
3 files changed, 3 insertions, 30 deletions
@@ -25,9 +25,6 @@ local-checks-to-skip = \ old_NEWS_hash = 7c42fc431cadd9164dde6f9a7113b920 -sc_tight_scope: - $(MAKE) -C src $@ - include $(srcdir)/dist-check.mk update-copyright-env = \ @@ -44,3 +41,6 @@ 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) + +export _gl_TS_headers = lid.h $(srcdir)/../libidu/*.h +export _gl_TS_obj_files = *.$(OBJEXT) ../libidu/*.$(OBJEXT) diff --git a/gnulib b/gnulib -Subproject 739321ef60661c7b51a4c7a3fa23957a4d9dbbc +Subproject 9df761edc6b29dbe2b7009b15dfe26a296d50a9 diff --git a/src/Makefile.am b/src/Makefile.am index c3f7a65..b1afb47 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,30 +16,3 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib \ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) LDADD = ../libidu/libidu.a ../lib/libgnu.a $(LIBINTL) ../lib/libgnu.a - -# Most functions in src/*.c should have static scope. -# Any that don't must be marked with `extern', but `main' -# and `usage' are exceptions. They're always extern, but -# don't need to be marked. -# -# The second nm|grep checks for file-scope variables with `extern' scope. -.PHONY: sc_tight_scope -sc_tight_scope: $(all_programs) - @t=exceptions-$$$$; \ - trap "s=$$?; rm -f $$t; exit $$s" 0 1 2 13 15; \ - ( printf '^main$$\n^usage$$\n'; \ - perl -ne '/^extern .*?\**(\w+) *\(/ and print "^$$1\$$\n"' \ - $(noinst_HEADERS) $(srcdir)/../libidu/*.h ) > $$t; \ - nm -e *.$(OBJEXT) ../libidu/*.$(OBJEXT) \ - | sed -n 's/.* T //p' \ - | grep -Ev -f $$t && \ - { echo 'the above functions should have static scope' 1>&2; \ - exit 1; } || : ; \ - ( printf '^program_name$$\n'; \ - perl -ne '/^extern .*?\**(\w+);/ and print "^$$1\$$\n"' \ - $(noinst_HEADERS) $(srcdir)/../libidu/*.h ) > $$t; \ - nm -e *.$(OBJEXT) ../libidu/*.$(OBJEXT) \ - | sed -n 's/.* [BD] //p' \ - | grep -Ev -f $$t && \ - { echo 'the above variables should have static scope' 1>&2; \ - exit 1; } || : |