[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Patch: FYI: CCAS
From: |
Tom Tromey |
Subject: |
Patch: FYI: CCAS |
Date: |
21 Jan 2002 17:27:48 -0700 |
I'm checking this in.
Now we use CCAS and CCASFLAGS.
I preferred these names over "AMAS", because then we'd have the
strange "AM_AMASFLAGS".
Tom
Index: ChangeLog
from Tom Tromey <address@hidden>
* automake.texi (Macros): Updated for new variable names.
(Program and Library Variables): Likewise.
(Assembly Support): Likewise.
* m4/as.m4: Use CCAS and CCASFLAGS.
* automake.in (asm): Use CCAS and CCASFLAGS.
Index: NEWS
===================================================================
RCS file: /cvs/automake/automake/NEWS,v
retrieving revision 1.166
diff -u -r1.166 NEWS
--- NEWS 2002/01/09 08:52:03 1.166
+++ NEWS 2002/01/22 00:10:13
@@ -24,6 +24,8 @@
You can now use `AC_INIT(package,version) AM_INIT_AUTOMAKE' instead.
It is also possible to pass a list of global Automake options as
first argument to this new form of AM_INIT_AUTOMAKE.
+* Compiler-based assembler is now called `CCAS'; people expected `AS'
+ to be a real assembler.
New in 1.5:
* Support for `configure.ac'.
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1272
diff -u -r1.1272 automake.in
--- automake.in 2002/01/21 13:55:28 1.1272
+++ automake.in 2002/01/22 00:10:17
@@ -891,13 +891,13 @@
# Assembler.
register_language ('name' => 'asm',
'Name' => 'Assembler',
- 'config_vars' => ['AS', 'ASFLAGS'],
+ 'config_vars' => ['CCAS', 'CCASFLAGS'],
- 'flags' => 'ASFLAGS',
+ 'flags' => 'CCASFLAGS',
# Users can set AM_ASFLAGS to includes DEFS, INCLUDES,
# or anything else required. They can also set AS.
- 'compile' => '$(AS) $(AM_ASFLAGS) $(ASFLAGS)',
- 'compiler' => 'ASCOMPILE',
+ 'compile' => '$(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)',
+ 'compiler' => 'CCASCOMPILE',
'compile_flag' => '-c',
'extensions' => ['.s', '.S'],
Index: automake.texi
===================================================================
RCS file: /cvs/automake/automake/automake.texi,v
retrieving revision 1.260
diff -u -r1.260 automake.texi
--- automake.texi 2002/01/20 21:30:20 1.260
+++ automake.texi 2002/01/22 00:10:22
@@ -1415,8 +1415,8 @@
@item AM_PROG_AS
Use this macro when you have assembly code in your project. This will
-choose the assembler for you (by default the C compiler), and will set
address@hidden if required.
+choose the assembler for you (by default the C compiler) and set
address@hidden, and will also set @code{CCASFLAGS} if required.
@item AM_PROG_CC_C_O
This is like @code{AC_PROG_CC_C_O}, but it generates its results in the
@@ -2129,7 +2129,7 @@
programs, and it will potentially be compiled with different flags for
each program. This works for any language directly supported by
Automake. The flags are @samp{_CFLAGS}, @samp{_CXXFLAGS},
address@hidden, @samp{_YFLAGS}, @samp{_ASFLAGS}, @samp{_FFLAGS},
address@hidden, @samp{_YFLAGS}, @samp{_CCASFLAGS}, @samp{_FFLAGS},
@samp{_RFLAGS}, and @samp{_GCJFLAGS}.
When using a per-program compilation flag, Automake will choose a
@@ -2402,17 +2402,17 @@
Automake includes some support for assembly code.
-The variable @code{AS} holds the name of the compiler used to build
+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 AS
address@hidden ASFLAGS
address@hidden is passed to the compilation.
address@hidden CCAS
address@hidden CCASFLAGS
-You are required to set @code{AS} and @code{ASFLAGS} via
+You are required to set @code{CCAS} and @code{CCASFLAGS} via
@file{configure.in}. The autoconf macro @code{AM_PROG_AS} will do this
-for you. Unless they are already set, it simply sets @code{AS} to the C
-compiler and @code{ASFLAGS} to the C compiler flags.
+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
@code{automake} as being files containing assembly code.
Index: stamp-vti
===================================================================
RCS file: /cvs/automake/automake/stamp-vti,v
retrieving revision 1.158
diff -u -r1.158 stamp-vti
--- stamp-vti 2002/01/20 21:30:20 1.158
+++ stamp-vti 2002/01/22 00:10:22
@@ -1,4 +1,4 @@
address@hidden UPDATED 20 January 2002
address@hidden UPDATED 21 January 2002
@set UPDATED-MONTH January 2002
@set EDITION 1.5c
@set VERSION 1.5c
Index: version.texi
===================================================================
RCS file: /cvs/automake/automake/version.texi,v
retrieving revision 1.231
diff -u -r1.231 version.texi
--- version.texi 2002/01/20 21:30:20 1.231
+++ version.texi 2002/01/22 00:10:22
@@ -1,4 +1,4 @@
address@hidden UPDATED 20 January 2002
address@hidden UPDATED 21 January 2002
@set UPDATED-MONTH January 2002
@set EDITION 1.5c
@set VERSION 1.5c
Index: m4/as.m4
===================================================================
RCS file: /cvs/automake/automake/m4/as.m4,v
retrieving revision 1.3
diff -u -r1.3 as.m4
--- m4/as.m4 2001/10/21 18:05:37 1.3
+++ m4/as.m4 2002/01/22 00:10:22
@@ -24,8 +24,8 @@
AC_DEFUN([AM_PROG_AS],
[# By default we simply use the C compiler to build assembly code.
AC_REQUIRE([AC_PROG_CC])
-: ${AS='$(CC)'}
+: ${CCAS='$(CC)'}
# Set ASFLAGS if not already set.
-: ${ASFLAGS='$(CFLAGS)'}
-AC_SUBST(AS)
-AC_SUBST(ASFLAGS)])
+: ${CCASFLAGS='$(CFLAGS)'}
+AC_SUBST(CCAS)
+AC_SUBST(CCASFLAGS)])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Patch: FYI: CCAS,
Tom Tromey <=