From 29e44495a63469fc66c65b1683b466f27ee9f3e0 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. --- lib/am/depend2.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/am/depend2.am b/lib/am/depend2.am index cdca24c..0afcb65 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% -- 2.7.4