[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Patch: FYI: fix previous patch
From: |
Tom Tromey |
Subject: |
Patch: FYI: fix previous patch |
Date: |
09 Jul 2002 23:40:29 -0600 |
I'm checking this in.
This fixes a problem I introduced in the last patch.
This is pretty ugly but I couldn't think of a better way, given the
limitations of our current .am parser.
Tom
Index: ChangeLog
from Tom Tromey <address@hidden>
* lib/am/depend2.am: Reworked syntax to avoid parsing problem.
Index: lib/am/depend2.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/depend2.am,v
retrieving revision 1.44
diff -u -r1.44 depend2.am
--- lib/am/depend2.am 10 Jul 2002 04:41:55 -0000 1.44
+++ lib/am/depend2.am 10 Jul 2002 05:32:22 -0000
@@ -59,21 +59,21 @@
?!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 "$$file"`; \
+## 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%'`; \
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 "$$file"`
-?!-o? %COMPILE% %-c% `cygpath -w "$$file"`
+?-o? %COMPILE% %-c% %-o% %OBJOBJ% `if test -f '%SOURCE%'; then cygpath -w
'%SOURCE%'; else cygpath -w '$(srcdir)/%SOURCE%'`
+?!-o? %COMPILE% %-c% `if test -f '%SOURCE%'; then cygpath -w '%SOURCE%'; else
cygpath -w '$(srcdir)/%SOURCE%'`
endif !%FASTDEP%
if %?LIBTOOL%
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Patch: FYI: fix previous patch,
Tom Tromey <=