make flags analysis: use simpler variable names

* lib/am/header-vars.am (am__make_running_with_option): Here.  Now
that we expect to be run in a subshell, we don't have to worry about
being namespace-safe.  And '$foo' is much more pleasant to read than
'$am__foo' -- and pleasant code tends to be more correct.
(am__make_dryrun, am__make_keepgoing): Adjust.

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

1 files changed, 22 insertions, 25 deletions

diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index ed640b2bb..8698cd29a 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -36,18 +36,18 @@ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 ## no argument.  Actually, the only supported option at the moment
 ## is '-n' (support for '-k' will be added soon).
 am__make_running_with_option = \
-  case $${am__target_option-} in \
+  case $${target_option-} in \
       ?) ;; \
       *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${am__target_option-}' specified" >&2; \
+              "target option '$${target_option-}' specified" >&2; \
          exit 1;; \
   esac; \
-  am__has_opt=no; \
-  am__flags=$$MAKEFLAGS; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
   if $(am__is_gnu_make); then \
 ## The format of $(MAKEFLAGS) is quite tricky with GNU make; the
 ## variable $(MFLAGS) behaves much better in that regard.  So use it.
-    am__flags=$$MFLAGS; \
+    sane_makeflags=$$MFLAGS; \
   else \
 ## Non-GNU make: we must rely on $(MAKEFLAGS).  This is tricker and more
 ## brittle, but is the best we can do.
@@ -58,50 +58,47 @@ am__make_running_with_option = \
 ## misinterpret that as and indication that make is running in dry mode.
 ## This has already happened in practice.  So we need this hack.
       *\\[\ \	]*) \
-## Extra indirection with ${am__bs} required by FreeBSD 8.x make.
+## Extra indirection with ${bs} required by FreeBSD 8.x make.
 ## Not sure why (so sorry for the cargo-cult programming here).
-        am__bs=\\; \
-        am__flags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$am__bs$$am__bs[$$am__bs $$am__bs	]*//g"`;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
   fi; \
-  am__skip_next=no; \
-  am__strip_trailopt () \
+  skip_next=no; \
+  strip_trailopt () \
   { \
-    am__flg=`printf '%s\n' "$$am__flg" | sed "s/$$1.*$$//"`; \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
   }; \
-  for am__flg in $$am__flags; do \
-    if test $$am__skip_next = yes; then \
-      am__skip_next=no; \
-      continue; \
-    fi; \
-    case $$am__flg in \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
       *=*|--*) continue;; \
 ## GNU make 3.83 has changed the format of $MFLAGS, and removed the space
 ## between an option and its argument (e.g., from "-I dir" to "-Idir").
 ## So we need to handle both formats.
 ## TODO: we might need to handle similar other cases as well; but let's
 ##       wait until the need arises.
-        -*I) am__strip_trailopt 'I'; am__skip_next=yes;; \
-      -*I?*) am__strip_trailopt 'I';; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
     esac; \
-    case $$am__flg in \
-      *$$am__target_option*) am__has_opt=yes; break;; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
   done; \
-  test $$am__has_opt = yes
+  test $$has_opt = yes
 
 ## Shell code that determines whether make is running in "dry mode"
 ## ("make -n") or not.  Useful in rules that invoke make recursively,
 ## and are thus executed also with "make -n" -- either because they
 ## are declared as dependencies to '.MAKE' (NetBSD make), or because
 ## their recipes contain the "$(MAKE)" string (GNU and Solaris make).
-am__make_dryrun = (am__target_option=n; $(am__make_running_with_option))
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 
 ## Shell code that determines whether make is running in "keep-going mode"
 ## ("make -k") or not.  Useful in rules that must recursively descend into
 ## subdirectories, and decide whther to stop at the first error or not.
-am__make_keepgoing = (am__target_option=k; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 
 ## Some derived variables that have been found to be useful.
 pkgdatadir = $(datadir)/@PACKAGE@