From 48cf5ae1715d0dba8ab66ae6467aa3b927f2cb4c Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 10 Jul 2002 04:41:55 +0000 Subject: [PATCH] * lib/am/depend2.am: Search in srcdir and builddir for %SOURCE% before passing to cygpath. Partial fix for PR automake/334. --- ChangeLog | 5 +++++ lib/am/depend2.am | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index da26db2d..bec345f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-07-09 Tom Tromey + + * lib/am/depend2.am: Search in srcdir and builddir for %SOURCE% + before passing to cygpath. Partial fix for PR automake/334. + 2002-07-09 Alexandre Duret-Lutz * automake.in (generate_makefile): Suggest using AM_CPPFLAGS diff --git a/lib/am/depend2.am b/lib/am/depend2.am index 35e153de..5db93946 100644 --- a/lib/am/depend2.am +++ b/lib/am/depend2.am @@ -59,19 +59,21 @@ endif !%FASTDEP% ?!GENERIC?%OBJOBJ%: %SOURCE% if %FASTDEP% ## In fast-dep mode, we can always use -o. + file="`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%"; \ if %COMPILE% -MT %OBJOBJ% -MD -MP -MF "%DEPBASE%.Tpo" \ - %-c% -o %OBJOBJ% `cygpath -w %SOURCE%`; \ + %-c% -o %OBJOBJ% `cygpath -w "$$file"`; \ then mv "%DEPBASE%.Tpo" "%DEPBASE%.Po"; \ else rm -f "%DEPBASE%.Tpo"; exit 1; \ fi else !%FASTDEP% + file="`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%"; \ if %AMDEP% source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@ depfile='%DEPBASE%.Po' tmpdepfile='%DEPBASE%.TPo' @AMDEPBACKSLASH@ $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@ endif %AMDEP% -?-o? %COMPILE% %-c% %-o% %OBJOBJ% `cygpath -w %SOURCE%` -?!-o? %COMPILE% %-c% `cygpath -w %SOURCE%` +?-o? %COMPILE% %-c% %-o% %OBJOBJ% `cygpath -w "$$file"` +?!-o? %COMPILE% %-c% `cygpath -w "$$file"` endif !%FASTDEP% if %?LIBTOOL% -- 2.43.5