* automake.in (finish_languages): Added AM_LDFLAGS.

	(lang_cxx_finish): Likewise.
	(lang_f77_finish): Likewise.
	(lang_ppf77_finish): Likewise.
	(lang_ratfor_finish): Likewise.
	(lang_objc_finish): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 6b366ce6d2bb6b4d06a5af53df8bb254b5998a5b..8fd421114dc62d6e4b41e6290a42695215de59ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1999-02-26  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (finish_languages): Added AM_LDFLAGS.
+       (lang_cxx_finish): Likewise.
+       (lang_f77_finish): Likewise.
+       (lang_ppf77_finish): Likewise.
+       (lang_ratfor_finish): Likewise.
+       (lang_objc_finish): Likewise.
+
 1999-02-11  Tom Tromey  <tromey@cygnus.com>
 
        * aclocal.in (obsolete_macros): Copied from automake.in.

diff --git a/automake.in b/automake.in
index 1ec6f24136fe7c6b43c5974c96176842de5808de..3c1054e626421483530c3fa8eafb681a49093176 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -949,7 +949,7 @@ sub finish_languages
                          '$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)')
            if ($seen_libtool);
        &define_variable ('CCLD', '$(CC)');
-       &define_variable ('LINK', $ltlink . '$(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@');
+       &define_variable ('LINK', $ltlink . '$(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@');
     }
 }
 
@@ -4607,7 +4607,7 @@ sub lang_cxx_finish
            if ($seen_libtool);
 
        &define_variable ('CXXLD', '$(CXX)');
-       &define_variable ('CXXLINK', $ltlink . '$(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@');
+       &define_variable ('CXXLINK', $ltlink . '$(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@');
 
        local ($ext);
        foreach $ext (@cxx_list)
@@ -4793,7 +4793,7 @@ sub lang_f77_finish
            if ($seen_libtool);
 
        &define_variable ('F77LD', '$(F77)');
-       &define_variable ('F77LINK', $ltlink . '$(F77LD) $(AM_FFLAGS) $(FFLAGS) $(LDFLAGS) -o $@');
+       &define_variable ('F77LINK', $ltlink . '$(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@');
 
        local ($ext);
        foreach $ext (@f77_list)
@@ -4845,7 +4845,7 @@ sub lang_ppf77_finish
        if ($seen_libtool);
 
     &define_variable ('F77LD', '$(F77)');
-    &define_variable ('F77LINK', $ltlink . '$(F77LD) $(AM_FFLAGS) $(FFLAGS) $(LDFLAGS) -o $@');
+    &define_variable ('F77LINK', $ltlink . '$(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@');
 
     $output_rules .= ("$ext.o:\n"
                      . "\t\$(F77COMPILE) -c \$<\n");
@@ -4884,7 +4884,7 @@ sub lang_ratfor_finish
        if ($seen_libtool);
 
     &define_variable ('F77LD', '$(F77)');
-    &define_variable ('F77LINK', $ltlink . '$(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_RFLAGS) $(RFLAGS) $(LDFLAGS) -o $@');
+    &define_variable ('F77LINK', $ltlink . '$(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_RFLAGS) $(RFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@');
 
     $output_rules .= ("$ext.o:\n"
                      . "\t\$(RCOMPILE) -c \$<\n");
@@ -4920,7 +4920,7 @@ sub lang_objc_finish
         if ($seen_libtool);
     
     &define_variable ('OBJCLD', '$(OBJC)');
-    &define_variable ('OBJCLINK', $ltlink . '$(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) $(LDFLAGS) -o $@');
+    &define_variable ('OBJCLINK', $ltlink . '$(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@');
     
     $output_rules .= (".m.o:\n"
                       . "\t\$(OBJCCOMPILE) -c \$<\n");