[ng] rename: am__memoize -> am.memoize

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/lib/am/compile.am b/lib/am/compile.am
index ce235c0e6928b3d038da096132710a9740b2d5d6..f874550b78264c133e7fc264046a8d7575b04773 100644 (file)
--- a/lib/am/compile.am
+++ b/lib/am/compile.am
@@ -16,7 +16,7 @@
 
 if %?STDINC%
 AM_DEFAULT_INCLUDES = \
-  $(call am__memoize,AM_DEFAULT_INCLUDES,$(strip \
+  $(call am.memoize,AM_DEFAULT_INCLUDES,$(strip \
 ## We want '-I. -I$(srcdir)', but the latter -I is redundant and
 ## unaesthetic in non-VPATH builds, so get rid of it if it is not
 ## actually needed.

diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 9179d9825a05a0968dafd60a672f3858f78ef185..2312fd457264dcec24643df9bd6817d4daee6c20 100644 (file)
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -18,17 +18,17 @@ am.dist.common-files += %DIST-COMMON%
 
 ## Use 'sort', not 'am.util.uniq', for performance reasons.  Luckily, we
 ## don't care in which order the distributed files are.
-am.dist.all-files = $(call am__memoize,am.dist.all-files,$(strip $(sort \
+am.dist.all-files = $(call am.memoize,am.dist.all-files,$(strip $(sort \
   $(am.dist.common-files) $(am.dist.sources) $(TEXINFOS) $(EXTRA_DIST))))
 
 ## Try to avoid repeated slashes in the entries, to make the filtering
 ## in the 'am.dist.files-tmp2' definition below more reliable.
 ## This idiom should compress up to four consecutive '/' characters
 ## in each $(am.dist.all-files) entry.
-am.dist.files-tmp1 = $(call am__memoize,am.dist.files-tmp1, \
+am.dist.files-tmp1 = $(call am.memoize,am.dist.files-tmp1, \
   $(subst //,/,$(subst //,/,$(am.dist.all-files))))
 
-am.dist.files-tmp2 = $(call am__memoize,am.dist.files-tmp2, \
+am.dist.files-tmp2 = $(call am.memoize,am.dist.files-tmp2, \
 ## Files filtered out here require an ad-hoc "munging"; see the two
 ## following 'patsubst's.
   $(filter-out $(srcdir)/% $(top_srcdir)/%, $(am.dist.files-tmp1)) \
@@ -55,7 +55,7 @@ am.dist.files-tmp2 = $(call am__memoize,am.dist.files-tmp2, \
 
 ## Strip extra whitespaces, for more safety.
 am.dist.files-cooked = \
-  $(call am__memoize,am.dist.files-cooked,$(strip $(am.dist.files-tmp2)))
+  $(call am.memoize,am.dist.files-cooked,$(strip $(am.dist.files-tmp2)))
 
 ## Given the pre-processing done above to the list of distributed files,
 ## this definition ensures that we won't try to create the wrong
@@ -66,7 +66,7 @@ am.dist.files-cooked = \
 ## "$(distdir)/$(srcdir)/subdir" -- which, in a VPATH build where
 ## "$(subdir) = ..", would be the build directory!
 am.dist.parent-dirs = \
-  $(call am__memoize,am.dist.parent-dirs,$(strip $(sort \
+  $(call am.memoize,am.dist.parent-dirs,$(strip $(sort \
     $(filter-out ., $(patsubst ./%,%,$(dir $(am.dist.files-cooked)))))))
 
 am.mkdir-for-dist = \

diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index bf2ad731e84184842c834df1ca7a493b9db351e0..c709398811fc3466097efd875f0733aac2877433 100644 (file)
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -229,8 +229,8 @@ am.util.canon = $(strip \
 ## we can't afford to re-calculate it over and over every time the
 ## variable gets expanded.  Example of usage:
 ##
-##   var1 = $(am__memoize,var1,$(shell EXPENSIVE-COMMAND-LINE))
-##   var2 = $(am__memoize,var2,$(sort VERY-LONG-LIST))
+##   var1 = $(am.memoize,var1,$(shell EXPENSIVE-COMMAND-LINE))
+##   var2 = $(am.memoize,var2,$(sort VERY-LONG-LIST))
 ##
 ## This API and implementation seems to work around a bug in GNU make
 ## (present up to and including version 3.82) which caused our first
@@ -241,7 +241,7 @@ am.util.canon = $(strip \
 ##
 ## So please don't change this without a very good reason.
 ##
-am__memoize = $(or $(am__memoized_value/$1),$(strip \
+am.memoize = $(or $(am__memoized_value/$1),$(strip \
   $(eval am__memoized_value/$1 := $$2))$(am__memoized_value/$1))
 
 ## $(call am.util.strip-suffixes, SUFFIXES, LIST)

diff --git a/lib/am/parallel-tests.am b/lib/am/parallel-tests.am
index 6a365bf647910f386aa8776fe496e01d6c26e435..e730ec2d74d53f0d13f091781da4f94f10b658c3 100644 (file)
--- a/lib/am/parallel-tests.am
+++ b/lib/am/parallel-tests.am
@@ -303,17 +303,17 @@ am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
 
 # This supports runtime overriding of $(TESTS) and $(XFAIL_TESTS).
 !am__test_bases ?= \
-!  $(call am__memoize,am__test_bases,$(call am__get_test_bases,$(TESTS)))
+!  $(call am.memoize,am__test_bases,$(call am__get_test_bases,$(TESTS)))
 am__xfail_test_bases = \
-  $(call am__memoize,am__xfail_test_bases,$(call am__get_test_bases,$(XFAIL_TESTS)))
+  $(call am.memoize,am__xfail_test_bases,$(call am__get_test_bases,$(XFAIL_TESTS)))
 
 # The $(strip) is to work around the GNU make 3.80 bug where trailing
 # whitespace in "TESTS = foo.test $(empty)" causes $(TESTS_LOGS) to
 # erroneously expand to "foo.log .log".
 am__test_results = \
-  $(call am__memoize,am__test_results,$(addsuffix .trs,$(strip $(am__test_bases))))
+  $(call am.memoize,am__test_results,$(addsuffix .trs,$(strip $(am__test_bases))))
 am__test_logs = \
-  $(call am__memoize,am__test_logs,$(addsuffix .log,$(strip $(am__test_bases))))
+  $(call am.memoize,am__test_logs,$(addsuffix .log,$(strip $(am__test_bases))))
 
 am__mostlyclean_files += $(am__test_results) $(am__test_logs)
 

diff --git a/t/memoize.tap b/t/memoize.tap
index 587bd87283111b711cf779e8015807f13dad4f55..d24a7117230883d377c75884b0d743376c0c4708 100755 (executable)
--- a/t/memoize.tap
+++ b/t/memoize.tap
@@ -52,7 +52,7 @@ tcount=0
 
 T "basic usage" <<'END'
 
-foo = $(call am__memoize,foo,ok)
+foo = $(call am.memoize,foo,ok)
 
 test:
        test '$(foo)' = ok
@@ -63,7 +63,7 @@ END
 
 T "variables expanding to blanks only (1)" <<'END'
 
-foo = $(call am__memoize,foo,$(am.chars.empty) )
+foo = $(call am.memoize,foo,$(am.chars.empty) )
 
 test:
        test '$(foo)' = ' '
@@ -75,7 +75,7 @@ END
 T "variables expanding to blanks only (2)" <<END
 
 blank = \$(am.chars.empty) $tab$tab   \$(am.chars.empty)
-foo = \$(call am__memoize,foo,\$(blank))
+foo = \$(call am.memoize,foo,\$(blank))
 
 test:
        test '\$(foo)' = ' $tab$tab   '
@@ -98,7 +98,7 @@ set -x # Re-enable shell traces.
 
 T "very long variable name" <<END
 
-$var = \$(call am__memoize,$var,foo)
+$var = \$(call am.memoize,$var,foo)
 
 test:
        # Why we silence this?
@@ -122,7 +122,7 @@ set -x # Re-enable shell traces.
 
 T "very long variable name with long content" <<END
 
-$var = \$(call am__memoize,$var,$val)
+$var = \$(call am.memoize,$var,$val)
 
 test:
        # Why we silence this?
@@ -135,7 +135,7 @@ END
 
 T "memoize indirect recursive variable expansion" <<'END'
 
-foo = $(call am__memoize,foo,$(indir))
+foo = $(call am.memoize,foo,$(indir))
 
 ## This is delibrately placed after the memoize call.
 indir = zardoz
@@ -149,7 +149,7 @@ END
 
 T "memoize indirect immediate variable expansion" <<'END'
 
-foo = $(call am__memoize,foo,$(indir))
+foo = $(call am.memoize,foo,$(indir))
 
 ## This is delibrately placed after the memoize call.
 indir := blob
@@ -164,7 +164,7 @@ END
 T "memoize function call (containing builtin calls)" <<'END'
 
 my_func = $(firstword $(sort $(1)))
-foo = $(call am__memoize,foo,$(call my_func, 6 3 1 7))
+foo = $(call am.memoize,foo,$(call my_func, 6 3 1 7))
 
 test:
        test '$(foo)' = 1
@@ -175,7 +175,7 @@ END
 
 T "expanded as function argument" <<'END'
 
-foo = $(call am__memoize,foo,bar)
+foo = $(call am.memoize,foo,bar)
 func = ::$(0)::$(1)::
 
 test:
@@ -189,7 +189,7 @@ END
 
 T "expanded as function argument (trickier)" <<'END'
 
-foo = $(call am__memoize,foo,zardoz)
+foo = $(call am.memoize,foo,zardoz)
 indir_func = ::$($1)::
 
 test:
@@ -203,9 +203,9 @@ END
 
 T "expanded into another memoized variable" <<'END'
 
-foo = $(call am__memoize,foo,one $(bar))
-bar = $(call am__memoize,bar,two $(baz))
-baz = $(call am__memoize,baz,$(sort 4 3))
+foo = $(call am.memoize,foo,one $(bar))
+bar = $(call am.memoize,bar,two $(baz))
+baz = $(call am.memoize,baz,$(sort 4 3))
 
 test:
        test '$(foo)' = 'one two 3 4'
@@ -217,7 +217,7 @@ END
 T "memoization actually takes place (1)" <<'END'
 
 indir := ok
-foo = $(call am__memoize,foo,$(indir))
+foo = $(call am.memoize,foo,$(indir))
 expand-it := $(foo)
 override indir := ko
 
@@ -232,7 +232,7 @@ T "memoization actually takes place (2)" <<'END'
 
 indir := ok
 expand = $(eval expanded-to := $$($1))
-foo = $(call am__memoize,foo,$(indir))
+foo = $(call am.memoize,foo,$(indir))
 $(call expand,foo)
 override indir := ko
 
@@ -246,8 +246,8 @@ END
 
 T "memoization actually takes place (3)" <<'END'
 
-foo1 = $(call am__memoize,foo1,$(shell test -f x && echo "+"))
-foo2 = $(call am__memoize,foo2,$(shell test -f y || echo "-"))
+foo1 = $(call am.memoize,foo1,$(shell test -f x && echo "+"))
+foo2 = $(call am.memoize,foo2,$(shell test -f y || echo "-"))
 
 test: one two
 two: one
@@ -275,7 +275,7 @@ END
 
 T "definition on multiple lines" <<'END'
 
-foo = $(call am__memoize,foo,a \
+foo = $(call am.memoize,foo,a \
   b \
   c \
   \
@@ -298,7 +298,7 @@ T "known GNU make issue (https://savannah.gnu.org/patch/?7534)" <<'END'
 setup := $(shell mkdir -p t/pm && : > t/pm/Cond2.pl)
 
 TESTS = $(wildcard t/pm/Cond2.pl)
-am__test_bases = $(call am__memoize,am__test_bases,$(TESTS))
+am__test_bases = $(call am.memoize,am__test_bases,$(TESTS))
 
 test:
        test '$(am__test_bases)' = 't/pm/Cond2.pl'
@@ -320,7 +320,7 @@ for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
   mv -f t1 t
 done
 
-echo "list = \$(call am__memoize,list,$line \\" >> big.mk
+echo "list = \$(call am.memoize,list,$line \\" >> big.mk
 cat t >> big.mk
 echo "  $line)" >> big.mk