]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'maint' into msvc
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 7 Mar 2012 07:20:26 +0000 (08:20 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 7 Mar 2012 07:20:26 +0000 (08:20 +0100)
* maint:
  news: describe recently-fixed bug in vala support
  depcomp: add support for IBM xlc/xlC compilers

1  2 
NEWS
lib/depcomp

diff --cc NEWS
Simple merge
diff --cc lib/depcomp
index 2c30282498f59797a673594146715a9a99f6565c,0122c0447717c7b1a245142c7c131e1b67ac7156..58fe52c1ca89ab61530a07360d78d12a52c2a738
@@@ -100,14 -94,12 +100,20 @@@ if test "$depmode" = msvcmsys; the
     depmode=msvisualcpp
  fi
  
 +if test "$depmode" = msvc7msys; then
 +   # This is just like msvc7 but w/o cygpath translation.
 +   # Just convert the backslash-escaped backslashes to single forward
 +   # slashes to satisfy depend.m4
 +   cygpath_u='sed s,\\\\,/,g'
 +   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