sort keys where appropriate

diff --git a/ChangeLog b/ChangeLog
index fc6dd5f..12021de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 18 15:27:09 1996  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (read_am_file): Sort configure_vars before adding to
+       output_vars.
+
 Tue Dec 10 00:41:17 1996  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (AC_SUBST_PATTERN): Check for alphanumeric variable

diff --git a/TODO b/TODO
index fb619aa..9aa2911 100644 (file)
--- a/TODO
+++ b/TODO
@@ -2,12 +2,6 @@ Priorities for release:
 !! documentation (eg new macros)
 * copyrights on m4 files, aclocal output
 
-* should skip AC_DEFUN lines; otherwise scanning aclocal.m4 can
-  mess up somewhat (eg think it sees a macro that is defined but
-  not used)
-
-* should not "handle" AC_SUBST($1), etc.  Ooops
-
 * should not put texiname_TEXINFOS into distribution
   should rename this macro anyway, to foo_texi_DEPENDENCIES
 

diff --git a/automake.in b/automake.in
index 4ea1879..6a477d3 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -844,7 +844,7 @@ sub handle_yacc_lex_cxx
     {
        # Make all ._o files depend on ansi2knr.  Use a sneaky little
        # hack to make it print nicely.
-       &pretty_print_rule ('', '', (keys %de_ansi_objects,
+       &pretty_print_rule ('', '', (sort keys %de_ansi_objects,
                                     ':', '$(ANSI2KNR)'));
     }
 
@@ -1692,7 +1692,8 @@ sub handle_man_pages
     # Generate list of install dirs.
     $output_rules .= "install-man: \$(MANS)\n";
     $output_rules .= "\t\$(NORMAL_INSTALL)\n";
-    foreach (keys %sections)
+    # Sort keys so that output is deterministic.
+    foreach (sort keys %sections)
     {
        push (@installdirs, '$(mandir)/man' . $_)
            unless defined $options{'no-installman'};
@@ -1703,7 +1704,7 @@ sub handle_man_pages
 
     # Generate install target.
     local ($key);
-    foreach $key (keys %inames)
+    foreach $key (sort keys %inames)
     {
        $_ = $install_man_format;
        s/\@SECTION\@/$secmap{$key}/g;
@@ -1715,7 +1716,7 @@ sub handle_man_pages
     $output_rules .= "\n";
 
     $output_rules .= "uninstall-man:\n";
-    foreach $key (keys %inames)
+    foreach $key (sort keys %inames)
     {
        $_ = $uninstall_man_format;
        s/\@SECTION\@/$secmap{$key}/g;
@@ -2193,7 +2194,7 @@ sub handle_dependencies
                                               'depend2');
            local ($ext);
            local ($need_cxx) = 0;
-           foreach $ext (keys %cxx_extensions)
+           foreach $ext (sort keys %cxx_extensions)
            {
                $output_rules .=
                    &file_contents_with_transform ('s/\@EXT\@/' . $ext .'/g;'
@@ -3947,7 +3948,7 @@ sub read_am_file
            $vars{'target_alias'} = 'target_alias';
            $vars{'target_triplet'} = 'target';
        }
-       foreach $curs (keys %vars)
+       foreach $curs (sort keys %vars)
        {
            $output_vars .= "$curs = \@$vars{$curs}\@\n";
            $contents{$curs} = "\@$vars{$curs}\@";
@@ -3955,7 +3956,7 @@ sub read_am_file
     }
 
     local ($curs);
-    foreach $curs (keys %configure_vars)
+    foreach $curs (sort keys %configure_vars)
     {
        &define_configure_variable ($curs);
     }
@@ -4398,7 +4399,7 @@ sub am_install_var
     local ($clean_file) = $file . '-clean';
     local ($one_name);
     local ($X);
-    foreach $X (keys %valid)
+    foreach $X (sort keys %valid)
     {
        $one_name = $X . '_' . $primary;
        if (&variable_defined ($one_name))

diff --git a/lib/mdate-sh b/lib/mdate-sh
index 0845b8b..3eeeca4 100755 (executable)
--- a/lib/mdate-sh
+++ b/lib/mdate-sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # mdate-sh - get modification time of a file and pretty-print it
-# Copyright (C) 1995 Software Foundation, Inc.
+# Copyright (C) 1995 Free Software Foundation, Inc.
 # Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
 #
 # This program is free software; you can redistribute it and/or modify

diff --git a/mdate-sh b/mdate-sh
index 0845b8b..3eeeca4 100755 (executable)
--- a/mdate-sh
+++ b/mdate-sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # mdate-sh - get modification time of a file and pretty-print it
-# Copyright (C) 1995 Software Foundation, Inc.
+# Copyright (C) 1995 Free Software Foundation, Inc.
 # Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
 #
 # This program is free software; you can redistribute it and/or modify