From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Sat, 8 Mar 2003 09:02:15 +0000 (+0000)
Subject: * lib/am/depend2.am (?GENERIC?%EXT%.o, ?GENERIC?%EXT%.obj)
X-Git-Tag: Release-1-7b~242
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=8d1c86c38c59d53255216a2da4cc3471cba2cc66;p=automake.git

* lib/am/depend2.am (?GENERIC?%EXT%.o, ?GENERIC?%EXT%.obj)
(?GENERIC?%EXT%.lo): Hide the if/then/else machinery for FASTDEP.
Just echo the gcc command.
Suggested by Karl Berry.
---

diff --git a/ChangeLog b/ChangeLog
index f5025ef2..0c38ff3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-08  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* lib/am/depend2.am (?GENERIC?%EXT%.o, ?GENERIC?%EXT%.obj)
+	(?GENERIC?%EXT%.lo): Hide the if/then/else machinery for FASTDEP.
+	Just echo the gcc command.
+	Suggested by Karl Berry.
+
 2003-03-06  Alexandre Duret-Lutz  <adl@gnu.org>
 
 	* lib/am/depend2.am (?GENERIC?%EXT%.lo): Do not use
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index d5e8a825..51fd1ebe 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -40,7 +40,10 @@
 ?!GENERIC?%OBJ%: %SOURCE%
 if %FASTDEP%
 ## In fast-dep mode, we can always use -o.
-	if %COMPILE% -MT %OBJ% -MD -MP -MF "%DEPBASE%.Tpo" \
+	@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%; \
@@ -67,7 +70,10 @@ endif !%FASTDEP%
 ?!GENERIC?%OBJOBJ%: %SOURCE%
 if %FASTDEP%
 ## In fast-dep mode, we can always use -o.
-	if %COMPILE% -MT %OBJOBJ% -MD -MP -MF "%DEPBASE%.Tpo" \
+	@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%'`; \
@@ -95,7 +101,10 @@ if %?LIBTOOL%
 ?!GENERIC?%LTOBJ%: %SOURCE%
 if %FASTDEP%
 ## In fast-dep mode, we can always use -o.
-	if %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF "%DEPBASE%.Tpo" \
+	@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%; \