Re: [Automake-NG] [FYI] make flags analysis: take advantage of GNU make features

[Stefano Lattarini]

Hi Akim, glad to read again from you :-)

On 05/13/2013 10:42 AM, Akim Demaille wrote:
> 
> Le 8 mai 2013 à 01:12, Stefano Lattarini <address@hidden> a écrit :
> 
>> +# Shell code that determines whether the current make instance is
> 
> No longer shell code.
>
Well spotted.

>> +# running with a given letter option
>
Also, here I should s/letter/single-character/.

>> (e.g., -k, -n) that takes
>> +# no argument.  It is either 'true' or 'false', so that it can be
>> +# easily used in shell code as well as in GNU make conditionals.
>> +# Use $(MFLAGS), not $(MAKEFLAGS), since the former doesn't contain
>> +# the command line variable definitions, and it always begins with
>> +# a hyphen unless it is empty, assumptions that allow a simpler
>> +# implementation.  It is worthwhile to note that, when expanded
>> +# from the top-level make, $(MFLAGS) doesn't contain references to
>> +# options that take an argument, either mandatory (e.g., '-I') or
>> +# optional (e.g., '-O').  This *vastly* semplifies the implementation
> 
> simplifies
> 
>> +# of this macro.
>> +am.make.is-running-with-option = \
>> +  $(if $(find string $(strip $1),filter-out --%,$(MFLAGS)),true,false)
> 

The patch below fixes these warts, plus a couple of different ones I
managed to find while skimming the file.

BTW, Akim, would you like me to update your e-mail address in THANKS
with one of those you actually use these days?

Thanks,
  Stefano

-*-*-*-
>From 722f25b9875d55c0bb89d69e1916dfcaafde5b8a Mon Sep 17 00:00:00 2001
Message-Id: <address@hidden>
From: Stefano Lattarini <address@hidden>
Date: Mon, 13 May 2013 20:07:39 +0200
Subject: [PATCH] comments: fix typos and imprecisions

* lib/am/header-vars.mk: Here.

Reported-by: Akim Demaille <address@hidden>
Signed-off-by: Stefano Lattarini <address@hidden>
---
 lib/am/header-vars.mk | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/am/header-vars.mk b/lib/am/header-vars.mk
index 37f0c87..6135b22 100644
--- a/lib/am/header-vars.mk
+++ b/lib/am/header-vars.mk
@@ -38,7 +38,7 @@ MAKEFLAGS += --no-builtin-rules
        @:

 # Declare an error, without immediately terminating the execution (proper
-# code will take care later of that).  This will allow us to diagnose more
+# code will take care of that later).  This will allow us to diagnose more
 # issues at once, rather than stopping at the first one.
 am.error.seen :=
 define am.error
@@ -158,27 +158,27 @@ am.vpath.rewrite = \
 # with mainline Automake.
 DESTDIR ?=

-# Shell code that determines whether the current make instance is
-# running with a given letter option (e.g., -k, -n) that takes
-# no argument.  It is either 'true' or 'false', so that it can be
-# easily used in shell code as well as in GNU make conditionals.
+# Determine whether the current make instance is running with a given
+# single-character option (e.g., -k, -n) that takes no argument.
+# It is either 'true' or 'false', so that it can be easily used in
+# shell code as well as in GNU make conditionals.
 # Use $(MFLAGS), not $(MAKEFLAGS), since the former doesn't contain
 # the command line variable definitions, and it always begins with
 # a hyphen unless it is empty, assumptions that allow a simpler
 # implementation.  It is worthwhile to note that, when expanded
 # from the top-level make, $(MFLAGS) doesn't contain references to
 # options that take an argument, either mandatory (e.g., '-I') or
-# optional (e.g., '-O').  This *vastly* semplifies the implementation
+# optional (e.g., '-O').  This *vastly* simplifies the implementation
 # of this macro.
 am.make.is-running-with-option = \
   $(if $(findstring $(strip $1),filter-out --%,$(MFLAGS)),true,false)

-# Tell whether make is running in "dry mode".
+# Tell whether make is running in dry mode ("make -n") or not.
 am.make.dry-run := $(call am.make.is-running-with-option, n)

-# 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 whether to stop at the first error or not.
+# Tell whether make is running in "keep-going mode" ("make -k") or not.
+# Useful in rules that must recursively descend into subdirectories,
+# and decide whether to stop at the first error or not.
 am.make.keep-going := $(call am.make.is-running-with-option, k)

 am.util.strip-first-word = $(wordlist 2,$(words $(1)),$(1))
-- 
1.8.3.rc0.19.g7e6a0cc