[Automake-commit] [SCM] GNU Automake branch, branch-1-10, updated. v1.10.2-16-g2a3fca6

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=2a3fca6f7c4b6f5a63ad6d60576d1ac73669f8ab

The branch, branch-1-10 has been updated
       via  2a3fca6f7c4b6f5a63ad6d60576d1ac73669f8ab (commit)
      from  f9a3dde93cbd6497966d45631ec1cf665b09e3a9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2a3fca6f7c4b6f5a63ad6d60576d1ac73669f8ab
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Dec 21 22:26:14 2008 +0100

    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 <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |    8 ++++++++
 THANKS            |    1 +
 doc/automake.texi |   19 +++++++++----------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 579f4d9..e9c89fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2008-12-21  Ralf Wildenhues  <address@hidden>
 
+       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 90f80cd..b2351ae 100644
--- a/THANKS
+++ b/THANKS
@@ -15,6 +15,7 @@ Alexander Turbov      address@hidden
 Alexandre Duret-Lutz   address@hidden
 Alexey Mahotkin                address@hidden
 Alfred M. Szmidt       address@hidden
+Andreas Bergmeier      address@hidden
 Andreas Buening                address@hidden
 Andreas Köhler                address@hidden
 Andreas Schwab         address@hidden
diff --git a/doc/automake.texi b/doc/automake.texi
index 7ee2b70..3fc578c 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -4465,9 +4465,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
 @address@hidden 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
@@ -5135,8 +5134,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 @address@hidden variable.
 
-If @address@hidden is not defined, the global
address@hidden variable is used instead.
+If @address@hidden is not defined, then the variable
address@hidden is used instead.
 
 These flags are passed to libtool after the @address@hidden
 option computed by Automake (if any), so
@@ -5374,11 +5373,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 @address@hidden
 option, so they should not be mode-specific options (those belong to
 the compiler or linker flags).  @xref{Libtool Flags}.
@@ -10341,10 +10340,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}.
 


hooks/post-receive
--
GNU Automake