Tom Tromey wrote:
>
> >>>>> "Robert" == Robert Boehne <[EMAIL PROTECTED]> writes:
>
> Robert> 2001-04-25 Robert Boehne <[EMAIL PROTECTED]>
> Robert> * configure.in: Add _am_dep_true='@AMDEP_TRUE@' and AC_SUBST it.
> Robert> * automake.in: (handle_dependencies) Replace @AMDEP_TRUE@ in
> Robert> $output_rules with @_am_dep_true@ so that @AMDEP_TRUE@ isn't
> Robert> substituted away when automake is created by configure.
> Robert> * depend2.am: Add @AMDEP_TRUE@ to the beginning of lines for
> Robert> dependency tracking in the rules for object files so that
> Robert> disabling dependency tracking with 'configure' will work.
> Robert> * configure: Regenerate.
>
> Thanks for this patch.
> I fixed in a different way before I saw this patch.
> Can you try the current automake?
> Your changes to depend2.am leave me thinking that maybe my fix isn't
> complete. (Or maybe your fix is redundant?)
>
> Tom
Here's the patch for depend2.am that I intended to send. ;)
Robert
--
Robert Boehne Software Engineer
Ricardo Software Chicago Technical Center
TEL: (630)789-0003 x. 238
FAX: (630)789-0127
email: [EMAIL PROTECTED]
Index: depend2.am
===================================================================
RCS file: /cvs/automake/automake/depend2.am,v
retrieving revision 1.36
diff -u -r1.36 depend2.am
--- depend2.am 2001/04/27 12:55:48 1.36
+++ depend2.am 2001/05/07 13:22:27
@@ -31,9 +31,9 @@
?GENERIC?.%EXT%.o:
?!GENERIC?%OBJ%: %SOURCE%
if %AMDEP%
- source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
- depfile='$(DEPDIR)/%BASE%.Po' tmpdepfile='$(DEPDIR)/%BASE%.TPo'
@AMDEPBACKSLASH@
- $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@ source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@ depfile='$(DEPDIR)/%BASE%.Po' tmpdepfile='$(DEPDIR)/%BASE%.TPo'
+@AMDEPBACKSLASH@
+@AMDEP_TRUE@ $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
%COMPILE% -c -o %OBJ% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
@@ -41,9 +41,9 @@
?GENERIC?.%EXT%.lo:
?!GENERIC?%LTOBJ%: %SOURCE%
if %AMDEP%
- source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
- depfile='$(DEPDIR)/%BASE%.Plo' tmpdepfile='$(DEPDIR)/%BASE%.TPlo'
@AMDEPBACKSLASH@
- $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@ source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@ depfile='$(DEPDIR)/%BASE%.Plo' tmpdepfile='$(DEPDIR)/%BASE%.TPlo'
+@AMDEPBACKSLASH@
+@AMDEP_TRUE@ $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
%LTCOMPILE% -c -o %LTOBJ% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
endif %?LIBTOOL%
@@ -51,8 +51,8 @@
?GENERIC?.%EXT%.obj:
?!GENERIC?%OBJOBJ%: %SOURCE%
if %AMDEP%
- source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
- depfile='$(DEPDIR)/%BASE%.Po' tmpdepfile='$(DEPDIR)/%BASE%.TPo'
@AMDEPBACKSLASH@
- $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@ source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@ depfile='$(DEPDIR)/%BASE%.Po' tmpdepfile='$(DEPDIR)/%BASE%.TPo'
+@AMDEPBACKSLASH@
+@AMDEP_TRUE@ $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
%COMPILE% -c -o %OBJOBJ% `cygpath -w %SOURCE%`
