From 7907370466898f00ab90710acf2a68b63d1db695 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Tue, 8 May 2001 11:27:22 +0000 Subject: [PATCH] * automake.in (&define_compiler_variables): Use only $LANG as argument. (&handle_languages): Adjust. --- ChangeLog | 27 ++++++++++++++++----------- automake.in | 34 +++++++++++++++------------------- 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index 018b8ec5..81f49ad7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-05-08 Akim Demaille + + * automake.in (&define_compiler_variables): Use only $LANG as + argument. + (&handle_languages): Adjust. + 2001-05-08 Akim Demaille * automake.in (&define_program_variable): Remove. @@ -19,7 +25,6 @@ (variable_dump, variables_dump): Rename as... (macro_dump, macros_dump): these. - 2001-05-08 Akim Demaille Support `if !COND', `else COND', `end COND'. @@ -84,13 +89,13 @@ * automake.in (&handle_languages): Use the same `%transform' for both `depend2.am' and `ext-compile.am'. - Move the definition of `$flag' where it is used, and rename as - `$flags'. + Delay the definition of `$flag' so it is right before the first use, + and rename as `$flags'. 2001-05-07 Akim Demaille * automake.in (&handle_languages): Compute `$ltoutarg' and - `$outarg' independently from dependency code. + `$outarg' independently of dependency code. There is no use looping on a language's possible extensions since we loop over used extensions. Therefore, there is no use for a local `%transform'. @@ -113,7 +118,7 @@ 2001-05-07 Akim Demaille - * automake.in (&depend2): Remove, merged in... + * automake.in (&depend2): Remove, merged into... (&handle_languages): here. 2001-05-07 Akim Demaille @@ -127,14 +132,14 @@ 2001-05-06 Tom Tromey For PR automake/46: - * tests/Makefile.am (TESTS): Added subdir5.test. + * tests/Makefile.am (TESTS): Add subdir5.test. (XFAIL_TESTS): Likewise. * tests/subdir5.test: New file. * tests/subobj6.test (wish_SOURCES): Use $MAKE. * tests/subobj5.test (wish_SOURCES): Use $MAKE. - * automake.in (GNITS_VERSION_PATTERN): Document. Added `fork + * automake.in (GNITS_VERSION_PATTERN): Document. Add `fork identifier'. (handle_options): Handle fork identifier in version number. @@ -158,8 +163,8 @@ Fixes PR automake/154. For PR automake/160: - * tests/Makefile.am (TESTS): Added subobj5.test and subobj6.test. - (XFAIL_TESTS): Added subobj6.test. + * tests/Makefile.am (TESTS): Add subobj5.test and subobj6.test. + (XFAIL_TESTS): Add subobj6.test. * tests/subobj6.test: New file. * automake.texi (Uniform): Mention dist_, nodist_, and nobase_. @@ -170,7 +175,7 @@ * distdir.am (distdir): Make subdirectory for each file. Fixes test subobj5.test. - * tests/Makefile.am (TESTS): Added new file. + * tests/Makefile.am (TESTS): Add new file. (XFAIL_TESTS): Likewise. * tests/texinfo10.test: New file. @@ -608,7 +613,7 @@ The variables you define are owned by Automake. (&generate_makefile): PRE_INSTALL and co must not be defined *by the user*. - (&variable_defined): Now independent from the owner. + (&variable_defined): Now independent of the owner. (&variable_output, &variable_pretty_output): Adjust to %var_type. 2001-04-09 Akim Demaille diff --git a/automake.in b/automake.in index b7261a96..6bd9d51d 100755 --- a/automake.in +++ b/automake.in @@ -1482,17 +1482,12 @@ sub handle_languages # People linking Java code to Fortran code deserve pain. $needs_c ||= ! $lang->pure; - if ($lang->compile) - { - &define_compiler_variable ($lang->compiler, - $ltcompile, $lang->compile); - } + define_compiler_variable ($lang) + if ($lang->compile); # The compiler's flag must be a configure variable. - if (defined $lang->flags) - { - &define_configure_variable ($lang->flags); - } + define_configure_variable ($lang->flags) + if (defined $lang->flags); # Call the finisher. $lang->finish; @@ -1509,9 +1504,7 @@ sub handle_languages if (! defined $done{$languages{'c'}}) { &define_configure_variable ($languages{'c'}->flags); - &define_compiler_variable ($languages{'c'}->compiler, - $ltcompile, - $languages{'c'}->compile); + &define_compiler_variable ($languages{'c'}); } &define_variable ('CCLD', '$(CC)'); &define_variable ('LINK', @@ -5280,7 +5273,6 @@ sub libtool_compiler my ($ltcompile, $ltlink) = ('', ''); if ($seen_libtool) { - &define_configure_variable ("LIBTOOL"); $ltcompile = '$(LIBTOOL) --mode=compile '; $ltlink = '$(LIBTOOL) --mode=link '; } @@ -6391,15 +6383,19 @@ sub define_configure_variable &define_variable ($var, $value); } + +# define_compiler_variable ($LANG) +# -------------------------------- # Define a compiler variable. We also handle defining the `LT' # version of the command when using libtool. -sub define_compiler_variable +sub define_compiler_variable ($) { - my ($var, $ltcompile, $value) = @_; - my $name = $var; - &define_variable ($name, $value); - &define_variable ('LT' . $name, $ltcompile . $value) - if $seen_libtool; + my ($lang) = @_; + + my ($var, $value) = ($lang->compiler, $lang->compile); + &define_variable ($var, $value); + &define_variable ("LT$var", "$(LIBTOOL) --mode=compile $value") + if $seen_libtool; } ################################################################ -- 2.43.5