From 08810c8aba0635190b8d6d230fec651c5b44698b Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sun, 21 Dec 2008 22:26:14 +0100 Subject: [PATCH] Do not use 'global' for makefile-wide settings. * doc/automake.texi (Linking, Libtool Flags) (Program and Library Variables, Flag Variables Ordering): Reword instances of `global variables' that really mean makefile-wide ones. * THANKS: Update. Report by Andreas Bergmeier. Signed-off-by: Ralf Wildenhues --- ChangeLog | 8 ++++++++ THANKS | 1 + doc/automake.texi | 19 +++++++++---------- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 94b447635..b425a42b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2008-12-21 Ralf Wildenhues + Do not use 'global' for makefile-wide settings. + * doc/automake.texi (Linking, Libtool Flags) + (Program and Library Variables, Flag Variables Ordering): + Reword instances of `global variables' that really mean + makefile-wide ones. + * THANKS: Update. + Report by Andreas Bergmeier. + Fix config.status depfiles failure. * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Commands are again a single shell brace group, so they are correctly skipped diff --git a/THANKS b/THANKS index f617d1f3e..700f13bbb 100644 --- a/THANKS +++ b/THANKS @@ -15,6 +15,7 @@ Alexander Turbov zaufi@sendmail.ru Alexandre Duret-Lutz duret_g@epita.fr Alexey Mahotkin alexm@hsys.msk.ru Alfred M. Szmidt ams@gnu.org +Andreas Bergmeier lcid-fire@gmx.net Andreas Buening andreas.buening@nexgo.de Andreas Köhler andi5.py@gmx.net Andreas Schwab schwab@suse.de diff --git a/doc/automake.texi b/doc/automake.texi index 760e1eeb7..3a1d1acd8 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -4580,9 +4580,8 @@ Sometimes, multiple programs are built in one directory but do not share the same link-time requirements. In this case, you can use the @code{@var{prog}_LDADD} variable (where @var{prog} is the name of the program as it appears in some @code{_PROGRAMS} variable, and usually -written in lowercase) to override the global @code{LDADD}. If this -variable exists for a given program, then that program is not linked -using @code{LDADD}. +written in lowercase) to override @code{LDADD}. If this variable exists +for a given program, then that program is not linked using @code{LDADD}. @vindex maude_LDADD For instance, in GNU cpio, @code{pax}, @code{cpio} and @code{mt} are @@ -5250,8 +5249,8 @@ Libtool Manual} for more options) should appear before the mode selection on the command line; in @file{Makefile.am}s they should be listed in the @samp{@var{library}_LIBTOOLFLAGS} variable. -If @samp{@var{library}_LIBTOOLFLAGS} is not defined, the global -@code{AM_LIBTOOLFLAGS} variable is used instead. +If @samp{@var{library}_LIBTOOLFLAGS} is not defined, then the variable +@code{AM_LIBTOOLFLAGS} is used instead. These flags are passed to libtool after the @option{--tag=@var{TAG}} option computed by Automake (if any), so @@ -5489,11 +5488,11 @@ of any library built by your package. Doing so will ensure that @item maude_LDFLAGS This variable is used to pass extra flags to the link step of a program -or a shared library. It overrides the global @code{AM_LDFLAGS} variable. +or a shared library. It overrides the @code{AM_LDFLAGS} variable. @item maude_LIBTOOLFLAGS This variable is used to pass extra options to @command{libtool}. -It overrides the global @code{AM_LIBTOOLFLAGS} variable. +It overrides the @code{AM_LIBTOOLFLAGS} variable. These options are output before @command{libtool}'s @option{--mode=@var{MODE}} option, so they should not be mode-specific options (those belong to the compiler or linker flags). @xref{Libtool Flags}. @@ -10567,10 +10566,10 @@ user counterpart. @code{ARFLAGS} (@pxref{A Library}) is usually defined by Automake and has neither @code{AM_} nor per-target cousin. -Finally you should not think either that the existence of a per-target -variable implies that of an @code{AM_} variable or that of a user +Finally you should not think that the existence of a per-target +variable implies the existance of an @code{AM_} variable or of a user variable. For instance, the @code{mumble_LDADD} per-target variable -overrides the global @code{LDADD} variable (which is not a user +overrides the makefile-wide @code{LDADD} variable (which is not a user variable), and @code{mumble_LIBADD} exists only as a per-target variable. @xref{Program and Library Variables}. -- 2.11.4.GIT