[ng] rename: am__toupper -> am.util.toupper

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

diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 1035ef6dac6ddbc27201426ab33aa02628237198..e3a0ee10c3e2703e59ccb11ee85a57feb48e41c6 100644 (file)
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -179,11 +179,11 @@ am.util.uniq = $(strip \
 ##        tolower="\$(subst $C,$c,$tolower)"
 ##    done
 ##    echo "am.util.tolower = $tolower"
-##    echo "am__toupper = $toupper"
+##    echo "am.util.toupper = $toupper"
 
 am.util.tolower = $(subst Z,z,$(subst Y,y,$(subst X,x,$(subst W,w,$(subst V,v,$(subst U,u,$(subst T,t,$(subst S,s,$(subst R,r,$(subst Q,q,$(subst P,p,$(subst O,o,$(subst N,n,$(subst M,m,$(subst L,l,$(subst K,k,$(subst J,j,$(subst I,i,$(subst H,h,$(subst G,g,$(subst F,f,$(subst E,e,$(subst D,d,$(subst C,c,$(subst B,b,$(subst A,a,$1))))))))))))))))))))))))))
 
-am__toupper = $(subst z,Z,$(subst y,Y,$(subst x,X,$(subst w,W,$(subst v,V,$(subst u,U,$(subst t,T,$(subst s,S,$(subst r,R,$(subst q,Q,$(subst p,P,$(subst o,O,$(subst n,N,$(subst m,M,$(subst l,L,$(subst k,K,$(subst j,J,$(subst i,I,$(subst h,H,$(subst g,G,$(subst f,F,$(subst e,E,$(subst d,D,$(subst c,C,$(subst b,B,$(subst a,A,$1))))))))))))))))))))))))))
+am.util.toupper = $(subst z,Z,$(subst y,Y,$(subst x,X,$(subst w,W,$(subst v,V,$(subst u,U,$(subst t,T,$(subst s,S,$(subst r,R,$(subst q,Q,$(subst p,P,$(subst o,O,$(subst n,N,$(subst m,M,$(subst l,L,$(subst k,K,$(subst j,J,$(subst i,I,$(subst h,H,$(subst g,G,$(subst f,F,$(subst e,E,$(subst d,D,$(subst c,C,$(subst b,B,$(subst a,A,$1))))))))))))))))))))))))))
 
 # Canonicalize the given filename.  See also the &canonicalize function
 # in the automake script.

diff --git a/lib/am/parallel-tests.am b/lib/am/parallel-tests.am
index 86d9fbe1cb32dc7be09425aac317158a93fde603..be9fdd12f19279190d78c4206f943407f4f15f17 100644 (file)
--- a/lib/am/parallel-tests.am
+++ b/lib/am/parallel-tests.am
@@ -64,7 +64,7 @@ am__runtest = \
 
 ## Turn e.g., ".test" in "_TEST", and return the empty string unchanged.
 am__tpfx = \
-  $(if $1,$(call am__toupper,$(patsubst .%,%_,$1)))
+  $(if $1,$(call am.util.toupper,$(patsubst .%,%_,$1)))
 
 !define am__handle_per_suffix_test
 !

diff --git a/t/internals.tap b/t/internals.tap
index 256784cf0b5471ce71d26ef00acc5ee1fc582aca..ef26cbe3583b2652a3a06835ab75dce0b0851e27 100755 (executable)
--- a/t/internals.tap
+++ b/t/internals.tap
@@ -114,20 +114,20 @@ test-strip-suffixes:
 
 .PHONY: test-toupper
 test-toupper:
-       test '$(call am__toupper,a)'  = A
-       test '$(call am__toupper,A)'  = A
-       test '$(call am__toupper,aba)' = ABA
-       test '$(call am__toupper,a b)' = 'A B'
-       test '$(call am__toupper, a B)' = ' A B'
-       test '$(call am__toupper,Ab  )' = 'AB  '
-       test '$(call am__toupper,A       B c )' = 'A     B C '
-       test '$(call am__toupper,0)'  = 0
-       test '$(call am__toupper,0d)' = 0D
-       test '$(call am__toupper,@:&/?-)' = '@:&/?-'
-       test '$(call am__toupper,a@B)' = A@B
-       test '$(call am__toupper,zxzxzxZXZxzxzxzxzx)' = ZXZXZXZXZXZXZXZXZX
-       test '$(call am__toupper,$(lower))' = '$(upper)'
-       test '$(call am__toupper,$(upper))' = '$(upper)'
+       test '$(call am.util.toupper,a)'        = A
+       test '$(call am.util.toupper,A)'        = A
+       test '$(call am.util.toupper,aba)'      = ABA
+       test '$(call am.util.toupper,a b)'      = 'A B'
+       test '$(call am.util.toupper, a B)'     = ' A B'
+       test '$(call am.util.toupper,Ab  )'     = 'AB  '
+       test '$(call am.util.toupper,A   B c )' = 'A     B C '
+       test '$(call am.util.toupper,0)'        = 0
+       test '$(call am.util.toupper,0d)'       = 0D
+       test '$(call am.util.toupper,@:&/?-)'   = '@:&/?-'
+       test '$(call am.util.toupper,a@B)'      = A@B
+       test '$(call am.util.toupper,zxzxzxZXZxzxzxzxzx)' = ZXZXZXZXZXZXZXZXZX
+       test '$(call am.util.toupper,$(lower))' = '$(upper)'
+       test '$(call am.util.toupper,$(upper))' = '$(upper)'
 
 .PHONY: test-tolower
 test-tolower:
@@ -190,7 +190,7 @@ command_ok_  am.util.strip-last-word    $MAKE test-strip-last-word
 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__toupper                $MAKE test-toupper
+command_ok_  am.util.toupper            $MAKE test-toupper
 command_ok_  am__canon                  $MAKE test-canonicalize
 command_ok_  "am__newline (1)"          $MAKE test-newline-1
 command_ok_  "am__newline (2)"          $MAKE test-newline-2