From: Tom Tromey Date: Tue, 22 Jan 2002 00:11:27 +0000 (+0000) Subject: * automake.texi (Macros): Updated for new variable names. X-Git-Tag: Release-1-5d~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a419742cd565a4c42f200de2d9e62dbed4decba9;p=thirdparty%2Fautomake.git * 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 91a148410..fd3906719 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2002-01-21 Tom Tromey + + * 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 * automake.in (&parse_arguments): Use a more GNUish error message diff --git a/NEWS b/NEWS index 90cf05e1d..721178328 100644 --- 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. New in 1.5: * Support for `configure.ac'. diff --git a/automake.in b/automake.in index 01c220fd3..7a313e389 100755 --- 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 42de6731d..6e5c8e9eb 100644 --- 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 431b15e06..ad456c923 100644 --- 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 c434cb561..364cf34bf 100644 --- 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 c434cb561..364cf34bf 100644 --- 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