From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sat, 21 Jul 2012 11:44:28 +0000 (+0200)
Subject: [ng] rename: am__empty -> am.chars.empty
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b316f6e374b5925e20dcc98d1c6b4d1d5817ba48;p=thirdparty%2Fautomake.git

[ng] rename: am__empty -> am.chars.empty

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

diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index c6ad4d355..23e9987cc 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -54,7 +54,7 @@ am.chars.squote := '
 # at the end of the expansion of another macro.
 define am__newline
 
-$(am__empty)
+$(am.chars.empty)
 endef
 
 ## Makefiles generated by Automake-NG require GNU make >= 3.81.
@@ -146,7 +146,7 @@ am__make_dryrun := \
 # 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.
-am__empty :=
+am.chars.empty :=
 
 am__strip_firstword = $(wordlist 2,$(words $(1)),$(1))
 am__strip_lastword  = $(wordlist 2,$(words $(1)),dummy $(1))
@@ -163,7 +163,7 @@ am__uniq = $(strip \
 ## And append the last element, unless it was already present.
       $(if $(filter $(lastword $(1)), \
                     $(call am__strip_lastword, $(1))), \
-           $(am__empty), \
+           $(am.chars.empty), \
            $(lastword $(1)))))
 
 ?HANDLE-EXEEXT?am__handle_exeext := yes
diff --git a/t/clean-many.sh b/t/clean-many.sh
index 3f3d9a739..81bf83715 100755
--- a/t/clean-many.sh
+++ b/t/clean-many.sh
@@ -49,11 +49,11 @@ while test $i -le 17; do
   cat t t > t2
   mv -f t2 t
 done
-(echo 'files = \' && sed 's/$/ \\/' t && echo '$(am__empty)') > files.mk
+(echo 'files = \' && sed '$!s/$/ \\/' t) > files.mk
 rm -f t
 
-# 2^17 + 2 = 131074.
-test $(wc -l <files.mk) -eq 65538 || fatal_ "populating 'files.mk'"
+# 2^17 + 1 = 65537.
+test $(wc -l <files.mk) -eq 65537 || fatal_ "populating 'files.mk'"
 
 touch foo bar
 $MAKE maintainer-clean
diff --git a/t/clean-many2.sh b/t/clean-many2.sh
index e7505be55..61284ed4a 100755
--- a/t/clean-many2.sh
+++ b/t/clean-many2.sh
@@ -59,7 +59,7 @@ done
 # Sanity check.
 rm -f $(cat t) && fatal_ "setting up 'rm' wrapper"
 
-(echo 'files = \' && sed 's/$/ \\/' t && echo '$(am__empty)') >files.am
+(echo 'files = \' && sed '$!s/$/ \\/' t) >files.am
 rm -f t
 
 $ACLOCAL
diff --git a/t/dist-many.sh b/t/dist-many.sh
index e006c016c..3fd0cb4fb 100755
--- a/t/dist-many.sh
+++ b/t/dist-many.sh
@@ -49,11 +49,10 @@ while test $i -le $count; do
 done > t
 set -x # Re-enable shell traces.
 echo 'EXTRA_DIST = \'   >> Makefile.am
-sed 's/$/ \\/' t        >> Makefile.am
-echo '$(am__empty)'     >> Makefile.am
+sed '$!s/$/ \\/' t      >> Makefile.am
 rm -f t
 
-test $(wc -l <Makefile.am) -eq $(( 2 + (3 * $count) )) \
+test $(wc -l <Makefile.am) -eq $(( 1 + (3 * $count) )) \
   || fatal_ "populating 'EXTRA_DIST'"
 
 $ACLOCAL
diff --git a/t/dist-many2.sh b/t/dist-many2.sh
index cd39a7198..90c527b40 100755
--- a/t/dist-many2.sh
+++ b/t/dist-many2.sh
@@ -86,11 +86,10 @@ while test $i -le $count; do
 done > t
 set -x # Re-enable shell traces.
 echo 'EXTRA_DIST = \'   >> Makefile.am
-sed 's/$/ \\/' t        >> Makefile.am
-echo '$(am__empty)'     >> Makefile.am
+sed '$!s/$/ \\/' t      >> Makefile.am
 rm -f t
 
-test $(wc -l <Makefile.am) -eq $(( 2 + (3 * $count) )) \
+test $(wc -l <Makefile.am) -eq $(( 1 + (3 * $count) )) \
   || fatal_ "populating 'EXTRA_DIST'"
 
 $ACLOCAL
diff --git a/t/memoize.tap b/t/memoize.tap
index a89515bcc..6d5eda414 100755
--- a/t/memoize.tap
+++ b/t/memoize.tap
@@ -63,7 +63,7 @@ END
 
 T "variables expanding to blanks only (1)" <<'END'
 
-foo = $(call am__memoize,foo,$(am__empty) )
+foo = $(call am__memoize,foo,$(am.chars.empty) )
 
 test:
 	test '$(foo)' = ' '
@@ -74,7 +74,7 @@ END
 
 T "variables expanding to blanks only (2)" <<END
 
-blank = \$(am__empty) $tab$tab   \$(am__empty)
+blank = \$(am.chars.empty) $tab$tab   \$(am.chars.empty)
 foo = \$(call am__memoize,foo,\$(blank))
 
 test: