[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-754-g08ebcd3

[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=08ebcd3a83e37fc1522a11bd906e6c802b022468

The branch, master has been updated
       via  08ebcd3a83e37fc1522a11bd906e6c802b022468 (commit)
       via  b39dba3923a103103387e099fe4799e080edadf0 (commit)
       via  ac6764da0c0ad499e51a36db0a818b03b697ef37 (commit)
       via  9ada18be77d81c1e79ac360bb7a57810b2b6f546 (commit)
      from  942e4424d5f3a0d954fd9118e2785bd54fe95aab (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 08ebcd3a83e37fc1522a11bd906e6c802b022468
Merge: b39dba3 ac6764d
Author: Stefano Lattarini <address@hidden>
Date:   Mon Apr 11 17:08:01 2011 +0200

    Merge branch 'maint'

commit b39dba3923a103103387e099fe4799e080edadf0
Merge: 942e442 9ada18b
Author: Stefano Lattarini <address@hidden>
Date:   Mon Apr 11 17:07:47 2011 +0200

    Merge branch 'fix-depcomp'

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

Summary of changes:
 ChangeLog            |   13 +++++++++++++
 lib/depcomp          |    4 ++--
 tests/depcomp10.test |   15 ++++++++++++---
 tests/depcomp9.test  |    8 +++++---
 4 files changed, 32 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 tests/depcomp10.test

diff --git a/ChangeLog b/ChangeLog
index 7f48d6a..338b567 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2011-04-11  Stefano Lattarini  <address@hidden>
+
+       depcomp: fix bugs in tests and in the depcomp script
+       * lib/depcomp (gcc): Remove duplicated `-e' from sed invocation.
+       * tests/depcomp10.test: Make it executable.  Fix a blunder that
+       has left part of an intended comment not prefixed by `#', thus
+       causing shell syntax errors.  In this same comment, break a
+       too-long reported error message on multiple lines, for clarity.
+       Add reference to the relevant bug report.  Add a comment which
+       explains why the test result 'skipped' if the first "make" call
+       fails.  Add other useful comments.
+       * tests/depcomp9.test: Slightly improve comments.
+
 2011-04-11  Ralf Wildenhues  <address@hidden>
 
        Fix hp depmode for VPATH builds with GNU make.
diff --git a/lib/depcomp b/lib/depcomp
index 53bee03..6149451 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2011-04-11-05; # UTC
+scriptversion=2011-04-11-10; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
 # 2011 Free Software Foundation, Inc.
@@ -170,7 +170,7 @@ gcc)
 ## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e -e "s|.*$object$||" '/:$/d' \
+    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" '/:$/d' \
       | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
diff --git a/tests/depcomp10.test b/tests/depcomp10.test
old mode 100644
new mode 100755
index 4fdee40..0fa6c6a
--- a/tests/depcomp10.test
+++ b/tests/depcomp10.test
@@ -16,12 +16,15 @@
 
 # hp depmode should work with GNU make in VPATH mode (bug similar to
 # depcomp9.test).
+# For automake bug#8473.
 
 # Here's the bug: hp depmode will prefix VPATH to the object file name,
 # thus the second gmake will invoke depcomp with object='../../src/foo.o',
-# causing errors such as:
-#   cpp: "", line 0: error 4066: Cannot create 
"../../gllib/.deps/nonblocking.TPo" file for 
"-M../../gllib/.deps/nonblocking.TPo" option. (No such file or dir
-+ectory[errno=2])
+# causing errors such as (broken on multiple lines for clarity):
+#   cpp: "", line 0: error 4066: Cannot create
+#        "../../gllib/.deps/nonblocking.TPo" file for
+#        "-M../../gllib/.deps/nonblocking.TPo" option.
+#        (No such file or directory[errno=2])
 
 required=GNUmake
 . ./defs || Exit 1
@@ -71,7 +74,13 @@ $AUTOMAKE -a
 
 cd build
 ../configure am_cv_CC_dependencies_compiler_type=hp
+# Do not error out with the first make, as the forced 'hp' depmode might
+# not actually work, but we have overridden the _AM_DEPENDENCIES tests.
 $MAKE || Exit 77
+
+# We must clean and rebuild, as the actual error only happens the second
+# time the objects are built because 'depcomp' has silently messed up the
+# .Po files the first time.
 $MAKE clean
 
 $MAKE >out 2>&1 || { cat out; Exit 1; }
diff --git a/tests/depcomp9.test b/tests/depcomp9.test
index d137fad..9972c3d 100755
--- a/tests/depcomp9.test
+++ b/tests/depcomp9.test
@@ -77,10 +77,12 @@ cd build
 
 # Do not error out with the first make, as the forced 'makedepend'
 # depmode might not actually work, but we have overridden the
-# _AM_DEPENDENCIES tests.  The actual error only happens the second time
-# the objects are built, because 'makedepend' has silently messed up the
-# .Po files the first time.
+# _AM_DEPENDENCIES tests.
 $MAKE || Exit 77
+
+# We must clean and rebuild, as the actual error only happens the second
+# time the objects are built because 'makedepend' has silently messed up
+# the .Po files the first time.
 $MAKE clean
 
 $MAKE >out 2>&1 || { cat out; Exit 1; }


hooks/post-receive
-- 
GNU Automake