From: Stefano Lattarini Date: Sat, 21 Jul 2012 09:52:49 +0000 (+0200) Subject: [ng] rename: am__error -> am.error X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f692ad8d762d54357e63e35fe42edcb09f6106ed;p=thirdparty%2Fautomake.git [ng] rename: am__error -> am.error Signed-off-by: Stefano Lattarini --- diff --git a/lib/am/check-typos.am b/lib/am/check-typos.am index ebc0402e6..b752b5916 100644 --- a/lib/am/check-typos.am +++ b/lib/am/check-typos.am @@ -88,8 +88,8 @@ endef define .am/vartypos/check $(eval $0/canon := $(call .am/vartypos/canon-name-from-var,$1)) $(if $(filter $($0/canon),$(.am/vartypos/known-canon-proglibs)),, \ - $(call am__error,variable '$1' is defined but no program) \ - $(call am__error, or library has '$($0/canon)' as canonical name)) + $(call am.error,variable '$1' is defined but no program) \ + $(call am.error, or library has '$($0/canon)' as canonical name)) endef # The variables candidate for checking of typos. diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index 0549eaa19..7a4e8b592 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -33,7 +33,7 @@ MAKEFLAGS += --no-builtin-rules ## code will take care later of that). This will allow us to diagnose more ## issues at once, rather than stopping at the first one. am__seen_error := -define am__error +define am.error $(warning $1)$(eval am__seen_error := yes) endef diff --git a/lib/am/parallel-tests.am b/lib/am/parallel-tests.am index 83b90d511..0d848773a 100644 --- a/lib/am/parallel-tests.am +++ b/lib/am/parallel-tests.am @@ -88,7 +88,7 @@ am__tpfx = \ ## FIXME: we want that? !TEST_EXTENSIONS ?= .test !$(foreach am__e,$(filter-out .%,$(TEST_EXTENSIONS)),\ -! $(call am__error,invalid test extension: '$(am__e)')) +! $(call am.error,invalid test extension: '$(am__e)')) !$(foreach am__e,$(TEST_EXTENSIONS), \ ! $(eval $(call am__handle_per_suffix_test,$(am__e)))) ## It is *imperative* that the "empty" suffix goes last. Otherwise, a