diff options
| -rw-r--r-- | lib/am/distdir.am | 4 | ||||
| -rw-r--r-- | lib/am/header-vars.am | 8 | ||||
| -rw-r--r-- | lib/am/parallel-tests.am | 2 | ||||
| -rwxr-xr-x | t/am-xargs-map.sh | 4 | ||||
| -rwxr-xr-x | t/internals.tap | 12 |
5 files changed, 15 insertions, 15 deletions
diff --git a/lib/am/distdir.am b/lib/am/distdir.am index d16cc1dbe..9179d9825 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -70,10 +70,10 @@ am.dist.parent-dirs = \ $(filter-out ., $(patsubst ./%,%,$(dir $(am.dist.files-cooked))))))) am.mkdir-for-dist = \ - @$(MKDIR_P) $(patsubst %,"$(distdir)"/%,$1)$(am__newline) + @$(MKDIR_P) $(patsubst %,"$(distdir)"/%,$1)$(am.chars.newline) am.write-list-of-distfiles = \ @lst='$1'; for x in $$lst; do echo $$x; done \ - >> $(am__dir)/$@-list$(am__newline) + >> $(am__dir)/$@-list$(am.chars.newline) if %?TOPDIR_P% distdir = $(PACKAGE)-$(VERSION) diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index 6efad03a8..bf2ad731e 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -52,7 +52,7 @@ am.chars.squote := ' # A literal newline character, that does not get stripped if used # at the end of the expansion of another macro. -define am__newline +define am.chars.newline $(am.chars.empty) endef @@ -145,7 +145,7 @@ am.make.dry-run := \ # An empty string. It can be very useful to "fool" the make parser w.r.t. # whitespace handling, and allow us to obtain tricky semantics. See the -# definition of $(am__newline) below for a significant example. +# definition of $(am.chars.newline) below for a significant example. am.chars.empty := am.util.strip-first-word = $(wordlist 2,$(words $(1)),$(1)) @@ -295,8 +295,8 @@ $(if $2,$(strip \ )$(if $($0.counter),$(call $1,$(strip $($0.partial-args))))) endef -.am.rm-f = $(if $(strip $1),rm -f $(strip $1)$(am__newline)) -.am.rm-rf = $(if $(strip $1),rm -rf $(strip $1)$(am__newline)) +.am.rm-f = $(if $(strip $1),rm -f $(strip $1)$(am.chars.newline)) +.am.rm-rf = $(if $(strip $1),rm -rf $(strip $1)$(am.chars.newline)) .am.clean-cmd.f = $(call am.xargs-map,.am.rm-f,$1) .am.clean-cmd.d = $(call am.xargs-map,.am.rm-rf,$1) diff --git a/lib/am/parallel-tests.am b/lib/am/parallel-tests.am index 59276c0a0..6a365bf64 100644 --- a/lib/am/parallel-tests.am +++ b/lib/am/parallel-tests.am @@ -324,7 +324,7 @@ am.test-harness.workdir = $(am__dir)/test-harness am.test-harness.append-to-list-of-bases = \ @lst='$1'; for x in $$lst; do echo $$x; done \ - >> $(am.test-harness.workdir)/bases$(am__newline) + >> $(am.test-harness.workdir)/bases$(am.chars.newline) !define am.setup-test-harness-workdir ! @rm -rf $(am.test-harness.workdir) diff --git a/t/am-xargs-map.sh b/t/am-xargs-map.sh index 4da959f8e..da3621d7d 100755 --- a/t/am-xargs-map.sh +++ b/t/am-xargs-map.sh @@ -47,12 +47,12 @@ sed 's/^[0-9][0-9]*:://' > Makefile << 'END' args32 := $(args16) $(args16) args64 := $(args32) $(args32) -bar = test '$1' = '$(args4)'$(am__newline) +bar = test '$1' = '$(args4)'$(am.chars.newline) test-xargs-map: $(call am.xargs-map,bar,$(args16)) args = $(error 'args' should be overridden from the command line) -foo = @echo $1$(am__newline) +foo = @echo $1$(am.chars.newline) echo-xargs-map: $(call am.xargs-map,foo,$(args)) END diff --git a/t/internals.tap b/t/internals.tap index 8063e0437..90126a76b 100755 --- a/t/internals.tap +++ b/t/internals.tap @@ -164,12 +164,12 @@ test-canonicalize: .PHONY: test-newline-1 test-newline-1: - @echo OK > fo1$(am__newline)@touch ba1$(am__newline)-false > qu1 + @echo OK > fo1$(am.chars.newline)@touch ba1$(am.chars.newline)-false > qu1 test `cat fo1` = OK test -f ba1 test -f qu1 -my_newline = $(am__newline) +my_newline = $(am.chars.newline) .PHONY: test-newline-2 test-newline-2: @echo OK > fo2$(my_newline)@touch ba2$(my_newline)-false > qu2 @@ -177,7 +177,7 @@ test-newline-2: test -f ba2 test -f qu2 -command-1 = test x = x$(am__newline) +command-1 = test x = x$(am.chars.newline) command-2 = test y = y$(my_newline) .PHONY: test-newline-3 test-newline-3: @@ -192,8 +192,8 @@ command_ok_ am.util.strip-suffixes $MAKE test-strip-suffixes command_ok_ am.util.tolower $MAKE test-tolower command_ok_ am.util.toupper $MAKE test-toupper command_ok_ am.util.canon $MAKE test-canonicalize -command_ok_ "am__newline (1)" $MAKE test-newline-1 -command_ok_ "am__newline (2)" $MAKE test-newline-2 -command_ok_ "am__newline (3)" $MAKE test-newline-3 +command_ok_ "am.chars.newline (1)" $MAKE test-newline-1 +command_ok_ "am.chars.newline (2)" $MAKE test-newline-2 +command_ok_ "am.chars.newline (3)" $MAKE test-newline-3 : |