[PATCH 6/6] {master} automake: cleanups after de-ansification support removal (2)

[Stefano Lattarini]

* automake.in ($get_object_extension_was_run): Remove, it's not
really needed anymore.
(&get_object_extension): Remove, it's a no-op now.
All callers adjusted.
---
 ChangeLog   |    8 ++++++++
 automake.in |   25 +++----------------------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8887370..f4a388e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-08-28  Stefano Lattarini  <address@hidden>
 
+       automake: cleanups after de-ansification support removal (2)
+       * automake.in ($get_object_extension_was_run): Remove, it's not
+       really needed anymore.
+       (&get_object_extension): Remove, it's a no-op now.
+       All callers adjusted.
+
+2011-08-28  Stefano Lattarini  <address@hidden>
+
        automake: cleanups after de-ansification support removal (1)
        * automake.in (lang_c_rewrite, handle_single_transform): Rename 
        variable `$nonansi_obj' to `$obj'.
diff --git a/automake.in b/automake.in
index 932a66a..ee459f0 100644
--- a/automake.in
+++ b/automake.in
@@ -590,10 +590,6 @@ my %linkers_used;
 # True if we need `LINK' defined.  This is a hack.
 my $need_link;
 
-# Was get_object_extension run?
-# FIXME: This is a hack; a better switch should be found.
-my $get_object_extension_was_run;
-
 # Record each file processed by make_paragraphs.
 my %transformed_files;
 
@@ -702,8 +698,6 @@ sub initialize_per_input ()
 
     $need_link = 0;
 
-    $get_object_extension_was_run = 0;
-
     %transformed_files = ();
 }
 
@@ -1267,16 +1261,6 @@ sub shadow_unconditionally ($$)
   return "\$($varname)"
 }
 
-# get_object_extension ($EXTENSION)
-# ---------------------------------
-# FIXME: this is only used so that `$get_object_extension_was_run' gets
-# properly defined.  We should refactor to get rid of such an hack.
-sub get_object_extension ($)
-{
-    $get_object_extension_was_run = 1;
-    return $_[0];
-}
-
 # check_user_variables (@LIST)
 # ----------------------------
 # Make sure each variable VAR in @LIST does not exist, suggest using AM_VAR
@@ -2397,9 +2381,6 @@ sub check_canonical_spelling
 # Set up the compile suite.
 sub handle_compile ()
 {
-    return
-      unless $get_object_extension_was_run;
-
     # Boilerplate.
     my $default_includes = '';
     if (! option 'nostdinc')
@@ -2496,7 +2477,7 @@ sub handle_programs
       my ($where, $one_file) = @$pair;
 
       my $seen_libobjs = 0;
-      my $obj = get_object_extension '.$(OBJEXT)';
+      my $obj = '.$(OBJEXT)';
 
       $known_programs{$one_file} = $where;
 
@@ -2613,7 +2594,7 @@ sub handle_libraries
       $where->push_context ("while processing library `$onelib'");
       $where->set (INTERNAL->get);
 
-      my $obj = get_object_extension '.$(OBJEXT)';
+      my $obj = '.$(OBJEXT)';
 
       # Canonicalize names and check for misspellings.
       my $xlib = &check_canonical_spelling ($onelib, '_LIBADD', '_SOURCES',
@@ -2778,7 +2759,7 @@ sub handle_ltlibraries
       my ($where, $onelib) = @$pair;
 
       my $seen_libobjs = 0;
-      my $obj = get_object_extension '.lo';
+      my $obj = '.lo';
 
       # Canonicalize names and check for misspellings.
       my $xlib = &check_canonical_spelling ($onelib, '_LIBADD', '_LDFLAGS',
-- 
1.7.2.3