Automake::Language: drop unused fields 'compile_flag' and 'output_flag'

They are unused after the recent flurry of changes.  This is just a
simplification; no semantic change is intended.

* lib/Automake/Language.pm (Class::Struct): Remove unused fields here.
* bin/automake.in: And here, in all the 'register_language()' invocations.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/bin/automake.in b/bin/automake.in
index 23fb215c4dc5f7425c2ac0e3d6de017452b30a01..c87acba7222aee177667a499f632862eb8305275 100644 (file)
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -614,7 +614,6 @@ register_language ('name' => 'c',
                   'ld' => '$(CC)',
                   'linker' => 'LINK',
                   'link' => '$(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@',
-                  'compile_flag' => '-c',
                   'libtool_tag' => 'CC',
                   'extensions' => ['.c']);
 
@@ -629,8 +628,6 @@ register_language ('name' => 'cxx',
                   'compile' => "\$(CXX) @cpplike_flags \$(AM_CXXFLAGS) \$(CXXFLAGS)",
                   'ccer' => 'CXX',
                   'compiler' => 'CXXCOMPILE',
-                  'compile_flag' => '-c',
-                  'output_flag' => '-o',
                   'libtool_tag' => 'CXX',
                   'lder' => 'CXXLD',
                   'ld' => '$(CXX)',
@@ -648,8 +645,6 @@ register_language ('name' => 'objc',
                   'compile' => "\$(OBJC) @cpplike_flags \$(AM_OBJCFLAGS) \$(OBJCFLAGS)",
                   'ccer' => 'OBJC',
                   'compiler' => 'OBJCCOMPILE',
-                  'compile_flag' => '-c',
-                  'output_flag' => '-o',
                   'lder' => 'OBJCLD',
                   'ld' => '$(OBJC)',
                   'pure' => 1,
@@ -666,8 +661,6 @@ register_language ('name' => 'objcxx',
                   'compile' => "\$(OBJCXX) @cpplike_flags \$(AM_OBJCXXFLAGS) \$(OBJCXXFLAGS)",
                   'ccer' => 'OBJCXX',
                   'compiler' => 'OBJCXXCOMPILE',
-                  'compile_flag' => '-c',
-                  'output_flag' => '-o',
                   'lder' => 'OBJCXXLD',
                   'ld' => '$(OBJCXX)',
                   'pure' => 1,
@@ -684,8 +677,6 @@ register_language ('name' => 'upc',
                   'compile' => "\$(UPC) @cpplike_flags \$(AM_UPCFLAGS) \$(UPCFLAGS)",
                   'ccer' => 'UPC',
                   'compiler' => 'UPCCOMPILE',
-                  'compile_flag' => '-c',
-                  'output_flag' => '-o',
                   'lder' => 'UPCLD',
                   'ld' => '$(UPC)',
                   'pure' => 1,
@@ -790,8 +781,6 @@ register_language ('name' => 'asm',
                   'compile' => '$(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)',
                   'ccer' => 'CCAS',
                   'compiler' => 'CCASCOMPILE',
-                  'compile_flag' => '-c',
-                  'output_flag' => '-o',
                   'extensions' => ['.s']);
 
 # Preprocessed Assembler.
@@ -804,8 +793,6 @@ register_language ('name' => 'cppasm',
                   'compile' => "\$(CCAS) @cpplike_flags \$(AM_CCASFLAGS) \$(CCASFLAGS)",
                   'ccer' => 'CPPAS',
                   'compiler' => 'CPPASCOMPILE',
-                  'compile_flag' => '-c',
-                  'output_flag' => '-o',
                   'extensions' => ['.S', '.sx']);
 
 # Fortran 77
@@ -818,8 +805,6 @@ register_language ('name' => 'f77',
                   'compile' => '$(F77) $(AM_FFLAGS) $(FFLAGS)',
                   'ccer' => 'F77',
                   'compiler' => 'F77COMPILE',
-                  'compile_flag' => '-c',
-                  'output_flag' => '-o',
                   'libtool_tag' => 'F77',
                   'lder' => 'F77LD',
                   'ld' => '$(F77)',
@@ -836,8 +821,6 @@ register_language ('name' => 'fc',
                   'compile' => '$(FC) $(AM_FCFLAGS) $(FCFLAGS)',
                   'ccer' => 'FC',
                   'compiler' => 'FCCOMPILE',
-                  'compile_flag' => '-c',
-                  'output_flag' => '-o',
                   'libtool_tag' => 'FC',
                   'lder' => 'FCLD',
                   'ld' => '$(FC)',
@@ -856,8 +839,6 @@ register_language ('name' => 'ppfc',
                   'ccer' => 'PPFC',
                   'compiler' => 'PPFCCOMPILE',
                   'compile' => "\$(FC) @cpplike_flags \$(AM_FCFLAGS) \$(FCFLAGS)",
-                  'compile_flag' => '-c',
-                  'output_flag' => '-o',
                   'libtool_tag' => 'FC',
                   'pure' => 1,
                   'extensions' => ['.F90','.F95', '.F03', '.F08']);
@@ -888,8 +869,6 @@ register_language ('name' => 'ppf77',
                   'ccer' => 'PPF77',
                   'compiler' => 'PPF77COMPILE',
                   'compile' => "\$(F77) @cpplike_flags \$(AM_FFLAGS) \$(FFLAGS)",
-                  'compile_flag' => '-c',
-                  'output_flag' => '-o',
                   'libtool_tag' => 'F77',
                   'pure' => 1,
                   'extensions' => ['.F']);
@@ -907,8 +886,6 @@ register_language ('name' => 'ratfor',
                   'compile' => '$(F77) $(AM_FFLAGS) $(FFLAGS) $(AM_RFLAGS) $(RFLAGS)',
                   'ccer' => 'F77',
                   'compiler' => 'RCOMPILE',
-                  'compile_flag' => '-c',
-                  'output_flag' => '-o',
                   'libtool_tag' => 'F77',
                   'pure' => 1,
                   'extensions' => ['.r']);
@@ -924,8 +901,6 @@ register_language ('name' => 'java',
                   'compile' => '$(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS)',
                   'ccer' => 'GCJ',
                   'compiler' => 'GCJCOMPILE',
-                  'compile_flag' => '-c',
-                  'output_flag' => '-o',
                   'libtool_tag' => 'GCJ',
                   'lder' => 'GCJLD',
                   'ld' => '$(GCJ)',

diff --git a/lib/Automake/Language.pm b/lib/Automake/Language.pm
index a678e1e4d558c3c46595af8312d62027577732e4..68fbccf5d8806ce02c34dcb7a7d86623d2d56e84 100644 (file)
--- a/lib/Automake/Language.pm
+++ b/lib/Automake/Language.pm
@@ -39,8 +39,6 @@ Class::Struct::struct (
        'compiler'  => "\$",
        # Content of the compiling variable.
        'compile'  => "\$",
-       # Flag to require compilation without linking (-c).
-       'compile_flag' => "\$",
        'extensions' => '@',
        # A subroutine to compute a list of possible extensions of
        # the product given the input extensions.
@@ -70,8 +68,6 @@ Class::Struct::struct (
        # Content of the linker variable ($(CC)).
        'ld' => "\$",
 
-       # Flag to specify the output file (-o).
-       'output_flag' => "\$",
        '_finish' => "\$",
 
        # This is a subroutine which is called whenever we finally