yet another patch to reduce make output

[Jason Kraftcheck]

I know there's been patches in the past to reduce the output of the
makefiles generated by automake that have not been accepted.  I understand
that the main reasons for opposing such a patch are:
a) hiding output might result in more incorrect or uninformative bug reports
b) it is more bloat in the Makefile.in's
c) everyone uses editors that filter the output anyway

This patch prefixes the compile and link commands in the generated
Makefile's with $(AM_PFX).  It leaves AM_PFX undefined, so the default
behavior is unchanged.  If a package maintainer wants to change the
output, (s)he can do something like: AM_PFX = @echo "$@ ...";

This makes no change to the default behavior of automake, and doesn't
provide any configure flags.  Unless a package developer makes a specific
effort to suppress output, users will see the verbose make output.
Hopefully, this is sufficient to address a) above.

The increase in the size of the Makefile.in should be minimal.  When I
tested this change, a 236,588 byte Makefile.in was increased to 239,063
bytes (about 1%).  The resulting Makefile was about 1.2% larger.
Hopefully, this 'bloat' is sufficiently small.

c) just isn't true.  I don't use such an editor, and I'm tasked with
updating the build system for a project for which most of other developers
don't use such an editor either.  This is the most minimal change I can
think of to make using automake a little more convenient for those of us
in this situation.

The patch is against automake-1.10

thanks,

- jason

diff -ur automake1.10-1.10+nogfdl/lib/am/depend2.am mod/lib/am/depend2.am
--- automake1.10-1.10+nogfdl/lib/am/depend2.am  2006-10-15 11:52:55.000000000 
-0500
+++ mod/lib/am/depend2.am       2007-01-18 15:25:52.823358898 -0600
@@ -65,9 +65,9 @@
 if %FASTDEP%
 ## In fast-dep mode, we can always use -o.
 ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC?     %COMPILE% -MT %OBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %OBJ% 
`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
-?GENERIC??!SUBDIROBJ?  %COMPILE% -MT %OBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o 
%OBJ% %SOURCE%
-?GENERIC??SUBDIROBJ?   depbase=`echo %OBJ% | sed 
's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+?!GENERIC?     $(AM_PFX)%COMPILE% -MT %OBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o 
%OBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
+?GENERIC??!SUBDIROBJ?  $(AM_PFX)%COMPILE% -MT %OBJ% -MD -MP -MF %DEPBASE%.Tpo 
%-c% -o %OBJ% %SOURCE%
+?GENERIC??SUBDIROBJ?   $(AM_PFX)depbase=`echo %OBJ% | sed 
's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 ?GENERIC??SUBDIROBJ?   %COMPILE% -MT %OBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o 
%OBJ% %SOURCE% &&\
        mv -f %DEPBASE%.Tpo %DEPBASE%.Po
 else !%FASTDEP%
@@ -76,12 +76,12 @@
        DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 endif %AMDEP%
 if %?GENERIC%
-?-o?   %COMPILE% %-c% %-o% %OBJ% %SOURCE%
-?!-o?  %COMPILE% %-c% %SOURCE%
+?-o?   $(AM_PFX)%COMPILE% %-c% %-o% %OBJ% %SOURCE%
+?!-o?  $(AM_PFX)%COMPILE% %-c% %SOURCE%
 else !%?GENERIC%
 ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?-o?   %COMPILE% %-c% %-o% %OBJ% `test -f '%SOURCE%' || echo 
'$(srcdir)/'`%SOURCE%
-?!-o?  %COMPILE% %-c% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
+?-o?   $(AM_PFX)%COMPILE% %-c% %-o% %OBJ% `test -f '%SOURCE%' || echo 
'$(srcdir)/'`%SOURCE%
+?!-o?  $(AM_PFX)%COMPILE% %-c% `test -f '%SOURCE%' || echo 
'$(srcdir)/'`%SOURCE%
 endif !%?GENERIC%
 endif !%FASTDEP%
 
@@ -90,9 +90,9 @@
 if %FASTDEP%
 ## In fast-dep mode, we can always use -o.
 ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC?     %COMPILE% -MT %OBJOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o 
%OBJOBJ% `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else 
$(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
-?GENERIC??!SUBDIROBJ?  %COMPILE% -MT %OBJOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% 
-o %OBJOBJ% `$(CYGPATH_W) '%SOURCE%'`
-?GENERIC??SUBDIROBJ?   depbase=`echo %OBJ% | sed 
's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+?!GENERIC?     $(AM_PFX)%COMPILE% -MT %OBJOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% 
-o %OBJOBJ% `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else 
$(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
+?GENERIC??!SUBDIROBJ?  $(AM_PFX)%COMPILE% -MT %OBJOBJ% -MD -MP -MF 
%DEPBASE%.Tpo %-c% -o %OBJOBJ% `$(CYGPATH_W) '%SOURCE%'`
+?GENERIC??SUBDIROBJ?   $(AM_PFX)depbase=`echo %OBJ% | sed 
's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
 ?GENERIC??SUBDIROBJ?   %COMPILE% -MT %OBJOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% 
-o %OBJOBJ% `$(CYGPATH_W) '%SOURCE%'` &&\
        mv -f %DEPBASE%.Tpo %DEPBASE%.Po
 else !%FASTDEP%
@@ -101,12 +101,12 @@
        DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 endif %AMDEP%
 if %?GENERIC%
-?-o?   %COMPILE% %-c% %-o% %OBJOBJ% `$(CYGPATH_W) '%SOURCE%'`
-?!-o?  %COMPILE% %-c% `$(CYGPATH_W) '%SOURCE%'`
+?-o?   $(AM_PFX)%COMPILE% %-c% %-o% %OBJOBJ% `$(CYGPATH_W) '%SOURCE%'`
+?!-o?  $(AM_PFX)%COMPILE% %-c% `$(CYGPATH_W) '%SOURCE%'`
 else !%?GENERIC%
 ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?-o?   %COMPILE% %-c% %-o% %OBJOBJ% `if test -f '%SOURCE%'; then $(CYGPATH_W) 
'%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
-?!-o?  %COMPILE% %-c% `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; 
else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
+?-o?   $(AM_PFX)%COMPILE% %-c% %-o% %OBJOBJ% `if test -f '%SOURCE%'; then 
$(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
+?!-o?  $(AM_PFX)%COMPILE% %-c% `if test -f '%SOURCE%'; then $(CYGPATH_W) 
'%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
 endif !%?GENERIC%
 endif !%FASTDEP%
 endif %?NONLIBTOOL%
@@ -117,9 +117,9 @@
 if %FASTDEP%
 ## In fast-dep mode, we can always use -o.
 ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC?     %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o 
%LTOBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
-?GENERIC??!SUBDIROBJ?  %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% 
-o %LTOBJ% %SOURCE%
-?GENERIC??SUBDIROBJ?   depbase=`echo %OBJ% | sed 
's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+?!GENERIC?     $(AM_PFX)%LTCOMPILE% -MT %LTOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% 
-o %LTOBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
+?GENERIC??!SUBDIROBJ?  $(AM_PFX)%LTCOMPILE% -MT %LTOBJ% -MD -MP -MF 
%DEPBASE%.Tpo %-c% -o %LTOBJ% %SOURCE%
+?GENERIC??SUBDIROBJ?   $(AM_PFX)depbase=`echo %OBJ% | sed 
's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
 ?GENERIC??SUBDIROBJ?   %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% 
-o %LTOBJ% %SOURCE% &&\
        mv -f %DEPBASE%.Tpo %DEPBASE%.Plo
 else !%FASTDEP%
@@ -128,8 +128,8 @@
        DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 endif %AMDEP%
 ## We can always use `-o' with Libtool.
-?GENERIC?      %LTCOMPILE% %-c% -o %LTOBJ% %SOURCE%
+?GENERIC?      $(AM_PFX)%LTCOMPILE% %-c% -o %LTOBJ% %SOURCE%
 ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC?     %LTCOMPILE% %-c% -o %LTOBJ% `test -f '%SOURCE%' || echo 
'$(srcdir)/'`%SOURCE%
+?!GENERIC?     $(AM_PFX)%LTCOMPILE% %-c% -o %LTOBJ% `test -f '%SOURCE%' || 
echo '$(srcdir)/'`%SOURCE%
 endif !%FASTDEP%
 endif %?LIBTOOL%
diff -ur automake1.10-1.10+nogfdl/lib/am/lang-compile.am 
mod/lib/am/lang-compile.am
--- automake1.10-1.10+nogfdl/lib/am/lang-compile.am     2005-05-14 
14:52:09.000000000 -0500
+++ mod/lib/am/lang-compile.am  2007-01-18 15:27:20.372830399 -0600
@@ -25,7 +25,7 @@
 ## We also handle the case of preprocessing `.F' files into `.f' files.
 if %?PPF77%
 .F.f:
-       $(F77COMPILE) -F $<
+       $(AM_PFX)$(F77COMPILE) -F $<
 endif %?PPF77%
 
 
@@ -37,5 +37,5 @@
 ## We also handle the case of preprocessing `.r' files into `.f' files.
 if %?RATFOR%
 .r.f:
-       $(RCOMPILE) -F $<
+       $(AM_PFX)$(RCOMPILE) -F $<
 endif %?RATFOR%
diff -ur automake1.10-1.10+nogfdl/lib/am/ltlibrary.am mod/lib/am/ltlibrary.am
--- automake1.10-1.10+nogfdl/lib/am/ltlibrary.am        2005-05-14 
14:52:09.000000000 -0500
+++ mod/lib/am/ltlibrary.am     2007-01-18 15:28:49.362391899 -0600
@@ -16,4 +16,4 @@
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
 %LTLIBRARY%: $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_DEPENDENCIES) %DIRSTAMP%
-       $(%XLINK%) %RPATH% $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_LIBADD) 
$(LIBS)
+       $(AM_PFX)$(%XLINK%) %RPATH% $(%XLTLIBRARY%_OBJECTS) 
$(%XLTLIBRARY%_LIBADD) $(LIBS)
diff -ur automake1.10-1.10+nogfdl/lib/am/program.am mod/lib/am/program.am
--- automake1.10-1.10+nogfdl/lib/am/program.am  2005-05-14 14:52:09.000000000 
-0500
+++ mod/lib/am/program.am       2007-01-18 15:29:31.056997650 -0600
@@ -23,4 +23,4 @@
 ## Or maybe not... sadly, incremental linkers are rarer than losing
 ## systems.
        @rm -f %PROGRAM%%EXEEXT%
-       $(%XLINK%) $(%XPROGRAM%_OBJECTS) $(%XPROGRAM%_LDADD) $(LIBS)
+       $(AM_PFX)$(%XLINK%) $(%XPROGRAM%_OBJECTS) $(%XPROGRAM%_LDADD) $(LIBS)