Merge branch 'micro' into maint

[platform/upstream/automake.git] / lib / am / depend2.am

diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 845472f..5c6439a 100644 (file)
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2012 Free Software Foundation, Inc.
+## Copyright (C) 1994-2013 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
@@ -27,34 +27,10 @@
 ##   the "if AMDEP" chunk is prefix with @AMDEP_TRUE@ just like for any
 ##   other configure-time conditional.
 ##
-## We do likewise for %FASTDEP%; this expands to an ordinary
-## configure-time conditional.  %FASTDEP% is used to speed up the
-## common case of building a package with gcc 3.x.  In this case we
-## can skip the use of depcomp and easily inline the dependency
-## tracking.
-
-## Verbosity of FASTDEP rules
-## --------------------------
-## (1) Some people want to see what happens during make.  They think
-##     @-commands are evil because hiding things hinders debugging.
-## (2) Other people want to see only the important commands--those that
-##     may produce diagnostics, such as compiler invocations.  They
-##     do not care about build details such as dependency generation
-##     (the if/then/else machinery in FASTDEP rules).  Their point is
-##     that it is hard to spot diagnostics in a verbose output.
-## (3) Other people want "make -s" to work as expected: silently.
-##     This way they can spot any diagnostic really easily.
-##
-## The second point suggests we hide rules with @ and that we 'echo'
-## only the relevant parts.  However this goes against the two others.
-## There are regular complaints about this on the mailing list, but
-## it's hard to please everybody.  On April 2003, William Fulton (from
-## clan (3)) and Karl Berry (from clan (2)) agreed that folding the
-## compile rules so that they are output on a single line (instead of 5)
-## would be a good compromise.  Actually we use two lines rather than one,
-## because this way %SOURCE% is always located at the end of the first
-## line and is therefore easier to spot.  (We need an extra line when
-## depbase is used.)
+## We do likewise for %FASTDEP%; this expands to an ordinary configure-time
+## conditional.  %FASTDEP% is used to speed up the common case of building
+## a package with gcc 3.x or later.  In this case we can skip the use of
+## depcomp and easily inline the dependency tracking.
 
 if %?NONLIBTOOL%
 ?GENERIC?%EXT%.o: