* 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 1ebbe98be243173c3948534c7f1f047b2c32fedf..823dc14d60c0b05ffad35589e211851530b2cfec 100644 (file)
--- 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 95a15ddd584cac1d7abded5f14b3cab37d987316..c5cb484319c1b04504150592a151cfdce3ac3b40 100644 (file)
--- 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 f7a0a563e7eb17411d2e048226a260d40a678158..090edf66bf614405b1a364abd77e633967015e95 100755 (executable)
--- 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 06012249d8343fd019aae0996924a94934a28c2e..d6850777650d6ff45a2db93e7515b1a49d2e2baa 100644 (file)
--- 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