From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Tue, 25 Feb 2003 20:07:33 +0000 (+0000)
Subject: * lib/am/depend2.am (?GENERIC?%EXT%.o, ?GENERIC?%EXT%.obj): Do not
X-Git-Tag: Release-1-7-3b~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=421258da3e88cdd56574ec9e06de41d248e3df25;p=thirdparty%2Fautomake.git

* lib/am/depend2.am (?GENERIC?%EXT%.o, ?GENERIC?%EXT%.obj): Do not
use the `test -f foo || echo $(srcdir)/` to emulate a VPATH search
when outputing suffix rules.
* lib/am/texibuild.am (?GENERIC?%SOURCE_SUFFIX%.dvi)
(?GENERIC?%SOURCE_SUFFIX%.pdf): Likewise.
Suggested by Bruno Haible.
---

diff --git a/ChangeLog b/ChangeLog
index 002fed610..8bee7a361 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2003-02-25  Alexandre Duret-Lutz  <adl@gnu.org>
 
+	* lib/am/depend2.am (?GENERIC?%EXT%.o, ?GENERIC?%EXT%.obj): Do not
+	use the `test -f foo || echo $(srcdir)/` to emulate a VPATH search
+	when outputing suffix rules.
+	* lib/am/texibuild.am (?GENERIC?%SOURCE_SUFFIX%.dvi)
+	(?GENERIC?%SOURCE_SUFFIX%.pdf): Likewise.
+	Suggested by Bruno Haible.
+
 	* automake.in (read_am_file): Catch trailing backslashes on last line.
 	* tests/backsl3.test: New file.
 	* tests/Makefile.am (TESTS): Add backsl3.test.
diff --git a/Makefile.in b/Makefile.in
index 47f6a8c9e..da138eb99 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -219,12 +219,12 @@ uninstall-binSCRIPTS:
 .texi.dvi:
 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2DVI) `test -f '$<' || echo '$(srcdir)/'`$<
+	$(TEXI2DVI) $<
 
 .texi.pdf:
 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$<
+	$(TEXI2PDF) $<
 automake.info: automake.texi version.texi
 automake.dvi: automake.texi version.texi
 automake.pdf: automake.texi version.texi
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 0d5278663..cdca24c57 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -41,7 +41,9 @@
 if %FASTDEP%
 ## In fast-dep mode, we can always use -o.
 	if %COMPILE% -MT %OBJ% -MD -MP -MF "%DEPBASE%.Tpo" \
-	  %-c% -o %OBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%; \
+## 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 "%DEPBASE%.Tpo" "%DEPBASE%.Po"; \
 	else rm -f "%DEPBASE%.Tpo"; exit 1; \
 	fi
@@ -51,8 +53,14 @@ if %AMDEP%
 	depfile='%DEPBASE%.Po' tmpdepfile='%DEPBASE%.TPo' @AMDEPBACKSLASH@
 	$(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 endif %AMDEP%
+if %?GENERIC%
+?-o?	%COMPILE% %-c% %-o% %OBJ% %SOURCE%
+?!-o?	%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%
+endif !%?GENERIC%
 endif !%FASTDEP%
 
 ?GENERIC?%EXT%.obj:
@@ -60,9 +68,9 @@ endif !%FASTDEP%
 if %FASTDEP%
 ## In fast-dep mode, we can always use -o.
 	if %COMPILE% -MT %OBJOBJ% -MD -MP -MF "%DEPBASE%.Tpo" \
-## Ugly invocation here; using a variable fails due to a parsing
-## problem in automake.
-	  %-c% -o %OBJOBJ% `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`; \
+## 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 "%DEPBASE%.Tpo" "%DEPBASE%.Po"; \
 	else rm -f "%DEPBASE%.Tpo"; exit 1; \
 	fi
@@ -72,8 +80,14 @@ if %AMDEP%
 	depfile='%DEPBASE%.Po' tmpdepfile='%DEPBASE%.TPo' @AMDEPBACKSLASH@
 	$(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 endif %AMDEP%
+if %?GENERIC%
+?-o?	%COMPILE% %-c% %-o% %OBJOBJ% `$(CYGPATH_W) '%SOURCE%'`
+?!-o?	%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`
+endif !%?GENERIC%
 endif !%FASTDEP%
 
 if %?LIBTOOL%
diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index d7665a239..02d9878ae 100644
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -60,7 +60,7 @@
 ## if it is in srcdir (-I $(srcdir) is set in %MAKEINFOFLAGS%).
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) %MAKEINFOFLAGS%' \
 ## Do not use `-o' unless necessary: it is only supported since Texinfo 4.1.
-?GENERIC?	$(TEXI2DVI) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
+?GENERIC?	$(TEXI2DVI) %SOURCE%
 ?!GENERIC?	$(TEXI2DVI) -o $@ `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
 
 ?GENERIC?%SOURCE_SUFFIX%.pdf:
@@ -70,7 +70,7 @@
 ## if it is in srcdir (-I $(srcdir) is set in %MAKEINFOFLAGS%).
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) %MAKEINFOFLAGS%' \
 ## Do not use `-o' unless necessary: it is only supported since Texinfo 4.1.
-?GENERIC?	$(TEXI2PDF) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
+?GENERIC?	$(TEXI2PDF) %SOURCE%
 ?!GENERIC?	$(TEXI2PDF) -o $@ `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
 
 ## If we are using the generic rules, we need separate dependencies.