* automake.in (finish_languages): Put `.' before extension in

	suffix list, `.obj' rule, and `.lo' rule.  Look at `-flags', not
	`-flag'.  From Pavel Roskin.

diff --git a/ChangeLog b/ChangeLog
index 671b13fa212df86e6eed5ff2f68a0e9def244214..ead0ac0947508050b44ebe09844f9c32888adb9e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-04-30  Tom Tromey  <tromey@cygnus.com>
+
+       * 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  <tromey@cygnus.com>
 
        * automake.in (finish_languages): Fixed scoping of ltcompile and

diff --git a/automake.in b/automake.in
index 60cee9bf77745c084d87adcfa89ad771f389c24d..a557ea143f5212ef2fff9cb31d0b2a3328c8c4e4 100755 (executable)
--- 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'});