From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 11 Jan 2013 20:53:19 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v1.16~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cb18f18a756e7e6b7aaaaa5deaa7fd677e9a902;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  compile: use 'compile' script when "-c -o" is used with losing compilers
  HACKING: suggest more checks before releasing
  tests: can fake a compiler not grasping "-c -o" -- globally in all tests
  sync: update files from upstream with "make fetch"
  typofix: in comments in GNUmakefile
  Rename 'maint/' -> 'maintainer/', for Git's sake
  HACKING: minor typofix
  HACKING: bug-tracker, the PLANS directory, and how to plan "big" changes
  HACKING: rewindable branches should live in the 'experimental/*' namespace
  HACKING: fixlets about git branch rewinding policy
  HACKING: commit messages are not to follow GCS ChangeLog rules too strongly
  HACKING: "detailed explanation" in commit messages is almost mandatory
  HACKING: we use "merge --log" even when merging master
  HACKING: typofix
  depend2.am: fix comments on verbosity of compilation rules
  depend2.am: improve comments a little
  plans: automake 1.14 is to assume "rm -f" with no args is OK
  plans: we want to active subdir-objects unconditionally in automake 1.14

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

9cb18f18a756e7e6b7aaaaa5deaa7fd677e9a902
diff --cc doc/automake.texi
index 496306c03,a333a1c33..8aaaa4eba
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@@ -176,6 -176,6 +176,7 @@@ Scanning @file{configure.ac}, using @co
  * Optional::                    Other things Automake recognizes
  * aclocal Invocation::          Auto-generating aclocal.m4
  * Macros::                      Autoconf macros supplied with Automake
++* Obsolete Macros::             Obsolete macros you should no longer use
  
  Auto-generating aclocal.m4
  
@@@ -3872,7 -3881,8 +3874,8 @@@ Automake ships with several Autoconf ma
  
  @menu
  * Public Macros::               Macros that you can use.
 -* Obsolete Macros::             Macros that will soon be removed.
  * Private Macros::              Macros that you should not use.
++* Obsolete Macros::             Obsolete macros you should no longer use
  @end menu
  
  @c consider generating the following subsections automatically from m4 files.
@@@ -4043,6 -4052,52 +4045,27 @@@ define @code{WITH_DMALLOC} and add @opt
  @end table
  
  
+ @node Obsolete Macros
 -@subsection Obsolete Macros
++@subsection Obsolete macros you should no longer use
+ @cindex obsolete macros
 -@cindex autoupdate
+ 
+ Although using some of the following macros was required in past
 -releases, you should not use any of them in new code.  @emph{All
 -these macros will be removed in the next major Automake version};
 -if you are still using them, running @command{autoupdate} should
 -adjust your @file{configure.ac} automatically (@pxref{autoupdate
 -Invocation, , Using @command{autoupdate} to Modernize
 -@file{configure.ac}, autoconf, The Autoconf Manual}).
 -@emph{Do it NOW!}
++releases, you should not use any of them in new code.  Also, all
++these macros will be @emph{removed in some future Automake version},
++so you should consider updating your @file{configure.ac} to avoid
++problems in the future.
+ 
+ @table @code
+ 
+ @item AM_PROG_CC_C_O
+ @acindex AM_PROG_CC_C_O
+ @acindex AC_PROG_CC_C_O
+ This is an @emph{obsolete wrapper} around @code{AC_PROG_CC_C_O}.  New
+ code needs not to use this macro.  It will be deprecated, and then
+ removed, in future Automake versions.
+ 
 -@item AM_PROG_MKDIR_P
 -@acindex AM_PROG_MKDIR_P
 -@cindex @code{mkdir -p}, macro check
 -@vindex MKDIR_P
 -@vindex mkdir_p
 -
 -From Automake 1.8 to 1.9.6 this macro used to define the output
 -variable @code{mkdir_p} to one of @code{mkdir -p}, @code{install-sh
 --d}, or @code{mkinstalldirs}.
 -
 -Nowadays Autoconf provides a similar functionality with
 -@code{AC_PROG_MKDIR_P} (@pxref{Particular Programs, , Particular
 -Program Checks, autoconf, The Autoconf Manual}), however this defines
 -the output variable @code{MKDIR_P} instead.  In case you are still
 -using the @code{AM_PROG_MKDIR_P} macro in your @file{configure.ac},
 -or its provided variable @code{$(mkdir_p)} in your @file{Makefile.am},
 -you are advised to switch ASAP to the more modern Autoconf-provided
 -interface instead; both the macro and the variable @emph{will be
 -removed} in the next major Automake release.
 -
+ @end table
+ 
 -
  @node Private Macros
  @subsection Private Macros