[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.3-32-gc02e113

[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=c02e1130ea75a36936bfe877a5b101cea3202dfe

The branch, branch-1.11 has been updated
       via  c02e1130ea75a36936bfe877a5b101cea3202dfe (commit)
       via  b0887067fb2f6511e154c9feb62c5243dfc095cb (commit)
      from  0092d1f9114b740cc4bb64186f33429773355b45 (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 c02e1130ea75a36936bfe877a5b101cea3202dfe
Merge: 0092d1f b088706
Author: Stefano Lattarini <address@hidden>
Date:   Tue Mar 6 21:04:48 2012 +0100

    Merge branch 'maint' into branch-1.11
    
    * maint:
      depcomp: add support for IBM xlc/xlC compilers

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

Summary of changes:
 NEWS        |    3 +++
 THANKS      |    1 +
 lib/depcomp |   13 +++++++++++++
 3 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/NEWS b/NEWS
index 8570b10..4b19d89 100644
--- a/NEWS
+++ b/NEWS
@@ -44,6 +44,9 @@ New in 1.11.3a:
     optional space between the -I, -L and -l options and their respective
     arguments, for better POSIX compliance.
 
+  - Automatic dependency tracking now works also with the IBM XL C/C++
+    compilers, thanks to the new new depmode 'xlc'.
+
 Bugs fixed in 1.11.3a:
 
 * Bugs introduced by 1.11.3:
diff --git a/THANKS b/THANKS
index d54e9d4..418ad71 100644
--- a/THANKS
+++ b/THANKS
@@ -234,6 +234,7 @@ Maxim Sinev         address@hidden
 Maynard Johnson                address@hidden
 Merijn de Jonge                address@hidden
 Michael Brantley       address@hidden
+Michael Hofmann                address@hidden
 Michael Ploujnikov     address@hidden
 Michel de Ruiter       address@hidden
 Mike Castle            address@hidden
diff --git a/lib/depcomp b/lib/depcomp
index 2c30282..58fe52c 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -108,6 +108,12 @@ if test "$depmode" = msvc7msys; then
    depmode=msvc7
 fi
 
+if test "$depmode" = xlc; then
+   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
+   gccflag=-qmakedep=gcc,-MF
+   depmode=gcc
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -228,6 +234,13 @@ sgi)
   rm -f "$tmpdepfile"
   ;;
 
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
   # in a .u file.  In older versions, this file always lives in the


hooks/post-receive
-- 
GNU Automake