diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-03-07 08:20:26 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-03-07 08:20:26 +0100 |
| commit | 24ab98457ee12a58dc070a3748cf3fd56f1c4c18 (patch) | |
| tree | 7af827ed2879171d11e225ae002f7a2e8dc64ca8 | |
| parent | 8902f83dcd7874d57d88f742bd4c62724634cc82 (diff) | |
| parent | 94d56e80384e3ae80e2817aa12adae8ad7f3d1ed (diff) | |
| download | automake-24ab98457ee12a58dc070a3748cf3fd56f1c4c18.tar.gz | |
Merge branch 'maint' into msvc
* maint:
news: describe recently-fixed bug in vala support
depcomp: add support for IBM xlc/xlC compilers
| -rw-r--r-- | NEWS | 8 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rwxr-xr-x | lib/depcomp | 13 |
3 files changed, 22 insertions, 0 deletions
@@ -40,6 +40,9 @@ New in 1.11.0a: * Miscellaneous changes: + - Automatic dependency tracking now works also with the IBM XL C/C++ + compilers, thanks to the new new depmode 'xlc'. + - Automake's own build system is more silent by default, making use of the 'silent-rules' option. @@ -161,6 +164,11 @@ Bugs fixed in 1.11.0a: * Long-standing bugs: + - It is now possible for a foo_SOURCES variable to hold Vala sources + together with C header files, as well as with sources and headers for + other supported languages (e.g., C++). Previously, only mixing C and + Vala sources was supported. + - Vala support now works better in VPATH setups. - The "deleted header file problem" for *.am files is avoided by stub @@ -234,6 +234,7 @@ Maxim Sinev good@goods.ru Maynard Johnson maynardj@us.ibm.com Merijn de Jonge M.de.Jonge@cwi.nl Michael Brantley Michael-Brantley@deshaw.com +Michael Hofmann mhofma@googlemail.com Michael Ploujnikov ploujj@gmail.com Michel de Ruiter mdruiter@cs.vu.nl Mike Castle dalgoda@ix.netcom.com diff --git a/lib/depcomp b/lib/depcomp index 2c3028249..58fe52c1c 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 |