* lib/am/depend2.am (?GENERIC?%EXT%.lo): Do not use

`test -f foo || echo $(srcdir)/` to emulate a VPATH search when
outputing suffix rules.  This follows 2003-02-25's change.
* lib/am/lex.am (?GENERIC?%EXT%%DERIVED-EXT%): Likewise.
* lib/am/yacc.am (?GENERIC?%EXT%%DERIVED-EXT%): Likewise.

diff --git a/ChangeLog b/ChangeLog
index c2d438b76656964b7ce95b659c9cf273d11451d9..f5025ef297419b381a620c19d6dcef77d3dcbdfe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-03-06  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * lib/am/depend2.am (?GENERIC?%EXT%.lo): Do not use
+       `test -f foo || echo $(srcdir)/` to emulate a VPATH search when
+       outputing suffix rules.  This follows 2003-02-25's change.
+       * lib/am/lex.am (?GENERIC?%EXT%%DERIVED-EXT%): Likewise.
+       * lib/am/yacc.am (?GENERIC?%EXT%%DERIVED-EXT%): Likewise.
+
 2003-03-05  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * automake.texi (Requirements) <AC_CONFIG_FILES>: Files listed

diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 0afcb6557efb1f6b5bbdb79950ed57f36907ac5f..d5e8a8250c977437ff01326265ec265af1ddf128 100644 (file)
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -96,7 +96,9 @@ if %?LIBTOOL%
 if %FASTDEP%
 ## In fast-dep mode, we can always use -o.
        if %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF "%DEPBASE%.Tpo" \
-         %-c% -o %LTOBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%; \
+?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 "%DEPBASE%.Tpo" "%DEPBASE%.Plo"; \
        else rm -f "%DEPBASE%.Tpo"; exit 1; \
        fi

diff --git a/lib/am/lex.am b/lib/am/lex.am
index a7b19207523ee60727b9433822061efa420cacd8..9ce16f9d0de8628143097f113832d33f689e5cb2 100644 (file)
--- a/lib/am/lex.am
+++ b/lib/am/lex.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright 2001  Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -19,9 +19,13 @@
 ?GENERIC?%EXT%%DERIVED-EXT%:
 ?!GENERIC?%OBJ%: %SOURCE%
 if %?MORE-THAN-ONE%
-       $(SHELL) $(YLWRAP) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% $(LEX_OUTPUT_ROOT).c %OBJ% -- %COMPILE%
+?GENERIC?      $(SHELL) $(YLWRAP) %SOURCE% $(LEX_OUTPUT_ROOT).c %OBJ% -- %COMPILE%
+## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
+?!GENERIC?     $(SHELL) $(YLWRAP) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% $(LEX_OUTPUT_ROOT).c %OBJ% -- %COMPILE%
 else !%?MORE-THAN-ONE%
-       %COMPILE% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
+?GENERIC?      %COMPILE% %SOURCE%
+## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
+?!GENERIC?     %COMPILE% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
 ## Edit out `#line' or `#' directives.
        sed '/^#/ s|$(LEX_OUTPUT_ROOT)\.c|%OBJ%|' $(LEX_OUTPUT_ROOT).c >%OBJ%
        rm -f $(LEX_OUTPUT_ROOT).c

diff --git a/lib/am/yacc.am b/lib/am/yacc.am
index 8dcbdb8cda6ad625e4193464b440e1c1665fa99c..eb0083dd1b14d2d037f6033f91fd760a8d37b382 100644 (file)
--- a/lib/am/yacc.am
+++ b/lib/am/yacc.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright 1998, 1999, 2001  Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2001, 2002, 2003  Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -19,9 +19,13 @@
 ?GENERIC?%EXT%%DERIVED-EXT%:
 ?!GENERIC?%OBJ%: %SOURCE%
 if %?MORE-THAN-ONE%
-       $(SHELL) $(YLWRAP) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% y.tab.c %OBJ% y.tab.h %BASE%.h y.output %BASE%.output -- %COMPILE%
+?GENERIC?      $(SHELL) $(YLWRAP) %SOURCE% y.tab.c %OBJ% y.tab.h %BASE%.h y.output %BASE%.output -- %COMPILE%
+## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
+?!GENERIC?     $(SHELL) $(YLWRAP) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% y.tab.c %OBJ% y.tab.h %BASE%.h y.output %BASE%.output -- %COMPILE%
 else !%?MORE-THAN-ONE%
-       %COMPILE% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
+?GENERIC?      %COMPILE% %SOURCE%
+## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
+?!GENERIC?     %COMPILE% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
 ## Edit out `#line' or `#' directives.
        sed '/^#/ s|y\.tab\.c|%OBJ%|' y.tab.c >%OBJ%
        rm -f y.tab.c