From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 9 Apr 2011 10:39:44 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~220
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a5f0a8b5e9d3116718cb55c1c0e46195b53a2ca;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

3a5f0a8b5e9d3116718cb55c1c0e46195b53a2ca
diff --cc NEWS
index d368eec3b,6bd67f62f..1fc539dd1
--- a/NEWS
+++ b/NEWS
@@@ -100,26 -54,10 +100,28 @@@ Bugs fixed in 1.11a
      make bug triggered by sources containing repeated slashes when the
      `subdir-objects' option was used.
  
 +  - Automake now detects the presence of the `-d' flag in the various
 +    `*YFLAGS' variables even when their definitions involve indirections
 +    through other variables, such as in:
 +      foo_opts = -d
 +      AM_YFLAGS = $(foo_opts)
 +
 +  - Automake now complains if a `*YFLAGS' variable has any conditional
 +    content, not only a conditional definition.
 +
 +  - Explicit enabling and/or disabling of Automake warning categories
 +    through the `-W...' options now always takes precedence over the
 +    implicit warning level implied by Automake strictness (foreign, gnu
 +    or gnits),  regardless of the order in which such strictness and
 +    warning flags appear.  For example, a setting like:
 +      AUTOMAKE_OPTIONS = -Wall --foreign
 +    will cause the warnings in category `portability' to be enabled, even
 +    if those warnings are by default disabled in `foreign' strictness.
 +
    - 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.
  
  New in 1.11:
  
diff --cc lib/depcomp
index c3163befc,8097c1930..43bd0f9bc
--- a/lib/depcomp
+++ b/lib/depcomp
@@@ -1,10 -1,10 +1,10 @@@
  #! /bin/sh
  # depcomp - compile a program generating dependencies as side-effects
  
- scriptversion=2010-10-07.20; # UTC
+ scriptversion=2011-04-09-11; # UTC
  
- # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010
 -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2011,
--# Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
++# 2011 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by