From ed5e55e5e3146c46d5961f549b145d050eb5072f Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sat, 21 Jul 2012 13:51:47 +0200 Subject: [PATCH] [ng] rename: am__strip_firstword -> am.util.strip-first-word Signed-off-by: Stefano Lattarini --- lib/am/header-vars.am | 4 ++-- t/internals.tap | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index c0e15ba0d..ef25345f2 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -148,7 +148,7 @@ am.make.dry-run := \ # definition of $(am__newline) below for a significant example. am.chars.empty := -am__strip_firstword = $(wordlist 2,$(words $(1)),$(1)) +am.util.strip-first-word = $(wordlist 2,$(words $(1)),$(1)) am__strip_lastword = $(wordlist 2,$(words $(1)),dummy $(1)) ## Remove repeated elements from the given list (without reordering), @@ -255,7 +255,7 @@ am__strip_suffixes = $(strip \ $(strip $1), \ $(patsubst %$(am__private_suffix),%, \ $(call am__strip_suffixes, \ - $(call am__strip_firstword,$1), \ + $(call am.util.strip-first-word,$1), \ $(patsubst %$(firstword $1),%$(am__private_suffix),$2))), \ $2)) diff --git a/t/internals.tap b/t/internals.tap index 1012be6a6..05e85bc6d 100755 --- a/t/internals.tap +++ b/t/internals.tap @@ -45,14 +45,14 @@ default: @echo Please select an explicit test; exit 1 .PHONY: default -.PHONY: test-strip-firstword -test-strip-firstword: - test '$(call am__strip_firstword,)' = '' - test '$(call am__strip_firstword,1)' = '' - test '$(call am__strip_firstword,1 1)' = '1' - test '$(call am__strip_firstword,1 2)' = '2' - test '$(call am__strip_firstword,1 2 3 4 5 6 7 8)' = '2 3 4 5 6 7 8' - test '$(call am__strip_firstword, 1 2 )' = '2' +.PHONY: test-strip-first-word +test-strip-first-word: + test '$(call am.util.strip-first-word,)' = '' + test '$(call am.util.strip-first-word,1)' = '' + test '$(call am.util.strip-first-word,1 1)' = '1' + test '$(call am.util.strip-first-word,1 2)' = '2' + test '$(call am.util.strip-first-word,1 2 3 4 5 6 7 8)' = '2 3 4 5 6 7 8' + test '$(call am.util.strip-first-word, 1 2 )' = '2' .PHONY: test-strip-lastword test-strip-lastword: @@ -185,7 +185,7 @@ test-newline-3: test -f n3 END -command_ok_ am__strip_firstword $MAKE test-strip-firstword +command_ok_ am.util.strip-first-word $MAKE test-strip-first-word command_ok_ am__strip_lastword $MAKE test-strip-lastword command_ok_ am__uniq $MAKE test-uniq command_ok_ am__test_strip_suffixes $MAKE test-strip-suffixes -- 2.47.2