From cae4a474fb343b28d3c8fa72f068f7dce8856693 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Wed, 11 Mar 2009 19:50:16 +0100 Subject: [PATCH] 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. Signed-off-by: Ralf Wildenhues --- ChangeLog | 7 +++++++ lib/am/depend2.am | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 04d722b76..d61403018 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-03-11 Ralf Wildenhues + + 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. + 2009-03-10 Ralf Wildenhues Keep `--silent-rules' across triggered automake reruns. diff --git a/lib/am/depend2.am b/lib/am/depend2.am index dd5a62c72..579ecdd49 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@ -- 2.47.2