* 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.

diff --git a/ChangeLog b/ChangeLog
index 91a1484104ab8374bccbf0f42dfae7fb9c763820..fd39067196df0d5c106b4d449597e5b3b5dc7381 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-21  Tom Tromey  <tromey@redhat.com>
+
+       * 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.
+
 2002-01-21  Akim Demaille  <akim@epita.fr>
 
        * automake.in (&parse_arguments): Use a more GNUish error message

diff --git a/NEWS b/NEWS
index 90cf05e1d1f22406f1a7b276c69e95a490989fea..72117832892e497a6fe4cacc3baee326468d19f1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,8 @@ New in 1.5c:
   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.
 \f
 New in 1.5:
 * Support for `configure.ac'.

diff --git a/automake.in b/automake.in
index 01c220fd31641ea7105b159295653a56c1b2cc78..7a313e3894b72486771309a658cc9e50e9f2e9ea 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -891,13 +891,13 @@ register_language ('name' => 'lexxx',
 # 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'],
 

diff --git a/automake.texi b/automake.texi
index 42de6731d6eaf754be38c74b267c8448181908c4..6e5c8e9eb6517c792855c429cd5c9b89c0c4ad85 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -1415,8 +1415,8 @@ variable @code{lispdir} to the full path to Emacs' site-lisp directory.
 
 @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
-@code{ASFLAGS} if required.
+choose the assembler for you (by default the C compiler) and set
+@code{CCAS}, 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 @@ per-library) basis.  A single source file can be included in several
 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},
-@samp{_OBJCFLAGS}, @samp{_YFLAGS}, @samp{_ASFLAGS}, @samp{_FFLAGS},
+@samp{_OBJCFLAGS}, @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 @@ The command used to actually link a C++ program.
 
 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
-@code{ASFLAGS} is passed to the compilation.
-@vindex AS
-@vindex ASFLAGS
+@code{CCASFLAGS} is passed to the compilation.
+@vindex CCAS
+@vindex 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.

diff --git a/m4/as.m4 b/m4/as.m4
index 431b15e0633c586f7b6ae087534b781806544fe0..ad456c9231fed9be887f05e7e0ac1d15c69a447e 100644 (file)
--- a/m4/as.m4
+++ b/m4/as.m4
@@ -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)])

diff --git a/stamp-vti b/stamp-vti
index c434cb561f4e057b2a6779e280214e29b1c922fd..364cf34bf9b2d27f97e88fd90ac3bc6a36cf44e2 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 20 January 2002
+@set UPDATED 21 January 2002
 @set UPDATED-MONTH January 2002
 @set EDITION 1.5c
 @set VERSION 1.5c

diff --git a/version.texi b/version.texi
index c434cb561f4e057b2a6779e280214e29b1c922fd..364cf34bf9b2d27f97e88fd90ac3bc6a36cf44e2 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 20 January 2002
+@set UPDATED 21 January 2002
 @set UPDATED-MONTH January 2002
 @set EDITION 1.5c
 @set VERSION 1.5c