From 4a4ea77bea493465646e367a9bbbfa2101c614d8 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sat, 21 Jul 2012 14:10:37 +0200 Subject: [PATCH] [ng] rename: am__strip_suffixes -> am.util.strip-suffixes Signed-off-by: Stefano Lattarini --- lib/am/check-typos.am | 2 +- lib/am/header-vars.am | 6 ++--- lib/am/parallel-tests.am | 2 +- t/internals.tap | 48 ++++++++++++++++++++-------------------- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/lib/am/check-typos.am b/lib/am/check-typos.am index e633e4f47..224d71d22 100644 --- a/lib/am/check-typos.am +++ b/lib/am/check-typos.am @@ -77,7 +77,7 @@ endif # Extract 'foo' from something like "EXTRA_nodist_foo_SOURCES". define .am/vartypos/canon-name-from-var -$(call am__strip_suffixes, $(.am/vartypos/suffixes), \ +$(call am.util.strip-suffixes, $(.am/vartypos/suffixes), \ $(patsubst dist_%,%, \ $(patsubst nodist_%,%, \ $(patsubst nobase_%,%, \ diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index 4304560e0..57db26dbd 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -244,13 +244,13 @@ am__canon = $(strip \ am__memoize = $(or $(am__memoized_value/$1),$(strip \ $(eval am__memoized_value/$1 := $$2))$(am__memoized_value/$1)) -## $(call am__strip_suffixes, SUFFIXES, LIST) -## ------------------------------------------ +## $(call am.util.strip-suffixes, SUFFIXES, LIST) +## ---------------------------------------------- ## Strip any of the SUFFIXES from each of the entries of LIST. Even if an ## entry of LIST terminates with several suffixes, only one is stripped: ## the first one that matches. am__private_suffix = .,;&!@ -am__strip_suffixes = $(strip \ +am.util.strip-suffixes = $(strip \ $(if \ $(strip $1), \ $(patsubst %$(am__private_suffix),%, \ diff --git a/lib/am/parallel-tests.am b/lib/am/parallel-tests.am index 0d848773a..266670e94 100644 --- a/lib/am/parallel-tests.am +++ b/lib/am/parallel-tests.am @@ -109,7 +109,7 @@ am__tpfx = \ # where removing the $(srcdir) from the $(wildcard) invocation would # cause the idiom to break in VPATH builds. am__get_test_bases = $(patsubst $(srcdir)/%,%,$(strip \ -$(call am__strip_suffixes, $(TEST_EXTENSIONS), \ +$(call am.util.strip-suffixes, $(TEST_EXTENSIONS), \ ?!HANDLE-EXEEXT? $(1)))) ?HANDLE-EXEEXT? $(patsubst %$(EXEEXT),%,$(1))))) diff --git a/t/internals.tap b/t/internals.tap index 53c464cb3..b5085021b 100755 --- a/t/internals.tap +++ b/t/internals.tap @@ -83,33 +83,33 @@ test-uniq: .PHONY: test-strip-suffixes test-strip-suffixes: - test '$(call am__strip_suffixes,,)' = '' - test '$(call am__strip_suffixes, ,)' = '' - test '$(call am__strip_suffixes,, )' = '' - test '$(call am__strip_suffixes, , )' = '' - test '$(call am__strip_suffixes,x,)' = '' - test '$(call am__strip_suffixes,x y, )' = '' - test '$(call am__strip_suffixes,,x y)' = 'x y' - test '$(call am__strip_suffixes, ,x y)' = 'x y' - test '$(call am__strip_suffixes,.c,foo.c)' = 'foo' - test '$(call am__strip_suffixes,.foo,a.foo b.foo)' = 'a b' - test '$(call am__strip_suffixes, x y, ax ay ax)' = 'a a a' - test '$(call am__strip_suffixes,x,ax)' = 'a' - test '$(call am__strip_suffixes,x,xa)' = 'xa' - test '$(call am__strip_suffixes,x,xx)' = 'x' - test '$(call am__strip_suffixes,x,xux)' = 'xu' - test '$(call am__strip_suffixes, .c .c++, \ + test '$(call am.util.strip-suffixes,,)' = '' + test '$(call am.util.strip-suffixes, ,)' = '' + test '$(call am.util.strip-suffixes,, )' = '' + test '$(call am.util.strip-suffixes, , )' = '' + test '$(call am.util.strip-suffixes,x,)' = '' + test '$(call am.util.strip-suffixes,x y, )' = '' + test '$(call am.util.strip-suffixes,,x y)' = 'x y' + test '$(call am.util.strip-suffixes, ,x y)' = 'x y' + test '$(call am.util.strip-suffixes,.c,foo.c)' = 'foo' + test '$(call am.util.strip-suffixes,.foo,a.foo b.foo)' = 'a b' + test '$(call am.util.strip-suffixes, x y, ax ay ax)' = 'a a a' + test '$(call am.util.strip-suffixes,x,ax)' = 'a' + test '$(call am.util.strip-suffixes,x,xa)' = 'xa' + test '$(call am.util.strip-suffixes,x,xx)' = 'x' + test '$(call am.util.strip-suffixes,x,xux)' = 'xu' + test '$(call am.util.strip-suffixes, .c .c++, \ foo.c bar.c++ baz.cxx zap.c)' = 'foo bar baz.cxx zap' - test '$(call am__strip_suffixes, .a .b, \ + test '$(call am.util.strip-suffixes, .a .b, \ 1.a.a 2.a.b 3.b.a 4.b.b)' = '1.a 2.a 3.b 4.b' # Corner cases: the *first* matched suffix is stripped - test '$(call am__strip_suffixes,.a .b,x.a.a)' = 'x.a' - test '$(call am__strip_suffixes,.a .b,x.a.b)' = 'x.a' - test '$(call am__strip_suffixes,.a .b,x.b.a)' = 'x.b' - test '$(call am__strip_suffixes,.a .b,x.b.b)' = 'x.b' - test '$(call am__strip_suffixes, .a .b.a, foo.b.a bar.a)' \ + test '$(call am.util.strip-suffixes,.a .b,x.a.a)' = 'x.a' + test '$(call am.util.strip-suffixes,.a .b,x.a.b)' = 'x.a' + test '$(call am.util.strip-suffixes,.a .b,x.b.a)' = 'x.b' + test '$(call am.util.strip-suffixes,.a .b,x.b.b)' = 'x.b' + test '$(call am.util.strip-suffixes, .a .b.a, foo.b.a bar.a)' \ = 'foo.b bar' - test '$(call am__strip_suffixes, .b.a .a, foo.b.a bar.a)' \ + test '$(call am.util.strip-suffixes, .b.a .a, foo.b.a bar.a)' \ = 'foo bar' .PHONY: test-toupper @@ -188,7 +188,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.util.uniq $MAKE test-uniq -command_ok_ am__test_strip_suffixes $MAKE test-strip-suffixes +command_ok_ am.util.strip-suffixes $MAKE test-strip-suffixes command_ok_ am__tolower $MAKE test-tolower command_ok_ am__toupper $MAKE test-toupper command_ok_ am__canon $MAKE test-canonicalize -- 2.47.2