From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 14 Oct 2006 17:33:27 +0000 (+0000)
Subject: * automake.in: For preprocessed assembler, add `$(DEFS)
X-Git-Tag: Release-1-10~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f74ae32b93806bb91f4af727c455cb2315e35f29;p=thirdparty%2Fautomake.git

* automake.in: For preprocessed assembler, add `$(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES)' to the compile rule.
* doc/automake.texi (Assembly Support): Update.
* NEWS: Update.
Suggested by Thomas Schwinge and Ralf Corsepius.
---

diff --git a/ChangeLog b/ChangeLog
index 1ebbe98be..823dc14d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-10-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	* automake.in: For preprocessed assembler, add `$(DEFS)
+	$(DEFAULT_INCLUDES) $(INCLUDES)' to the compile rule.
+	* doc/automake.texi (Assembly Support): Update.
+	* NEWS: Update.
+	Suggested by Thomas Schwinge and Ralf Corsepius.
+
 	For PR automake/492.
 	* automake.in (output_flag): Set to `-o' for Assembler and
 	preprocessed Assembler, assuming that all understand `-c -o'.
diff --git a/NEWS b/NEWS
index 95a15ddd5..c5cb48431 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ New in 1.9c:
   - subdir-object mode works now with Assembler.  Automake assumes
     that the compiler understands `-c -o'.
 
+  - Preprocessed assembler (*.S) compilation now also honors
+    $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES).
+
 * Miscellaneous changes:
 
   - The script `install-sh' needs to have executable permissions for
diff --git a/automake.in b/automake.in
index f7a0a563e..090edf66b 100755
--- a/automake.in
+++ b/automake.in
@@ -837,6 +837,7 @@ register_language ('name' => 'asm',
 		   'flags' => ['CCASFLAGS'],
 		   # Users can set AM_CCASFLAGS to include DEFS, INCLUDES,
 		   # or anything else required.  They can also set CCAS.
+		   # Or simply use Preprocessed Assembler.
 		   'compile' => '$(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)',
 		   'compiler' => 'CCASCOMPILE',
 		   'compile_flag' => '-c',
@@ -853,10 +854,7 @@ register_language ('name' => 'cppasm',
 
 		   'autodep' => 'CCAS',
 		   'flags' => ['CCASFLAGS', 'CPPFLAGS'],
-		   # Users can set AM_CCASFLAGS to include DEFS, INCLUDES,
-		   # or anything else required beyond AM_CPPFLAGS.  They
-		   # can also set CCAS.
-		   'compile' => '$(CCAS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS)',
+		   'compile' => '$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS)',
 		   'compiler' => 'CPPASCOMPILE',
 		   'compile_flag' => '-c',
 		   'output_flag' => '-o',
diff --git a/doc/automake.texi b/doc/automake.texi
index 06012249d..d68507776 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -6152,7 +6152,8 @@ assembly code.  This compiler must work a bit like a C compiler; in
 particular it must accept @option{-c} and @option{-o}.  The values of
 @code{CCASFLAGS} and @code{AM_CCASFLAGS} (or its per-target
 definition) is passed to the compilation.  For preprocessed files,
-@code{CPPFLAGS} and @code{AM_CPPFLAGS} are also used.
+@code{DEFS}, @code{DEFAULT_INCLUDES}, @code{INCLUDES}, @code{CPPFLAGS}
+and @code{AM_CPPFLAGS} are also used.
 
 The autoconf macro @code{AM_PROG_AS} will define @code{CCAS} and
 @code{CCASFLAGS} for you (unless they are already set, it simply sets