84-lang-output_arg.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * automake.in (&register_language): Rename `output-arg' as
        `output_arg' to match the Language attribute.
        Set the defaults in %options instead of $lang.

Index: automake.in
--- automake.in Sun, 25 Mar 2001 16:15:19 +0200 akim (am/f/39_automake.i 1.209 
755)
+++ automake.in Sun, 25 Mar 2001 16:48:56 +0200 akim (am/f/39_automake.i 1.209 
755)
@@ -747,7 +747,7 @@ sub initialize_per_input ()
                   'flags' => 'CFLAGS',
                   'compile' => '$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)',
                   'compiler' => 'COMPILE',
-                  'output-arg' => '-c',
+                  'output_arg' => '-c',
                   'extensions' => ['c'],
                   '_finish' => \&lang_c_finish);
 register_language ('name' => 'cxx',
@@ -756,7 +756,7 @@ sub initialize_per_input ()
                   'flags' => 'CXXFLAGS',
                    'compile' => '$(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)',
                   'compiler' => 'CXXCOMPILE',
-                  'output-arg' => '-c -o $@',
+                  'output_arg' => '-c -o $@',
                   'pure' => 'yes',
                   'extensions' => ['c++', 'cc', 'cpp', 'cxx', 'C'],
                   '_finish' => \&lang_cxx_finish);
@@ -766,7 +766,7 @@ sub initialize_per_input ()
                   'flags' => 'OBJCFLAGS',
                   'compile' => '$(OBJC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)',
                   'compiler' => 'OBJCCOMPILE',
-                  'output-arg' => '-c -o $@',
+                  'output_arg' => '-c -o $@',
                   'pure' => 'yes',
                   'extensions' => ['m'],
                   '_finish' => \&lang_objc_finish);
@@ -801,7 +801,7 @@ sub initialize_per_input ()
                   'compile' => '$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)',
                   # FIXME: a different compiler?
                   'compiler' => 'COMPILE',
-                  'output-arg' => '-c',
+                  'output_arg' => '-c',
                   'extensions' => ['s', 'S'],
                   # We need the C code for assembly.
                   '_finish' => \&lang_c_finish);
@@ -811,7 +811,7 @@ sub initialize_per_input ()
                   'flags' => 'FFLAGS',
                   'compile' => '$(F77) $(AM_FFLAGS) $(FFLAGS)',
                   'compiler' => 'F77COMPILE',
-                  'output-arg' => '-c -o $@',
+                  'output_arg' => '-c -o $@',
                   'pure' => 'yes',
                   'extensions' => ['f', 'for', 'f90'],
                   '_finish' => \&lang_f77_finish);
@@ -820,7 +820,7 @@ sub initialize_per_input ()
                   'flags' => 'FFLAGS',
                   'compile' => '$(F77) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)',
                   'compiler' => 'PPF77COMPILE',
-                  'output-arg' => '-c -o $@',
+                  'output_arg' => '-c -o $@',
                   'pure' => 'yes',
                   'extensions' => ['F'],
                    '_finish' => \&lang_ppf77_finish);
@@ -830,7 +830,7 @@ sub initialize_per_input ()
                   # FIXME also FFLAGS.
                   'compile' => '$(F77) $(AM_FFLAGS) $(FFLAGS) $(AM_RFLAGS) 
$(RFLAGS)',
                   'compiler' => 'RCOMPILE',
-                  'output-arg' => '-c -o $@',
+                  'output_arg' => '-c -o $@',
                   'pure' => 'yes',
                   'extensions' => ['r'],
                   '_finish' => \&lang_ratfor_finish);
@@ -841,7 +841,7 @@ sub initialize_per_input ()
                   'flags' => 'GCJFLAGS',
                   'compile' => '$(GCJ) $(DEFS) $(INCLUDES) $(AM_GCJFLAGS) 
$(GCJFLAGS)',
                   'compiler' => 'GCJCOMPILE',
-                  'output-arg' => '-c -o $@',
+                  'output_arg' => '-c -o $@',
                   'pure' => 'yes',
                   'extensions' => ['java', 'class', 'zip', 'jar'],
                   '_finish' => \&lang_java_finish);
@@ -5227,19 +5227,24 @@ sub saw_sources_p
 sub register_language ($%)
 {
     my (%option) = @_;
-    my $lang = new Language;

     # Set the defaults.
-    $lang->ansi (0);
-    $lang->autodep ('no');
-    $lang->derived_autodep ('no');
-    $lang->linker ('');
+    $option{'ansi'} = 0
+      unless defined $option{'ansi'};
+    $option{'autodep'} = 'no'
+      unless defined $option{'autodep'};
+    $option{'derived_autodep'} = 'no'
+      unless defined $option{'derived_autodep'};
+    $option{'linker'} = ''
+      unless defined $option{'linker'};

     # `pure' is `yes' or `no'.  A `pure' language is one where, if all
     # the files in a directory are of that language, then we do not
     # require the C compiler or any code to call it.
-    $lang->pure ('no');
+    $option{'pure'} = 'no'
+      unless defined $option{'pure'};

+    my $lang = new Language;
     while (my ($attr, $value) = each %option)
     {
       if ($attr eq 'ansi')
@@ -5284,7 +5289,7 @@ sub register_language ($%)
        {
          $lang->name ($value);
        }
-      elsif ($attr eq 'output-arg')
+      elsif ($attr eq 'output_arg')
        {
          $lang->output_arg ($value);
        }