[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-750-g942e442

[Ralf Wildenhues]

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=942e4424d5f3a0d954fd9118e2785bd54fe95aab

The branch, master has been updated
       via  942e4424d5f3a0d954fd9118e2785bd54fe95aab (commit)
       via  1ae0d32e09b89de68955485fbc906202832f7d74 (commit)
      from  c408beafae2ab5909bfd8b04df1ca93aedc6b5e7 (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 942e4424d5f3a0d954fd9118e2785bd54fe95aab
Merge: c408bea 1ae0d32
Author: Ralf Wildenhues <address@hidden>
Date:   Mon Apr 11 07:09:50 2011 +0200

    Merge branch 'maint'

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

Summary of changes:
 ChangeLog                               |   10 ++++++++++
 NEWS                                    |    2 +-
 lib/depcomp                             |    8 +++++---
 tests/Makefile.am                       |    1 +
 tests/Makefile.in                       |    1 +
 tests/{depcomp9.test => depcomp10.test} |   25 ++++++++-----------------
 6 files changed, 26 insertions(+), 21 deletions(-)
 copy tests/{depcomp9.test => depcomp10.test} (61%)
 mode change 100755 => 100644

diff --git a/ChangeLog b/ChangeLog
index 77de7f6..7f48d6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-04-11  Ralf Wildenhues  <address@hidden>
+
+       Fix hp depmode for VPATH builds with GNU make.
+       * lib/depcomp: Be sure to remove VPATH-prefixed object from
+       dependency output when creating stub rule.
+       * tests/depcomp10.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+       * NEWS: Update.
+       Report by Bruno Haible.
+
 2011-04-10  Stefano Lattarini  <address@hidden>
 
        test defs: fix 'javac' requirement for older JDK versions
diff --git a/NEWS b/NEWS
index 2646297..df4179b 100644
--- a/NEWS
+++ b/NEWS
@@ -121,7 +121,7 @@ Bugs fixed in 1.11a:
   - The parallel-tests driver now does not produce erroneous results
     with Tru64/OSF 5.1 sh upon unreadable log files any more.
 
-  - The makedepend depmode now works better with VPATH builds.
+  - The makedepend and hp depmodes now works better with VPATH builds.
 
   - Java sources specified with check_JAVA are not compiled anymore upon
     "make all", but only upon "make check".
diff --git a/lib/depcomp b/lib/depcomp
index 43bd0f9..53bee03 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-09-11; # UTC
+scriptversion=2011-04-11-05; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
 # 2011 Free Software Foundation, Inc.
@@ -166,10 +166,12 @@ gcc)
 ' < "$tmpdepfile" |
 ## Some versions of gcc put a space before the `:'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## 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 '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e -e "s|.*$object$||" '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5b02a66..852dbe9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -372,6 +372,7 @@ depcomp7.test \
 depcomp8a.test \
 depcomp8b.test \
 depcomp9.test \
+depcomp10.test \
 depdist.test \
 depend.test \
 depend2.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index fd573d5..715054d 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -633,6 +633,7 @@ depcomp7.test \
 depcomp8a.test \
 depcomp8b.test \
 depcomp9.test \
+depcomp10.test \
 depdist.test \
 depend.test \
 depend2.test \
diff --git a/tests/depcomp9.test b/tests/depcomp10.test
old mode 100755
new mode 100644
similarity index 61%
copy from tests/depcomp9.test
copy to tests/depcomp10.test
index d137fad..4fdee40
--- a/tests/depcomp9.test
+++ b/tests/depcomp10.test
@@ -14,19 +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/>.
 
-# makedepend should work in VPATH mode.
+# hp depmode should work with GNU make in VPATH mode (bug similar to
+# depcomp9.test).
 
-# Here's the bug: makedepend will prefix VPATH to the object file name,
-# thus the second make will invoke depcomp with object='../../src/foo.o',
+# 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:
-# touch: cannot touch `../../src/.deps/foo.TPo': No such file or directory
-# makedepend: error:  cannot open "../../src/.deps/foo.TPo"
-# ../../depcomp: line 560: ../../src/.deps/foo.TPo: No such file or directory
+#   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])
 
-# We include subfoo only to be sure that we don't remove too much
-# from the object file name.
-
-required='makedepend'
+required=GNUmake
 . ./defs || Exit 1
 
 mkdir src src/sub build
@@ -73,13 +70,7 @@ $AUTOCONF
 $AUTOMAKE -a
 
 cd build
-../configure am_cv_CC_dependencies_compiler_type=makedepend
-
-# 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.
+../configure am_cv_CC_dependencies_compiler_type=hp
 $MAKE || Exit 77
 $MAKE clean
 


hooks/post-receive
-- 
GNU Automake