[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Make compiling *.S CPPFLAGS aware
From: |
Alexandre Duret-Lutz |
Subject: |
Re: Make compiling *.S CPPFLAGS aware |
Date: |
Sun, 10 Oct 2004 17:51:38 +0200 |
User-agent: |
Gnus/5.1003 (Gnus v5.10.3) Emacs/21.3.50 (gnu/linux) |
| I'm checking this in.
| 2004-10-10 Ralf Corsepius <address@hidden>
|
| * automake.in (Languages): Split .s (asm) and .S (cppasm) into
| separate languages. Make cppasm (Preprocessed Assembler) aware
| of CPPFLAGS, AM_CPPFLAGS.
| (handle_languages): Fix typo.
| (lang_cppasm_rewrite): New function.
I'm checking this in too.
2004-10-10 Martin Waitz <address@hidden> (tiny change)
* m4/as.m4 (AM_PROG_AS): Check dependency tracking mode for CCAS.
* automake.in (cppasm): Use the dependency tracking more for CCAS.
* doc/automake.texi (Assembly Support): Note that *.S are
preprocessed with CPPFLAGS.
Index: NEWS
===================================================================
RCS file: /cvs/automake/automake/NEWS,v
retrieving revision 1.288
diff -u -r1.288 NEWS
--- NEWS 10 Oct 2004 15:35:09 -0000 1.288
+++ NEWS 10 Oct 2004 15:50:01 -0000
@@ -10,9 +10,9 @@
overwriting existing files if AM_MAINTAINER_MODE and maintainer-mode
is not enabled.
- - Preprocessed assembler (*.S) compilation now honnor CPPFLAGS,
- AM_CPPFLAGS and per-target _CPPFLAGS, unlike non-preprocessed
- assembler (*.s).
+ - Preprocessed assembler (*.S) compilation now honnors CPPFLAGS,
+ AM_CPPFLAGS and per-target _CPPFLAGS, and supports dependency
+ tracking, unlike non-preprocessed assembler (*.s).
New in 1.9:
Index: THANKS
===================================================================
RCS file: /cvs/automake/automake/THANKS,v
retrieving revision 1.257
diff -u -r1.257 THANKS
--- THANKS 28 Sep 2004 22:02:33 -0000 1.257
+++ THANKS 10 Oct 2004 15:50:01 -0000
@@ -150,6 +150,7 @@
Markku Rossi address@hidden
Markus F.X.J. Oberhumer address@hidden
Martin Frydl address@hidden
+Martin Waitz address@hidden
Mathias Doreille address@hidden
Matt Leach address@hidden
Matthew D. Langston address@hidden
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1585
diff -u -r1.1585 automake.in
--- automake.in 10 Oct 2004 15:35:09 -0000 1.1585
+++ automake.in 10 Oct 2004 15:50:05 -0000
@@ -816,7 +816,8 @@
'Name' => 'Preprocessed Assembler',
'config_vars' => ['CCAS', 'CCASFLAGS'],
- 'flags' => ['CCASFLAGS','CPPFLAGS'],
+ 'autodep' => 'CCAS',
+ 'flags' => ['CCASFLAGS', 'CPPFLAGS'],
# Users can set AM_ASFLAGS to include DEFS, INCLUDES,
# or anything else required. They can also set CCAS.
'compile' => '$(CCAS) $(AM_CPPFLAGS) $(CPPFLAGS)
$(AM_CCASFLAGS) $(CCASFLAGS)',
Index: doc/automake.texi
===================================================================
RCS file: /cvs/automake/automake/doc/automake.texi,v
retrieving revision 1.56
diff -u -r1.56 automake.texi
--- doc/automake.texi 25 Sep 2004 20:50:29 -0000 1.56
+++ doc/automake.texi 10 Oct 2004 15:50:12 -0000
@@ -3897,21 +3897,25 @@
@node Assembly Support
@section Assembly Support
-Automake includes some support for assembly code.
+Automake includes some support for assembly code. There are two forms
+of assembler files: normal (@file{*.s}) and preprocessed by @code{CPP}
+(@file{*.S}).
The variable @code{CCAS} holds the name of the compiler used to build
assembly code. This compiler must work a bit like a C compiler; in
particular it must accept @samp{-c} and @samp{-o}. The value of
address@hidden is passed to the compilation.
address@hidden (and @code{CPPFLAGS} for preprocessed files) is passed
+to the compilation.
@vindex CCAS
@vindex CCASFLAGS
address@hidden CPPFLAGS
You are required to set @code{CCAS} and @code{CCASFLAGS} via
@file{configure.ac}. The autoconf macro @code{AM_PROG_AS} will do this
for you. Unless they are already set, it simply sets @code{CCAS} to the
C compiler and @code{CCASFLAGS} to the C compiler flags.
-Only the suffixes @samp{.s} and @samp{.S} are recognized by
+Only the suffixes @file{.s} and @file{.S} are recognized by
@code{automake} as being files containing assembly code.
Index: m4/as.m4
===================================================================
RCS file: /cvs/automake/automake/m4/as.m4,v
retrieving revision 1.8
diff -u -r1.8 as.m4
--- m4/as.m4 11 Jan 2004 12:05:12 -0000 1.8
+++ m4/as.m4 10 Oct 2004 15:50:13 -0000
@@ -28,4 +28,5 @@
test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
AC_ARG_VAR([CCAS], [assembler compiler command (defaults to CC)])
AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)])
+_AM_DEPENDENCIES([CCAS])
])
--
Alexandre Duret-Lutz