From de2a27a3e9ebc768042af8ade75fb92b966e2424 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Mon, 23 May 2011 09:15:20 +0200
Subject: 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.
---
 src/Makefile.am | 27 ---------------------------
 1 file changed, 27 deletions(-)

(limited to 'src')

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; } || :
-- 
cgit v1.2.3