[ng] rename: am__newline -> am.chars.newline

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

diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index d16cc1dbe01571ba7c1d947a6c605906bdb5d426..9179d9825a05a0968dafd60a672f3858f78ef185 100644 (file)
--- 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 6efad03a8e738d3bb51f422caf6c2718080c7902..bf2ad731e84184842c834df1ca7a493b9db351e0 100644 (file)
--- 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 59276c0a0ae69a5f175aa6c79de34111549bf98d..6a365bf647910f386aa8776fe496e01d6c26e435 100644 (file)
--- 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 4da959f8eb7a7ccbee525bc700dc528d1353b008..da3621d7dde6527761f5d3495e2f0ff262ae4259 100755 (executable)
--- 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 8063e0437ac236a6ada3a1343c09ba257364714f..90126a76b4a626dba84a7b257bf800f928d64489 100755 (executable)
--- 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
 
 :