From: Alexandre Duret-Lutz Date: Sun, 10 Oct 2004 15:52:02 +0000 (+0000) Subject: * m4/as.m4 (AM_PROG_AS): Check dependency tracking mode for CCAS. X-Git-Tag: v1.10.2~456 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e1923fe4f8d29216ecfdf4b4e7db0239d4c3715;p=platform%2Fupstream%2Fautomake.git * 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. --- diff --git a/ChangeLog b/ChangeLog index dd396a0..065d617 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-10-10 Martin Waitz (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. + 2004-10-10 Ralf Corsepius * automake.in (Languages): Split .s (asm) and .S (cppasm) into diff --git a/NEWS b/NEWS index 385122b..c80ecb5 100644 --- a/NEWS +++ b/NEWS @@ -10,9 +10,9 @@ New in 1.9a: 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: diff --git a/THANKS b/THANKS index 8f2a2cb..8e30d57 100644 --- a/THANKS +++ b/THANKS @@ -150,6 +150,7 @@ Mark Phillips msp@nortelnetworks.com Markku Rossi mtr@ngs.fi Markus F.X.J. Oberhumer k3040e4@wildsau.idv-edu.uni-linz.ac.at Martin Frydl martin@idoox.com +Martin Waitz tali@admingilde.org Mathias Doreille doreille@smr.ch Matt Leach mleach@cygnus.com Matthew D. Langston langston@SLAC.Stanford.EDU diff --git a/automake.in b/automake.in index d10118a..3cd0acc 100755 --- a/automake.in +++ b/automake.in @@ -816,7 +816,8 @@ register_language ('name' => 'cppasm', '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)', diff --git a/doc/automake.texi b/doc/automake.texi index 3390f08..4aeeaa1 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -3897,21 +3897,25 @@ The command used to actually link a C++ program. @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 -@code{CCASFLAGS} is passed to the compilation. +@code{CCASFLAGS} (and @code{CPPFLAGS} for preprocessed files) is passed +to the compilation. @vindex CCAS @vindex CCASFLAGS +@vindex 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. diff --git a/doc/stamp-vti b/doc/stamp-vti index bfef3c6..4e1bae8 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 25 September 2004 -@set UPDATED-MONTH September 2004 +@set UPDATED 10 October 2004 +@set UPDATED-MONTH October 2004 @set EDITION 1.9a @set VERSION 1.9a diff --git a/doc/version.texi b/doc/version.texi index bfef3c6..4e1bae8 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 25 September 2004 -@set UPDATED-MONTH September 2004 +@set UPDATED 10 October 2004 +@set UPDATED-MONTH October 2004 @set EDITION 1.9a @set VERSION 1.9a diff --git a/m4/as.m4 b/m4/as.m4 index 8c043fc..ac66df1 100644 --- a/m4/as.m4 +++ b/m4/as.m4 @@ -28,4 +28,5 @@ test "${CCAS+set}" = set || CCAS=$CC 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]) ])