OBJECTS.patch (Was: 33-simplify-contents-traces.patch)

[Akim Demaille]

>>>>> "Tom" == Tom Tromey <address@hidden> writes:

Tom> FYI: We currently use $(SOURCES) for tags (btw tag generation is
Tom> an ugly bit of code...), but I don't think we use $(OBJECTS) at
Tom> all.  We should simply remove it.

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * automake.in (@objects): Remove, unused.
        Remove all the code related to it, and to former `$(OBJECTS)'.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1097
diff -u -u -r1.1097 automake.in
--- automake.in 2001/05/08 13:53:30 1.1097
+++ automake.in 2001/05/08 16:36:53
@@ -557,10 +557,8 @@
 # A list of files deleted by `maintainer-clean'.
 my @maintainer_clean_files;

-# These are pretty obvious, too.  They are used to define the
-# SOURCES and OBJECTS variables.
+# Value of `$(SOURCES)', used by tags.am.
 my @sources;
-my @objects;
 # Sources which go in the distribution.
 my @dist_sources;

@@ -734,7 +732,6 @@
     @maintainer_clean_files = ();

     @sources = ();
-    @objects = ();
     @dist_sources = ();

     %object_map = ();
@@ -1187,8 +1184,6 @@

     push (@sources, '$(SOURCES)')
        if &variable_defined ('SOURCES');
-    push (@objects, '$(OBJECTS)')
-       if &variable_defined ('OBJECTS');

     # If OBJEXT/EXEEXT were not set in configure.in, do it, it
     # simplifies our task, and anyway starting with Autoconf 2.50, it
@@ -1218,12 +1213,10 @@
     &handle_languages;
     &handle_compile;

-    # Re-init SOURCES and OBJECTS.  FIXME: other code shouldn't depend
-    # on this (but currently does).
+    # Re-init SOURCES.  FIXME: other code shouldn't depend on this
+    # (but currently does).
     macro_define ('SOURCES', 1, '', 'TRUE',
                     join (' ', @sources), 'internal');
-    macro_define ('OBJECTS', 1, '', 'TRUE',
-                    join (' ', @objects), 'internal');
     &define_pretty_variable ('DIST_SOURCES', '', @dist_sources);

     &handle_multilib;
@@ -2064,8 +2057,6 @@
          unless $prefix =~ /EXTRA_/;

        push (@sources, '$(' . $prefix . $one_file . "_SOURCES)");
-       push (@objects, '$(' . $xpfx . $one_file . "_OBJECTS)")
-         unless $prefix =~ /EXTRA_/;
        push (@dist_sources, '$(' . $prefix . $one_file . "_SOURCES)")
          unless $prefix =~ /^nodist_/;
        foreach my $cond (variable_conditions ($var))
@@ -2091,7 +2082,6 @@
        &define_variable ($one_file . "_SOURCES", $unxformed . ".c");
        push (@sources, $unxformed . '.c');
        push (@dist_sources, $unxformed . '.c');
-       push (@objects, $unxformed . $obj);

        my ($temp, @result) =
          &handle_single_transform_list ($one_file . '_SOURCES',
@@ -3914,29 +3904,16 @@
 # Handle footer elements.
 sub handle_footer
 {
-    if (variable_value ('SOURCES'))
-    {
-       # NOTE don't use define_pretty_variable here, because
-       # $contents{...} is already defined.
-       $output_vars .= 'SOURCES = ' . variable_value ('SOURCES') . "\n";
-    }
-    if (variable_value ('OBJECTS'))
-    {
-       # NOTE don't use define_pretty_variable here, because
-       # $contents{...} is already defined.
-       $output_vars .= 'OBJECTS = ' . variable_value ('OBJECTS') . "\n";
-    }
-    if (variable_value ('SOURCES') || variable_value ('OBJECTS'))
-    {
-       $output_vars .= "\n";
-    }
+    # NOTE don't use define_pretty_variable here, because
+    # $contents{...} is already defined.
+    $output_vars .= 'SOURCES = ' . variable_value ('SOURCES') . "\n\n"
+      if variable_value ('SOURCES');

-    if (&target_defined ('.SUFFIXES'))
-    {
-       &am_line_error ('.SUFFIXES',
-                       "use variable `SUFFIXES', not target `.SUFFIXES'");
-    }

+    &am_line_error ('.SUFFIXES',
+                   "use variable `SUFFIXES', not target `.SUFFIXES'")
+      if target_defined ('.SUFFIXES');
+
     # Note: AIX 4.1 /bin/make will fail if any suffix rule appears
     # before .SUFFIXES.  So we make sure that .SUFFIXES appears before
     # anything else, by sticking it right after the default: target.
@@ -3962,7 +3939,8 @@
                           . join (' ', @user_suffixes, sort keys %suffixes)
                           . "\n");
     }
-    $output_trailer .= &file_contents ('footer');
+
+    $output_trailer .= file_contents ('footer');
 }

 # Deal with installdirs target.