From: Akim Demaille <akim@epita.fr>
Date: Tue, 8 May 2001 09:46:12 +0000 (+0000)
Subject: * automake.in (&handle_languages): Don't transform %COMPILER%.
X-Git-Tag: Release-1-4f~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c642c37d41c4fe1bd39dbc40ead2e40cfca5857;p=thirdparty%2Fautomake.git

* 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 8de73cc13..f3331bdac 100644
--- 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 8eb9f0fab..78ef5fa17 100755
--- 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 329939f29..d8f707768 100644
--- 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%