[ng] rename: am__uniq -> am.util.uniq

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

diff --git a/lib/am/compile.am b/lib/am/compile.am
index ceb5c9d38d94dccaea821142a00cc9fd74e19397..ce235c0e6928b3d038da096132710a9740b2d5d6 100644 (file)
--- a/lib/am/compile.am
+++ b/lib/am/compile.am
@@ -20,7 +20,7 @@ AM_DEFAULT_INCLUDES = \
 ## 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.
-    $(call am__uniq, -I. -I$(srcdir) \
+    $(call am.util.uniq, -I. -I$(srcdir) \
       $(foreach am__h, $(AM_CONFIG_HEADERS), \
         $(patsubst %/,%,-I$(dir $(am__h)))))))
 else !%?STDINC%

diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 16de751df147b13ee14ae73a83e4ea3c1636d6e3..39c819ede4a3d1a87505e4c656dbb1d0548d3d7c 100644 (file)
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -16,7 +16,7 @@
 
 am.dist.common-files += %DIST-COMMON%
 
-## Use 'sort', not 'am__uniq', for performance reasons.  Luckily, we
+## 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.common-files) $(am.dist.sources) $(TEXINFOS) $(EXTRA_DIST))))

diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 450bec4e7742897a9dc37b54b9602873adbeb111..d369de1ccbce1d91173fc5225e220a269ca8aad1 100644 (file)
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -153,7 +153,7 @@ am.util.strip-last-word  = $(wordlist 2,$(words $(1)),dummy $(1))
 
 ## Remove repeated elements from the given list (without reordering),
 ## and return the reduced list.
-am__uniq = $(strip \
+am.util.uniq = $(strip \
 ## If the list is empty, we have nothing to do.  Otherwise, go on.
   $(if $(strip $(1)), \
 ## Call the function recursively on the list of all the elements

diff --git a/t/internals.tap b/t/internals.tap
index 650907a951e4d5651c752d52dde74c8664c29552..53c464cb3f63d93f5d8c5b9855fabced75e2247e 100755 (executable)
--- a/t/internals.tap
+++ b/t/internals.tap
@@ -65,21 +65,21 @@ test-strip-last-word:
 
 .PHONY: test-uniq
 test-uniq:
-       test '$(call am__uniq,)'                = ''
-       test '$(call am__uniq,1)'               = '1'
-       test '$(call am__uniq,1 1)'             = '1'
-       test '$(call am__uniq,1 2)'             = '1 2'
-       test '$(call am__uniq,2 1)'             = '2 1'
-       test '$(call am__uniq,1 2 3)'           = '1 2 3'
-       test '$(call am__uniq,2 3 1)'           = '2 3 1'
-       test '$(call am__uniq,1 1 1)'           = '1'
-       test '$(call am__uniq,1 2 1)'           = '1 2'
-       test '$(call am__uniq,2 1 1)'           = '2 1'
-       test '$(call am__uniq,2 1 1)'           = '2 1'
-       test '$(call am__uniq,2 2 1)'           = '2 1'
-       test '$(call am__uniq,1 1 1 3 1 1 1)'   = '1 3'
-       test '$(call am__uniq,3 1 1 4 1 4 1 1)' = '3 1 4'
-       test '$(call am__uniq,  1   3   1  )'   = '1 3'
+       test '$(call am.util.uniq,)'                    = ''
+       test '$(call am.util.uniq,1)'                   = '1'
+       test '$(call am.util.uniq,1 1)'                 = '1'
+       test '$(call am.util.uniq,1 2)'                 = '1 2'
+       test '$(call am.util.uniq,2 1)'                 = '2 1'
+       test '$(call am.util.uniq,1 2 3)'               = '1 2 3'
+       test '$(call am.util.uniq,2 3 1)'               = '2 3 1'
+       test '$(call am.util.uniq,1 1 1)'               = '1'
+       test '$(call am.util.uniq,1 2 1)'               = '1 2'
+       test '$(call am.util.uniq,2 1 1)'               = '2 1'
+       test '$(call am.util.uniq,2 1 1)'               = '2 1'
+       test '$(call am.util.uniq,2 2 1)'               = '2 1'
+       test '$(call am.util.uniq,1 1 1 3 1 1 1)'       = '1 3'
+       test '$(call am.util.uniq,3 1 1 4 1 4 1 1)'     = '3 1 4'
+       test '$(call am.util.uniq,      1   3   1  )'   = '1 3'
 
 .PHONY: test-strip-suffixes
 test-strip-suffixes:
@@ -187,7 +187,7 @@ END
 
 command_ok_  am.util.strip-first-word   $MAKE test-strip-first-word
 command_ok_  am.util.strip-last-word    $MAKE test-strip-last-word
-command_ok_  am__uniq                   $MAKE test-uniq
+command_ok_  am.util.uniq               $MAKE test-uniq
 command_ok_  am__test_strip_suffixes    $MAKE test-strip-suffixes
 command_ok_  am__tolower                $MAKE test-tolower
 command_ok_  am__toupper                $MAKE test-toupper