summaryrefslogtreecommitdiff
path: root/lib/am
diff options
context:
space:
mode:
authorAlexandre Duret-Lutz <adl@gnu.org>2003-11-08 14:03:35 +0000
committerAlexandre Duret-Lutz <adl@gnu.org>2003-11-08 14:03:35 +0000
commit3ff71ab7bc12233d01a016974157b12ce354a6b1 (patch)
tree4dc3d4445e92c524a0af333d0245cec532a3a7be /lib/am
parent9bfd1b3f4f7fb0ad7ba169a5742edeba77f84ff6 (diff)
downloadautomake-3ff71ab7bc12233d01a016974157b12ce354a6b1.tar.gz
* lib/am/depend2.am (?GENERIC?%EXT%.o, ?GENERIC?%EXT%.obj)
(?GENERIC?%EXT%.lo): Do not echo compile command manually, this breaks `make -s'. Instead, fold the compile command on two lines, so that it take less space on the display. Suggested by Karl Berry and William Fulton.
Diffstat (limited to 'lib/am')
-rw-r--r--lib/am/depend2.am59
1 files changed, 32 insertions, 27 deletions
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index dc0e24318..0a6ec6f76 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -36,20 +36,36 @@
## can skip the use of depcomp and easily inline the dependency
## tracking.
+## Verbosity of FASTDEP rules
+## --------------------------
+## (1) Some people want to see what happen 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 line rather than one,
+## because this way %SOURCE% is always located at the end of the first
+## line and is therefore easier to spot.
+
?GENERIC?%EXT%.o:
?!GENERIC?%OBJ%: %SOURCE%
if %FASTDEP%
## In fast-dep mode, we can always use -o.
- @echo " %COMPILE% -MT %OBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %OBJ%" \
-?!GENERIC? `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
-?GENERIC? %SOURCE%
- @if %COMPILE% -MT %OBJ% -MD -MP -MF "%DEPBASE%.Tpo" \
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC? %-c% -o %OBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%; \
-?GENERIC? %-c% -o %OBJ% %SOURCE%; \
- then mv -f "%DEPBASE%.Tpo" "%DEPBASE%.Po"; \
- else rm -f "%DEPBASE%.Tpo"; exit 1; \
- fi
+?!GENERIC? if %COMPILE% -MT %OBJ% -MD -MP -MF "%DEPBASE%.Tpo" %-c% -o %OBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%; \
+?GENERIC? if %COMPILE% -MT %OBJ% -MD -MP -MF "%DEPBASE%.Tpo" %-c% -o %OBJ% %SOURCE%; \
+ then mv -f "%DEPBASE%.Tpo" "%DEPBASE%.Po"; else rm -f "%DEPBASE%.Tpo"; exit 1; fi
else !%FASTDEP%
if %AMDEP%
source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
@@ -70,16 +86,10 @@ endif !%FASTDEP%
?!GENERIC?%OBJOBJ%: %SOURCE%
if %FASTDEP%
## In fast-dep mode, we can always use -o.
- @echo " %COMPILE% -MT %OBJOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %OBJ%" \
-?!GENERIC? `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
-?GENERIC? %SOURCE%
- @if %COMPILE% -MT %OBJOBJ% -MD -MP -MF "%DEPBASE%.Tpo" \
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC? %-c% -o %OBJOBJ% `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`; \
-?GENERIC? %-c% -o %OBJOBJ% `$(CYGPATH_W) '%SOURCE%'`; \
- then mv -f "%DEPBASE%.Tpo" "%DEPBASE%.Po"; \
- else rm -f "%DEPBASE%.Tpo"; exit 1; \
- fi
+?!GENERIC? if %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? if %COMPILE% -MT %OBJOBJ% -MD -MP -MF "%DEPBASE%.Tpo" %-c% -o %OBJOBJ% `$(CYGPATH_W) '%SOURCE%'`; \
+ then mv -f "%DEPBASE%.Tpo" "%DEPBASE%.Po"; else rm -f "%DEPBASE%.Tpo"; exit 1; fi
else !%FASTDEP%
if %AMDEP%
source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
@@ -101,16 +111,11 @@ if %?LIBTOOL%
?!GENERIC?%LTOBJ%: %SOURCE%
if %FASTDEP%
## In fast-dep mode, we can always use -o.
- @echo " %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %LTOBJ%" \
-?!GENERIC? `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
-?GENERIC? %SOURCE%
- @if %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF "%DEPBASE%.Tpo" \
-?GENERIC? %-c% -o %LTOBJ% %SOURCE%; \
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC? %-c% -o %LTOBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%; \
- then mv -f "%DEPBASE%.Tpo" "%DEPBASE%.Plo"; \
- else rm -f "%DEPBASE%.Tpo"; exit 1; \
- fi
+?GENERIC? if %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF "%DEPBASE%.Tpo" %-c% -o %LTOBJ% %SOURCE%; \
+## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
+?!GENERIC? if %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF "%DEPBASE%.Tpo" %-c% -o %LTOBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%; \
+ then mv -f "%DEPBASE%.Tpo" "%DEPBASE%.Plo"; else rm -f "%DEPBASE%.Tpo"; exit 1; fi
else !%FASTDEP%
if %AMDEP%
source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@