From 235a328dfc97de67edc7b8963e3836a5c4edb85b Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Thu, 6 Mar 2003 21:11:48 +0000 Subject: [PATCH] * 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. --- ChangeLog | 8 ++++++++ lib/am/depend2.am | 6 ++++-- lib/am/lex.am | 10 +++++++--- lib/am/yacc.am | 10 +++++++--- 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index c2d438b7..f5025ef2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-03-06 Alexandre Duret-Lutz + + * 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 * automake.texi (Requirements) : Files listed diff --git a/lib/am/depend2.am b/lib/am/depend2.am index cdca24c5..0afcb655 100644 --- a/lib/am/depend2.am +++ b/lib/am/depend2.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ## Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify @@ -107,6 +107,8 @@ if %AMDEP% $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@ endif %AMDEP% ## We can always use `-o' with Libtool. - %LTCOMPILE% %-c% -o %LTOBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% +?GENERIC? %LTCOMPILE% %-c% -o %LTOBJ% %SOURCE% +## For non-suffix rules, we must emulate a VPATH search on %SOURCE%. +?!GENERIC? %LTCOMPILE% %-c% -o %LTOBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% endif !%FASTDEP% endif %?LIBTOOL% diff --git a/lib/am/lex.am b/lib/am/lex.am index a7b19207..9ce16f9d 100644 --- 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 8dcbdb8c..eb0083dd 100644 --- 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 -- 2.43.5