From 0da0af8acce13bf9d0936ea5a6db8697d095bce0 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 9 May 2011 13:27:55 +0200 Subject: [PATCH] maint.mk: tweak new rule's name not to impinge * top/maint.mk (_gl_tight_scope): Rename from sc_tight_scope-0. (sc_tight_scope): Use new rule name rather than $@-0. --- ChangeLog | 4 ++++ top/maint.mk | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7feeba08dd..22442c5211 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-05-09 Jim Meyering + maint.mk: tweak new rule's name not to impinge + * top/maint.mk (_gl_tight_scope): Rename from sc_tight_scope-0. + (sc_tight_scope): Use new rule name rather than $@-0. + maint.mk: add a syntax-check rule to ensure tightly-scoped symbols * top/maint.mk (sc_tight_scope): New rule. (sc_tight_scope-0): New rule, ifdef'd out. diff --git a/top/maint.mk b/top/maint.mk index 793915cc7f..1cc3ca2dff 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -1334,8 +1334,8 @@ _gl_TS_dir ?= src ALL_RECURSIVE_TARGETS += sc_tight_scope sc_tight_scope: tight-scope.mk @grep noinst_HEADERS $(_gl_TS_dir)/Makefile.am > /dev/null 2>&1 \ - && $(MAKE) -s -C $(_gl_TS_dir) \ - -f Makefile -f '$(abs_srcdir)/tight-scope.mk' $@-0 \ + && $(MAKE) -s -C $(_gl_TS_dir) -f Makefile \ + -f '$(abs_srcdir)/tight-scope.mk' _gl_tight_scope || : @rm -f $< @@ -1358,8 +1358,8 @@ _gl_TS_function_regex ?= \ # Without gnulib's progname module, you might put program_name here. _gl_TS_unmarked_extern_vars ?= _gl_TS_var_regex ?= ^(?:extern|XTERN) .*?\**(\w+)(\[.*?\])?; -.PHONY: sc_tight_scope-0 -sc_tight_scope-0: $(bin_PROGRAMS) +.PHONY: _gl_tight_scope +_gl_tight_scope: $(bin_PROGRAMS) t=exceptions-$$$$; \ trap 's=$$?; rm -f $$t; exit $$s' 0; \ for sig in 1 2 3 13 15; do \ -- 2.30.2