[Automake-NG] [PATCH 32/33] [ng] rename: am__canon -> am.util.canon

[Stefano Lattarini]

Signed-off-by: Stefano Lattarini <address@hidden>
---
 lib/am/check-typos.am |    6 +++---
 lib/am/header-vars.am |    2 +-
 t/internals.tap       |   28 ++++++++++++++--------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/lib/am/check-typos.am b/lib/am/check-typos.am
index 5b19111..e52e5e4 100644
--- a/lib/am/check-typos.am
+++ b/lib/am/check-typos.am
@@ -71,9 +71,9 @@ endif
 # Canonicalized names of programs and libraries (vanilla or libtool) that
 # have been declared.
 .am/vartypos/known-canon-proglibs := \
-  $(sort $(call am__canon, $(am.all-progs) \
-                           $(am.all-libs) \
-                          $(am.all-ltlibs)))
+  $(sort $(call am.util.canon, $(am.all-progs) \
+                               $(am.all-libs) \
+                               $(am.all-ltlibs)))
 
 # Extract 'foo' from something like "EXTRA_nodist_foo_SOURCES".
 define .am/vartypos/canon-name-from-var
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index e3a0ee1..eb1df5f 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -188,7 +188,7 @@ am.util.toupper = $(subst z,Z,$(subst y,Y,$(subst 
x,X,$(subst w,W,$(subst v,V,$(
 # Canonicalize the given filename.  See also the &canonicalize function
 # in the automake script.
 
-am__canon = $(strip \
+am.util.canon = $(strip \
   $(subst ~,_,\
   $(subst },_,\
   $(subst |,_,\
diff --git a/t/internals.tap b/t/internals.tap
index ef26cbe..8063e04 100755
--- a/t/internals.tap
+++ b/t/internals.tap
@@ -148,19 +148,19 @@ test-tolower:
 
 .PHONY: test-canonicalize
 test-canonicalize:
-       test '$(call am__canon,A)' = A
-       test '$(call am__canon, b)' = b
-       test '$(call am__canon, foo      )' = foo
-       test '$(call am__canon,$(upper)$(lower)$(digits)_)' = 
'$(upper)$(lower)$(digits)_'
-       test '$(call am__canon,@)' = '@'
-       test '$(call am__canon,%)' = '_'
-       test '$(call am__canon,.&@!;)' = 'address@hidden'
-       test '$(call am__canon,')' = '_'
-       test '$(call am__canon,$(dollar))' = '_'
-       test '$(call am__canon,$(bslash))' = '_'
-       test '$(call am__canon,$(comma))' = '_'
-       test '$(call am__canon,$(bslash)$(comma))' = '__'
-       test '$(call am__canon,x$(comma)@$(bslash))' = 'address@hidden'
+       test '$(call am.util.canon,A)' = A
+       test '$(call am.util.canon, b)' = b
+       test '$(call am.util.canon, foo  )' = foo
+       test '$(call am.util.canon,$(upper)$(lower)$(digits)_)' = 
'$(upper)$(lower)$(digits)_'
+       test '$(call am.util.canon,@)' = '@'
+       test '$(call am.util.canon,%)' = '_'
+       test '$(call am.util.canon,.&@!;)' = 'address@hidden'
+       test '$(call am.util.canon,')' = '_'
+       test '$(call am.util.canon,$(dollar))' = '_'
+       test '$(call am.util.canon,$(bslash))' = '_'
+       test '$(call am.util.canon,$(comma))' = '_'
+       test '$(call am.util.canon,$(bslash)$(comma))' = '__'
+       test '$(call am.util.canon,x$(comma)@$(bslash))' = 'address@hidden'
 
 .PHONY: test-newline-1
 test-newline-1:
@@ -191,7 +191,7 @@ command_ok_  am.util.uniq               $MAKE test-uniq
 command_ok_  am.util.strip-suffixes     $MAKE test-strip-suffixes
 command_ok_  am.util.tolower            $MAKE test-tolower
 command_ok_  am.util.toupper            $MAKE test-toupper
-command_ok_  am__canon                  $MAKE test-canonicalize
+command_ok_  am.util.canon              $MAKE test-canonicalize
 command_ok_  "am__newline (1)"          $MAKE test-newline-1
 command_ok_  "am__newline (2)"          $MAKE test-newline-2
 command_ok_  "am__newline (3)"          $MAKE test-newline-3
-- 
1.7.10.4