[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.2-580-gbf04ad7

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=bf04ad799edc3205ec0a73cbef335a2a95f7999b

The branch, ng/master has been updated
       via  bf04ad799edc3205ec0a73cbef335a2a95f7999b (commit)
       via  f412ab6995052037f383ace7145f930d4c8609d2 (commit)
       via  f4b7b159dd3e532e6351721a588a31da6e642ece (commit)
       via  ca741dd59247b445c9140eb7e187c11657ae30b9 (commit)
       via  a6dd57e90a102732b25742edd6b6f3c757f3e957 (commit)
       via  2d7b16361bacba202ea6fb9ec5121244472edc2e (commit)
       via  84e3bac6381986e6f2b360213e911813ade3d3e5 (commit)
      from  b326614ed4383f77146204065fdc1ba74bea2a5d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bf04ad799edc3205ec0a73cbef335a2a95f7999b
Author: Stefano Lattarini <address@hidden>
Date:   Sun Jul 22 14:44:10 2012 +0200

    [ng] yacc, lex: avoid extra forks in non-VPATH builds
    
    * lib/am/yacc.am, lib/am/lex.am: Use $(am__ensure_dir_exists) instead
    of hand-rolled poor-man equivalent to ensure the directory of the
    target exists.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit f412ab6995052037f383ace7145f930d4c8609d2
Author: Stefano Lattarini <address@hidden>
Date:   Sun Jul 22 14:00:46 2012 +0200

    [ng] rename: am__skiplex -> am.lex.maybe-skip
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit f4b7b159dd3e532e6351721a588a31da6e642ece
Author: Stefano Lattarini <address@hidden>
Date:   Sun Jul 22 13:57:25 2012 +0200

    [ng] rename: am__skipyacc -> am.yacc.maybe-skip
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit ca741dd59247b445c9140eb7e187c11657ae30b9
Author: Stefano Lattarini <address@hidden>
Date:   Sun Jul 22 13:55:09 2012 +0200

    [ng] rename: am__yacc_c2h -> am.yacc.c2h
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit a6dd57e90a102732b25742edd6b6f3c757f3e957
Author: Stefano Lattarini <address@hidden>
Date:   Sun Jul 22 13:43:39 2012 +0200

    [ng] fixup: remove an obsolete "FIXME" comment
    
    * lib/am/clean.am: In here, about the need to break too long lists
    of files to be cleaned in order to avoid exceeding command line
    limits.  We already do that successfully!
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 2d7b16361bacba202ea6fb9ec5121244472edc2e
Author: Stefano Lattarini <address@hidden>
Date:   Sun Jul 22 13:34:29 2012 +0200

    [ng] typofix: fixed typos in comments and README
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 84e3bac6381986e6f2b360213e911813ade3d3e5
Author: Stefano Lattarini <address@hidden>
Date:   Sun Jul 22 08:53:14 2012 +0200

    [ng] tests: enhance spy tests on pattern rulesn
    
    * t/spy-pattern-rules.sh : Fix heading comments to be more faithful
    about what the test really checks.  Add more tests checking that, in
    case of overlapping pattern rules, the one "more specific", i.e.,
    with the shortest target stem, wins.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 README                   |    2 +-
 lib/am/am-dir.am         |    2 +-
 lib/am/clean.am          |    4 ----
 lib/am/header-vars.am    |    2 +-
 lib/am/lex.am            |   10 +++++-----
 lib/am/parallel-tests.am |    2 +-
 lib/am/texinfos.am       |    2 +-
 lib/am/yacc.am           |   14 +++++++-------
 t/silent7.sh             |    2 +-
 t/spy-pattern-rules.sh   |   43 ++++++++++++++++++++++++++++++++++++++++---
 10 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/README b/README
index b4a0b5b..058ed13 100644
--- a/README
+++ b/README
@@ -81,7 +81,7 @@ in "it hasn't taken place on any list, neither public nor 
non-public"):
         <http://lists.gnu.org/archive/html/automake/2011-01/msg00053.html>
 
    2. If Automake-NG has been successful, we might proceed to develop
-      "Automire": a more agressive rewrite, with profound APIs, design
+      "Automire": a more aggressive rewrite, with profound APIs, design
       and code changes, in the hope of making automire easier to use and
       to extend (lack of extensibility on part of the user is probably
       one of the greatest shortcoming of the current automake).
diff --git a/lib/am/am-dir.am b/lib/am/am-dir.am
index 6ab0958..17381c2 100644
--- a/lib/am/am-dir.am
+++ b/lib/am/am-dir.am
@@ -28,7 +28,7 @@ am__dir = .am
 am__abs_dir = $(abs_builddir)/$(am__dir)
 
 # Its counterpart for use in subdir makefiles, in case they need to refer
-# to the top-leve $(am__dir) directory.
+# to the top-level $(am__dir) directory.
 am__top_dir = $(top_builddir)/$(am__dir)
 
 # Its counterpart with an absolute path and for use in subdir makefiles.
diff --git a/lib/am/clean.am b/lib/am/clean.am
index bc11bc4..2e1af82 100644
--- a/lib/am/clean.am
+++ b/lib/am/clean.am
@@ -44,10 +44,6 @@ am__distclean_files += $(if $(filter 
.,$(srcdir)),,$(CONFIG_CLEAN_VPATH_FILES))
 ## This is what mainline Automake does.
 am__maintclean_files += $(BUILT_SOURCES)
 
-## FIXME: These might cause command line length limits to be exceeded;
-## FIXME: we should break them on multiple invocations when there are
-## FIXME: too many files.
-
 mostlyclean-am: mostlyclean-generic
 mostlyclean-generic:
        $(call .am.clean-cmd.f,$(am__mostlyclean_files))
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index eb1df5f..62d7ecd 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -82,7 +82,7 @@ endif
 # so to be extra safe we have to neutralize it.
 unexport CDPATH
 
-# Be verbose by deafault.  Yes, we really want $(V) to be overridable
+# Be verbose by default.  Yes, we really want $(V) to be overridable
 # from the environment, both for simplicity and for consistency with
 # mainline Automake.
 # FIXME: maybe normalize/sanitize $(V)?
diff --git a/lib/am/lex.am b/lib/am/lex.am
index 038c125..5d039f5 100644
--- a/lib/am/lex.am
+++ b/lib/am/lex.am
@@ -14,16 +14,16 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-## See the comment about am__skipyacc in yacc.am.
+## See the comment about am.yacc.maybe-skip in yacc.am.
 if %?MAINTAINER-MODE%
 if %?FIRST%
address@hidden@am__skiplex = test -f $@ ||
address@hidden@am.lex.maybe-skip = test -f $@ ||
 endif %?FIRST%
 endif %?MAINTAINER-MODE%
 
 ?GENERIC?%%DERIVED-EXT%: %%EXT%
 ?!GENERIC?%OBJ%: %SOURCE%
-       %SILENT%test -d $(dir $@) || $(MKDIR_P) $(dir $@)
-?GENERIC?      %VERBOSE%$(am__skiplex) \
-?!GENERIC??DIST_SOURCE?        %VERBOSE%$(am__skiplex) \
+       %SILENT%$(am__ensure_target_dir_exists)
+?GENERIC?      %VERBOSE%$(am.lex.maybe-skip) \
+?!GENERIC??DIST_SOURCE?        %VERBOSE%$(am.lex.maybe-skip) \
        $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c %OBJ% -- %COMPILE%
diff --git a/lib/am/parallel-tests.am b/lib/am/parallel-tests.am
index be9fdd1..19e21a6 100644
--- a/lib/am/parallel-tests.am
+++ b/lib/am/parallel-tests.am
@@ -425,7 +425,7 @@ recheck: all %CHECK_DEPS%
 ## that any '.log' and '.trs' file referring to such test are preserved,
 ## so that future "make recheck" invocations will still try to re-compile
 ## and re-run it (automake bug#11791).  This indirection is aimed at
-## satisying such a requirement.
+## satisfying such a requirement.
 !ifeq ($(.am/doing-recheck),yes)
 !$(am__test_logs) $(am__test_results): .am/nil
 !endif
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index d8edfc8..b7efd82 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -122,7 +122,7 @@ include inst-vars.am
 # on:
 #    all: foo1; @echo $^
 #    all: foo2
-# "make all" would output "foo1 foo2".  In our usage, a dependecy like
+# "make all" would output "foo1 foo2".  In our usage, a dependency like
 # "install-pdf-am: install-pdf-local" (that is automatically output by
 # Automake-NG if the 'install-pdf-local' target is declared) would make
 # '$^' unusable as a pure list of PDF target files in the recipe of
diff --git a/lib/am/yacc.am b/lib/am/yacc.am
index 3ead3a5..b621687 100644
--- a/lib/am/yacc.am
+++ b/lib/am/yacc.am
@@ -26,7 +26,7 @@
 ## built on the user's side, so it makes no sense to disable them.
 ##
 ## Points #1, #2, #3 are solved by unconditionally prefixing the rule
-## with $(am__skipyacc) defined below only when needed.
+## with $(am.yacc.maybe-skip) defined below only when needed.
 ##
 ## Point #4 requires a condition on whether parser.y/parser.c are
 ## distributed or not.  We cannot have a generic rule that works in
@@ -34,19 +34,19 @@
 ## use non-generic rules.
 if %?FIRST%
 if %?MAINTAINER-MODE%
address@hidden@am__skipyacc = test -f $@ ||
address@hidden@am.yacc.maybe-skip = test -f $@ ||
 endif %?MAINTAINER-MODE%
-am__yacc_c2h = $(basename $1)$(subst c,h,$(suffix $1))
+am.yacc.c2h = $(basename $1)$(subst c,h,$(suffix $1))
 endif %?FIRST%
 
 ?GENERIC?%%DERIVED-EXT%: %%EXT%
 ?!GENERIC?%OBJ%: %SOURCE%
-       %SILENT%test -d $(dir $@) || $(MKDIR_P) $(dir $@)
+       %SILENT%$(am__ensure_target_dir_exists)
        %VERBOSE% \
-?GENERIC?      $(am__skipyacc) \
-?!GENERIC??DIST_SOURCE?        $(am__skipyacc) \
+?GENERIC?      $(am.yacc.maybe-skip) \
+?!GENERIC??DIST_SOURCE?        $(am.yacc.maybe-skip) \
        $(SHELL) $(YLWRAP) $< \
          y.tab.c $@ \
-         y.tab.h $(call am__yacc_c2h,$@) \
+         y.tab.h $(call am.yacc.c2h,$@) \
          y.output $(basename $@).output \
          -- %COMPILE%
diff --git a/t/silent7.sh b/t/silent7.sh
index 5e5472e..d34e8d1 100755
--- a/t/silent7.sh
+++ b/t/silent7.sh
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Check user extensibility of silent-rules mode.
-# Aslo check that silent rules are disabled by default.
+# Also check that silent rules are disabled by default.
 
 . ./defs || exit 1
 
diff --git a/t/spy-pattern-rules.sh b/t/spy-pattern-rules.sh
index c1e0c79..f95d8f5 100755
--- a/t/spy-pattern-rules.sh
+++ b/t/spy-pattern-rules.sh
@@ -14,15 +14,23 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check that, if we have two pattern rules from which the same file (or
-# set of files) can be built, and both are applicable, the first one wins.
-# This is used at least in our 'parallel-tests' support.
+# Two checks are done here:
+# - if there are two pattern rules from which the same file (or set of
+#   files) can be built, and both are applicable, and both results in
+#   the same target stem, then the first one wins.
+# - if there are two pattern rules from which the same file (or set of
+#   files) can be built, and both are applicable, but the resulting
+#   target stems are different, then the "most specific" one (i.e.,
+#   that which result in the *shortest* stem) is used.
+# We take advantage of such features at least in our 'parallel-tests'
+# support.
 
 am_create_testdir=empty
 . ./defs || exit 1
 
 cat > Makefile <<'END'
 default:
+       @echo recipe for $@ should not run >&2; exit 1;
 
 %.foo: %
        cp $< $@
@@ -32,11 +40,22 @@ default:
 %.bar: %.x
        cp $< $@
 %.bar: %
+       cp $< $@
 
 %.mu %.fu: %.1
        cp $< $*.mu && cp $< $*.fu
 %.mu %.fu: %.2
        cp $< $*.mu && cp $< $*.fu
+
+%.o: %.c
+       @cp $< $@ && echo TOP >> $@
+lib/%.o: lib/%.c
+       @cp $< $@ && echo LIB >> $@
+
+bar%: foo%
+       echo .$* >$@
+ba%: foo%
+       @echo '$@: longest stem rule selected!' >&2; exit 1
 END
 
 echo one > all
@@ -51,4 +70,22 @@ $MAKE x.mu
 diff x.mu x.1
 diff x.fu x.1
 
+mkdir lib
+echo foo > a.c
+echo bar > lib/a.c
+$MAKE a.o lib/a.o
+test "$(cat a.o)" = "foo${nl}TOP"
+test "$(cat lib/a.o)" = "bar${nl}LIB"
+
+: > foozap
+: > foo-mu
+: > foox
+$MAKE barzap bar-mu
+test "$(cat barzap)" = .zap
+test "$(cat bar-mu)" = .-mu
+
+# Sanity check.
+$MAKE bax && exit 99
+$MAKE bax 2>&1 | grep '^bax: longest stem rule selected!' || exit 99
+
 :


hooks/post-receive
-- 
GNU Automake