* automake.in (lang_extensions): New sub.

	(handle_dependencies): Use it.
	(cxx_extensions): Removed.
	(lang_cxx_finish): Use lang_extensions.
	(f77_extensions): Removed.
	(lang_f77_finish): Use lang_extensions.
	(objc_extensions): Removed.
	(lang_ppf77_finish): Put `.' before extension.  Fixes ext.test.
	Report from Dave Morrison.
	(lang_ratfor_finish): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 8fd421114dc62d6e4b41e6290a42695215de59ce..7ef34db75030594e6f5605a85b28825a2d4878e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+1999-02-27  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (lang_extensions): New sub.
+       (handle_dependencies): Use it.
+       (cxx_extensions): Removed.
+       (lang_cxx_finish): Use lang_extensions.
+       (f77_extensions): Removed.
+       (lang_f77_finish): Use lang_extensions.
+       (objc_extensions): Removed.
+       (lang_ppf77_finish): Put `.' before extension.  Fixes ext.test.
+       Report from Dave Morrison.
+       (lang_ratfor_finish): Likewise.
+
 1999-02-26  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (finish_languages): Added AM_LDFLAGS.

diff --git a/THANKS b/THANKS
index b2dfcd3d6f5ce8651b0f80fe56bdb381df2a7107..18e59a234001504e13969ddf51d7b08caa288419 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -16,6 +16,7 @@ Bill Davidson         bill@kayhay.com
 Bill Fenner            fenner@parc.xerox.com
 Brian Jones            cbj@nortel.net
 Chris Provenzano       proven@io.proven.org
+Dave Morrison          dave@bnl.gov
 David A. Swierczek     swiercze@mr.med.ge.com
 David Zaroski          cz253@cleveland.Freenet.Edu
 Dieter Baron           dillo@stieltjes.smc.univie.ac.at

diff --git a/automake.in b/automake.in
index 3c1054e626421483530c3fa8eafb681a49093176..8ccd2154f01b1c955121500ade65cbdde080d337 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2719,14 +2719,14 @@ sub handle_dependencies
                                               . 's/\@PFX\@//g;',
                                               'depend2');
            local ($ext);
-           foreach $ext (&objc_extensions)
+           foreach $ext (&lang_extensions ('objc'))
            {
                $output_rules .=
                    &file_contents_with_transform ('s/\@EXT\@/' . $ext . '/g;'
                                                   . 's/\@PFX\@/OBJC/g;',
                                                   'depend2');
            }
-           foreach $ext (&cxx_extensions)
+           foreach $ext (&lang_extensions ('cxx'))
            {
                $output_rules .=
                    &file_contents_with_transform ('s/\@EXT\@/' . $ext .'/g;'
@@ -4578,21 +4578,9 @@ sub lang_c_finish
     }
 }
 
-# A helper which computes a sorted list of all C++ extensions which
-# were seen.
-sub cxx_extensions
-{
-    local ($key, @r);
-    foreach $key (sort keys %extension_seen)
-    {
-       push (@r, '.' . $key) if $extension_map{$key} eq 'cxx';
-    }
-    return @r;
-}
-
 sub lang_cxx_finish
 {
-    local (@cxx_list) = &cxx_extensions;
+    local (@cxx_list) = &lang_extensions ('cxx');
     local ($cxx_count) = scalar @cxx_list;
     if ($cxx_count)
     {
@@ -4764,21 +4752,9 @@ sub lang_asm_finish
     &lang_c_finish;
 }
 
-# A helper which computes a sorted list of all Fortran 77 extensions
-# which were seen.
-sub f77_extensions
-{
-    local ($key, @r);
-    foreach $key (sort keys %extension_seen)
-    {
-       push (@r, '.' . $key) if $extension_map{$key} eq 'f77';
-    }
-    return @r;
-}
-
 sub lang_f77_finish
 {
-    local (@f77_list) = &f77_extensions;
+    local (@f77_list) = &lang_extensions ('f77');
     local ($f77_count) = scalar @f77_list;
     if ($f77_count)
     {
@@ -4834,7 +4810,9 @@ sub lang_ppf77_finish
 {
     local ($ext) = 'F';
     last unless $extension_seen{$ext};
-    push (@suffixes, '.' . $ext);
+
+    $ext = '.' . $ext;
+    push (@suffixes, $ext);
 
     local ($ltcompile, $ltlink) = &libtool_compiler;
 
@@ -4872,7 +4850,8 @@ sub lang_ratfor_finish
 {
     local ($ext) = 'r';
     last unless $extension_seen{$ext};
-    push (@suffixes, '.' . $ext);
+    $ext = '.' . $ext;
+    push (@suffixes, $ext);
 
     local ($ltcompile, $ltlink) = &libtool_compiler;
 
@@ -4938,14 +4917,14 @@ sub lang_objc_finish
     }
 }
 
-# A helper which computes a sorted list of all ObjC extensions which
-# were seen.
-sub objc_extensions
+# A helper which computes a sorted list of all extensions for LANG.
+sub lang_extensions
 {
+    local ($lang) = @_;
     local ($key, @r);
     foreach $key (sort keys %extension_seen)
     {
-       push (@r, '.' . $key) if $extension_map{$key} eq 'objc';
+       push (@r, '.' . $key) if $extension_map{$key} eq $lang;
     }
     return @r;
 }