Signed-off-by: Stefano Lattarini <[email protected]>
---
lib/am/compile.am | 2 +-
lib/am/distdir.am | 2 +-
lib/am/header-vars.am | 2 +-
t/internals.tap | 32 ++++++++++++++++----------------
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/lib/am/compile.am b/lib/am/compile.am
index ceb5c9d..ce235c0 100644
--- 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 16de751..39c819e 100644
--- 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 450bec4..d369de1 100644
--- 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 650907a..53c464c 100755
--- 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
--
1.7.10.4
