From 3de705e1cdd13eb9a317bb4ba2b99a4fdc87e648 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 14 Nov 2002 20:22:03 +0000 Subject: [PATCH] 2002-11-14 Eric Blake * lib/am/depend2.am: Add missing fi in c.obj rules. --- ChangeLog | 4 ++++ lib/am/depend2.am | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f51cc2..06bfa58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-11-14 Eric Blake + + * lib/am/depend2.am: Add missing fi in c.obj rules. + 2002-11-14 Alexandre Duret-Lutz * automake.in (handle_installdirs): Reindent to workaround a diff --git a/lib/am/depend2.am b/lib/am/depend2.am index 9659dcb..0d52786 100644 --- a/lib/am/depend2.am +++ b/lib/am/depend2.am @@ -62,7 +62,7 @@ if %FASTDEP% 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 @@ if %AMDEP% 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% -- 2.7.4