From 447d4aa19e814a0586e96772c297f547099bda78 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 30 Apr 1999 10:45:28 +0000 Subject: [PATCH] * automake.in (finish_languages): Put `.' before extension in suffix list, `.obj' rule, and `.lo' rule. Look at `-flags', not `-flag'. From Pavel Roskin. --- ChangeLog | 6 ++++++ automake.in | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 671b13fa..ead0ac09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1999-04-30 Tom Tromey + + * automake.in (finish_languages): Put `.' before extension in + suffix list, `.obj' rule, and `.lo' rule. Look at `-flags', not + `-flag'. From Pavel Roskin. + 1999-04-28 Tom Tromey * automake.in (finish_languages): Fixed scoping of ltcompile and diff --git a/automake.in b/automake.in index 60cee9bf..a557ea14 100755 --- a/automake.in +++ b/automake.in @@ -1001,11 +1001,11 @@ sub finish_languages . $full . " \$<\n"); # FIXME: Using cygpath should be somehow conditional. - $output_rules .= ("$ext.obj:\n" + $output_rules .= (".$ext.obj:\n" . $full . " \`cygpath -w \$<\`\n") if $seen_objext; - $output_rules .= ("$ext.lo:\n" + $output_rules .= (".$ext.lo:\n" . "\t\$(LT" . $language_map{$lang . '-compiler-name'} . ") " @@ -1014,7 +1014,7 @@ sub finish_languages if $seen_libtool; } - push (@suffixes, $ext); + push (@suffixes, '.' . $ext); # The rest of the loop is done once per language. next if defined $done{$lang}; @@ -1028,9 +1028,9 @@ sub finish_languages $ltcompile, $comp); } # The compiler's flag must be a configure variable. - if (defined $language_map{$lang . '-flag'}) + if (defined $language_map{$lang . '-flags'}) { - &define_configure_variable ($language_map{$lang . '-flag'}); + &define_configure_variable ($language_map{$lang . '-flags'}); } # Compute the function name of the finisher and then call it. @@ -1047,7 +1047,7 @@ sub finish_languages if (! defined $done{'c'}) { - &define_configure_variable ($language_map{'c-flag'}); + &define_configure_variable ($language_map{'c-flags'}); &define_compiler_variable ($language_map{'c-compiler-name'}, $ltcompile, $language_map{'c-compile'}); -- 2.43.5