* compile.am (.c.obj): Also disabled when dependency tracking

	enabled.
	* depend2.am (@EXT@.obj): New target.
	* automake.in (get_object_extension): Added explanatory comment.
	(generate_dependency_code): Handle $seen_objext.

diff --git a/ChangeLog b/ChangeLog
index f560e37c1adc7306462670a07d33c61b76023329..07d1b1f2d0c01fe812209085f7d4a12212c37cc7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 1999-03-29  Tom Tromey  <tromey@cygnus.com>
 
+       * compile.am (.c.obj): Also disabled when dependency tracking
+       enabled.
+       * depend2.am (@EXT@.obj): New target.
+       * automake.in (get_object_extension): Added explanatory comment.
+       (generate_dependency_code): Handle $seen_objext.
+
        * depend.am: Removed obsolete comment.
        * depend2.am: Minor formatting fix.
 

diff --git a/automake.in b/automake.in
index 53c285b725670738e7efc4878705aa9927fe3a34..825e68ad7ac47ceebd96f41970d02c5ccfedc5ee 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -740,6 +740,8 @@ sub get_object_extension
        $output_vars .= &file_contents_with_transform ($xform,
                                                       'comp-vars');
 
+       # Note that order of transforms is important here.  We collude
+       # with compile.am to get the right result.
        $xform = (($use_dependencies
                   ? 's/^NOTDEPEND.*$//;'
                   : 's/^NOTDEPEND//;')
@@ -2514,6 +2516,7 @@ sub generate_dependency_code
 {
     local ($lang, $fullname, $subst) = @_;
 
+    local ($xform) = $seen_objext ? 's/^OBJEXT//;' : 's/^OBJEXT.*$//;';
     local ($error) = 0;
     local ($ext);
     foreach $ext (&lang_extensions ($lang))
@@ -2527,7 +2530,8 @@ sub generate_dependency_code
        $output_rules .=
            &file_contents_with_transform ('s/\@EXT\@/' . $ext . '/g;'
                                           . 's/\@FPFX\@/' . $fullname . '/g;'
-                                          . 's/\@PFX\@/' . $subst . '/g;',
+                                          . 's/\@PFX\@/' . $subst . '/g;'
+                                          . $xform,
                                           'depend2');
     }
 }

diff --git a/compile.am b/compile.am
index 6e9f92a216b95b297971701324ec46feec2e378c..b15d24e6d135ece7d781b5e6951b01c228bc75a5 100644 (file)
--- a/compile.am
+++ b/compile.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995-98, 1999 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -18,10 +18,11 @@
 NOTDEPEND.c.o:
 NOTDEPEND      $(COMPILE) -c $<
 
-OBJEXT# FIXME: We should only use cygpath when building on Windows,
-OBJEXT# and only if it is available.
-OBJEXT.c.obj:
-OBJEXT $(COMPILE) -c `cygpath -w $<`
+## Note that NOTDEPEND must appear before OBJEXT here.
+NOTDEPENDOBJEXT# FIXME: We should only use cygpath when building on Windows,
+NOTDEPENDOBJEXT# and only if it is available.
+NOTDEPENDOBJEXT.c.obj:
+NOTDEPENDOBJEXT        $(COMPILE) -c `cygpath -w $<`
 
 .s.o:
        $(COMPILE) -c $<

diff --git a/depend2.am b/depend2.am
index 7abf907f9415ac5950583c6b462ae2f47b4d9864..1a7caec4c973e027b6992924305b2c933740db24 100644 (file)
--- a/depend2.am
+++ b/depend2.am
@@ -29,3 +29,7 @@ DEP_@FPFX@COMPILE = $(DEP_@FPFX@PRECOMP); echo " $$compile -c $$file"; $$compile
 @EXT@.lo:
        @file='$<'; compile='$(LT@PFX@COMPILE)'; suffix='\1.o \1.lo'; \
        $(DEP_@FPFX@COMPILE)
+
+OBJEXT@EXT@.obj:
+OBJEXT @file=`cygpath -w $<`; compile='$(@PFX@COMPILE)'; \
+OBJEXT $(DEP_@FPFX@COMPILE)