* automake.in (finish_languages): Define CLD; use it in LINK

	definition.
	(lang_cxx_finish): Define CXXLD; use it in CXXLINK definition.
	(lang_f77_finish): Define FLD; use it in FLINK definition.
	(lang_ppf77_finish): Likewise.
	(lang_ratfor_finish): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 328a5ab8a4d763b3effdf91e19422cab537dc622..ac45d92b229beca57ac5eaa11b8ea531eeefa75e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1998-11-18  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (finish_languages): Define CLD; use it in LINK
+       definition.
+       (lang_cxx_finish): Define CXXLD; use it in CXXLINK definition.
+       (lang_f77_finish): Define FLD; use it in FLINK definition.
+       (lang_ppf77_finish): Likewise.
+       (lang_ratfor_finish): Likewise.
+
 1998-11-10  Matthew D. Langston  <langston@SLAC.Stanford.EDU>
 
        * automake.in (scan_one_configure_file): Recognize

diff --git a/TODO b/TODO
index bf5a3b15e37d102ad5a75d9ab77cd06ebcb744e0..ef635cf8edd768f8f38fa896cc368d5e2216b6a9 100644 (file)
--- a/TODO
+++ b/TODO
@@ -6,7 +6,11 @@
 * document user namespace for macro/target names
   adopt some conventions and use uniformly
 
-* distclean must remove config.status
+* make distcheck uses directories like `=build'.
+  Some (very rare) POSIX systems don't support `=' in filenames.
+  If this ever becomes a problem, fix it
+
+a* distclean must remove config.status
   can't this cause problems for maintainer-clean?
   shouldn't maintainer-clean print the message before running
   any part of the make?  (just to slow things down long enough
@@ -476,6 +480,8 @@ add a concept index
 
 move discussion of cygwin32, etags, mkid under other gnu tools
 
+CLD, CXXLD, FLD
+
 ================================================================
 
 Things to do for gcc:

diff --git a/automake.in b/automake.in
index 18498b2402ec927a4b92b3e626b07e362a1ed9fd..06ae867f1168dd62d5c81b26aee618c06d9a1c6d 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -943,7 +943,8 @@ sub finish_languages
                          $ltcompile .
                          '$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)')
            if ($seen_libtool);
-       &define_variable ('LINK', $ltlink . '$(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@');
+       &define_variable ('CLD', '$(CC)');
+       &define_variable ('LINK', $ltlink . '$(CLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@');
     }
 }
 
@@ -4522,7 +4523,8 @@ sub lang_cxx_finish
                          $ltcompile . '$(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)')
            if ($seen_libtool);
 
-       &define_variable ('CXXLINK', $ltlink . '$(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@');
+       &define_variable ('CXXLD', '$(CXX)');
+       &define_variable ('CXXLINK', $ltlink . '$(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@');
 
        local ($ext);
        foreach $ext (@cxx_list)
@@ -4707,7 +4709,8 @@ sub lang_f77_finish
                          $ltcompile . '$(FC) $(AM_FFLAGS) $(FFLAGS)')
            if ($seen_libtool);
 
-       &define_variable ('FLINK', $ltlink . '$(FC) $(AM_FFLAGS) $(FFLAGS) $(LDFLAGS) -o $@');
+       &define_variable ('FLD', '$(FC)');
+       &define_variable ('FLINK', $ltlink . '$(FLD) $(AM_FFLAGS) $(FFLAGS) $(LDFLAGS) -o $@');
 
        local ($ext);
        foreach $ext (@f77_list)
@@ -4758,7 +4761,8 @@ sub lang_ppf77_finish
                      $ltcompile . '$(FC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)')
        if ($seen_libtool);
 
-    &define_variable ('FLINK', $ltlink . '$(FC) $(AM_FFLAGS) $(FFLAGS) $(LDFLAGS) -o $@');
+    &define_variable ('FLD', '$(FC)');
+    &define_variable ('FLINK', $ltlink . '$(FLD) $(AM_FFLAGS) $(FFLAGS) $(LDFLAGS) -o $@');
 
     $output_rules .= ("$ext.o:\n"
                      . "\t\$(FCOMPILE) -c \$<\n");
@@ -4796,7 +4800,8 @@ sub lang_ratfor_finish
                      $ltcompile . '$(FC) $(AM_FFLAGS) $(FFLAGS) $(AM_RFLAGS) $(RFLAGS)')
        if ($seen_libtool);
 
-    &define_variable ('FLINK', $ltlink . '$(FC) $(AM_FFLAGS) $(FFLAGS) $(AM_RFLAGS) $(RFLAGS) $(LDFLAGS) -o $@');
+    &define_variable ('FLD', '$(FC)');
+    &define_variable ('FLINK', $ltlink . '$(FLD) $(AM_FFLAGS) $(FFLAGS) $(AM_RFLAGS) $(RFLAGS) $(LDFLAGS) -o $@');
 
     $output_rules .= ("$ext.o:\n"
                      . "\t\$(RCOMPILE) -c \$<\n");