Re: [PATCH 4/4] New automake command line option `--silent-rules'.

[Ralf Wildenhues]

* Ralf Corsepius wrote on Tue, Mar 10, 2009 at 09:02:50AM CET:
> Ralf Wildenhues wrote:
>
>> The patches in the branch should not modify automake's output much if
>> the `silent' option is not used.
>
> %VERBOSE%

Ah, got it.  Fixed with this patch.  Thanks.

Without `silent' mode, the generated rules should now be identical to
those generated by automake without the je-silent branch.

Cheers,
Ralf

    Drop extra line from compile rules when `silent' is not used.
    
    * lib/am/depend2.am [!%FASTDEP%]: Only use the `%VERBOSE%
    @AM_BACKSLASH@' extra line if ?VERBOSE?.
    Report by Ralf Corsepius.

diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index dd5a62c..579ecdd 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -71,7 +71,7 @@ if %FASTDEP%
 ?GENERIC??SUBDIROBJ?   %COMPILE% -MT %OBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o 
%OBJ% %SOURCEFLAG%%SOURCE% &&\
 ?GENERIC??SUBDIROBJ?   $(am__mv) %DEPBASE%.Tpo %DEPBASE%.Po
 else !%FASTDEP%
-       %VERBOSE% @AM_BACKSLASH@
+?VERBOSE?      %VERBOSE% @AM_BACKSLASH@
 if %AMDEP%
        source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
        DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -99,7 +99,7 @@ if %FASTDEP%
 ?GENERIC??SUBDIROBJ?   %COMPILE% -MT %OBJOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% 
-o %OBJOBJ% %SOURCEFLAG%`$(CYGPATH_W) '%SOURCE%'` &&\
 ?GENERIC??SUBDIROBJ?   $(am__mv) %DEPBASE%.Tpo %DEPBASE%.Po
 else !%FASTDEP%
-       %VERBOSE% @AM_BACKSLASH@
+?VERBOSE?      %VERBOSE% @AM_BACKSLASH@
 if %AMDEP%
        source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
        DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -129,7 +129,7 @@ if %FASTDEP%
 ?GENERIC??SUBDIROBJ?   %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% 
-o %LTOBJ% %SOURCEFLAG%%SOURCE% &&\
 ?GENERIC??SUBDIROBJ?   $(am__mv) %DEPBASE%.Tpo %DEPBASE%.Plo
 else !%FASTDEP%
-       %VERBOSE% @AM_BACKSLASH@
+?VERBOSE?      %VERBOSE% @AM_BACKSLASH@
 if %AMDEP%
        source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
        DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@