missing fi for compilation to .obj

2002-11-14 Thread Eric Blake
This patch comes from a problem reported to jikes. I'm using the cygwin 
version of automake, which recently upgraded to automake 1.7.1 (from 
automake 1.6).  After regenerating Makefile.in, the makefile now has 
this line:

@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$'; then $(CYGPATH_W) 
'$'; else $(CYGPATH_W) '$(srcdir)/$'`; \

Notice the missing fi inside the backticks.

I don't have the automake sources in front of me, but the file to patch 
gets installed as /usr/share/automake/am/depend2.am.

2002-11-14  Eric Blake  [EMAIL PROTECTED]

	* am/depend2.am: Add missing fi in c.obj rule.


--
This signature intentionally left boring.

Eric Blake [EMAIL PROTECTED]
  BYU student, free software programmer

--- depend2.am.bak  2002-11-14 08:16:26.0 -0700
+++ depend2.am  2002-11-14 08:18:00.0 -0700
@@ -62,7 +62,7 @@
if %COMPILE% -MT %OBJOBJ% -MD -MP -MF %DEPBASE%.Tpo \
 ## 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%'`; \
+ %-c% -o %OBJOBJ% `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else 
+$(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`; \
then mv %DEPBASE%.Tpo %DEPBASE%.Po; \
else rm -f %DEPBASE%.Tpo; exit 1; \
fi
@@ -72,8 +72,8 @@
depfile='%DEPBASE%.Po' tmpdepfile='%DEPBASE%.TPo' @AMDEPBACKSLASH@
$(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 endif %AMDEP%
-?-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%'`
+?-o?   %COMPILE% %-c% %-o% %OBJOBJ% `if test -f '%SOURCE%'; then $(CYGPATH_W) 
+'%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
+?!-o?  %COMPILE% %-c% `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else 
+$(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
 endif !%FASTDEP%
 
 if %?LIBTOOL%



Re: missing fi for compilation to .obj

2002-11-14 Thread Tom Tromey
 Eric == Eric Blake [EMAIL PROTECTED] writes:

Eric I don't have the automake sources in front of me, but the file to
Eric patch gets installed as /usr/share/automake/am/depend2.am.
Eric 2002-11-14  Eric Blake  [EMAIL PROTECTED]
Eric   * am/depend2.am: Add missing fi in c.obj rule.

Looks good.  I'm checking it in on the trunk and the 1.7 branch.

Tom