* automake.in (&handle_languages): Don't transform %COMPILER%.

Use `$lang->compiler' instead of `$pfx' to transform generic
%COMPILE% and %LTCOMPILE%.
* ext-compile.am: Use %COMPILE%, %LTCOMPILE% and %SOURCE% instead
of %COMPILER% and $<.

diff --git a/ChangeLog b/ChangeLog
index 8de73cc135918c6b39e8d8a710e4973aa3d707d3..f3331bdac1f559abc2025b3d47ff5c4609e863f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-05-08  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (&handle_languages): Don't transform %COMPILER%.
+       Use `$lang->compiler' instead of `$pfx' to transform generic
+       %COMPILE% and %LTCOMPILE%.
+       * ext-compile.am: Use %COMPILE%, %LTCOMPILE% and %SOURCE% instead
+       of %COMPILER% and $<.
+
 2001-05-07  Akim Demaille  <akim@epita.fr>
 
        * automake.in (&handle_languages): Use the same `%transform' for

diff --git a/automake.in b/automake.in
index 8eb9f0fab5991ebe12a4feb4f4ca009c9b86aa0a..78ef5fa1769e357b04834a6070d8f10baceadf95 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1412,9 +1412,8 @@ sub handle_languages
                           'LTOBJ'     => '$@',
                           'OBJOBJ'    => '$@',
 
-                          'COMPILER' => $lang->compiler,
-                          'COMPILE'   => '$(' . $pfx . 'COMPILE)',
-                          'LTCOMPILE' => '$(LT' . $pfx . 'COMPILE)',
+                          'COMPILE'   => '$(' . $lang->compiler . ')',
+                          'LTCOMPILE' => '$(LT' . $lang->compiler . ')',
                           'OUTARG'   => $outarg,
                           'LTOUTARG' => $ltoutarg);
 

diff --git a/ext-compile.am b/ext-compile.am
index 329939f29f90342d8e693f4e24e56f90b867481a..d8f7077680ad803c25b91818af1771b47d15b007 100644 (file)
--- a/ext-compile.am
+++ b/ext-compile.am
@@ -20,14 +20,14 @@
 ## LTOUTARG is set to `', or `-o $@'.
 
 .%EXT%.o:
-       $(%COMPILER%) %OUTARG% $<
+       %COMPILE% %OUTARG% %SOURCE%
 
 .%EXT%.obj:
 ## FIXME: Using cygpath should be somehow conditional.
-       $(%COMPILER%) %OUTARG% `cygpath -w $<`
+       %COMPILE% %OUTARG% `cygpath -w %SOURCE%`
 
 if %?LIBTOOL%
 .%EXT%.lo:
 ## We don't care if there are several `-o', libtool handles it gracefully.
-       $(LT%COMPILER%) %OUTARG% %LTOUTARG% $<
+       %LTCOMPILE% %OUTARG% %LTOUTARG% %SOURCE%
 endif %?LIBTOOL%