[Automake-commit] [SCM] GNU Automake branch, branch-1-10, updated. v1.10.2-58-g8a10270

[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=8a10270329377c9558103e1d8ddeb88b767c19be

The branch, branch-1-10 has been updated
       via  8a10270329377c9558103e1d8ddeb88b767c19be (commit)
       via  4ebae43e96ace3b5e1249eec58be5aa33e618c91 (commit)
       via  3492cdfa76dbed11146c982e285fe253e96c9c80 (commit)
      from  d34afa46fed69b2f77c2ca394f1acab7fbf0a1a4 (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 8a10270329377c9558103e1d8ddeb88b767c19be
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Apr 25 14:48:51 2009 +0200

    manual: fix trivial grammar errors.
    
    * doc/automake.texi (Subpackages, Java, Dist, Timeline): Fix `a'
    vs. `an' errors.
    Report by Eric Blake.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 4ebae43e96ace3b5e1249eec58be5aa33e618c91
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Apr 25 11:00:14 2009 +0200

    Indent rule commands consistently with a TAB.
    
    * lib/am/texinfos.am (install-info-am): Consistently use TAB, not
    spaces, for indentation of commands, even if indentation may not
    be needed at all.
    * THANKS: Update.
    Prompted by report from John Calcote.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 3492cdfa76dbed11146c982e285fe253e96c9c80
Author: Ralf Wildenhues <address@hidden>
Date:   Wed Apr 22 22:13:05 2009 +0200

    Avoid racy depmodes with universal builds.
    
    * m4/depend.m4 (_AM_DEPENDENCIES): If universal builds are used,
    avoid racy depmodes.
    * lib/depcomp: Ignore `-arch' argument for makedepend depmode.
    Report by Bruno Haible, analysis by Bruno Haible, Peter O'Gorman,
    and Eric Blake.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog          |   23 +++++++++++++++++++++++
 THANKS             |    1 +
 doc/Makefile.in    |    2 +-
 doc/automake.texi  |   10 +++++-----
 lib/am/texinfos.am |    2 +-
 lib/depcomp        |   10 ++++++++--
 m4/depend.m4       |   14 ++++++++++++++
 7 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a7aedd2..118b34e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2009-04-25  Ralf Wildenhues  <address@hidden>
+
+       manual: fix trivial grammar errors.
+       * doc/automake.texi (Subpackages, Java, Dist, Timeline): Fix `a'
+       vs. `an' errors.
+       Report by Eric Blake.
+
+       Indent rule commands consistently with a TAB.
+       * lib/am/texinfos.am (install-info-am): Consistently use TAB, not
+       spaces, for indentation of commands, even if indentation may not
+       be needed at all.
+       * THANKS: Update.
+       Prompted by report from John Calcote.
+
+2009-04-22  Ralf Wildenhues  <address@hidden>
+
+       Avoid racy depmodes with universal builds.
+       * m4/depend.m4 (_AM_DEPENDENCIES): If universal builds are used,
+       avoid racy depmodes.
+       * lib/depcomp: Ignore `-arch' argument for makedepend depmode.
+       Report by Bruno Haible, analysis by Bruno Haible, Peter O'Gorman,
+       and Eric Blake.
+
 2009-04-21  Fabian Alenius  <address@hidden>  (tiny change)
 
        Fix link to autotools tutorial.
diff --git a/THANKS b/THANKS
index f0cdcc0..932c9aa 100644
--- a/THANKS
+++ b/THANKS
@@ -149,6 +149,7 @@ Joel N. Weber II    address@hidden
 Joerg-Martin Schwarz   address@hidden
 Johan Danielsson       address@hidden
 Johannes Nicolai       address@hidden
+John Calcote           address@hidden
 John Pierce            address@hidden
 John Ratliff           address@hidden
 John W. Coomes         address@hidden
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 78deaec..8933e20 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -575,7 +575,7 @@ install-info-am: $(INFO_DEPS)
          if test -f $$file; then d=.; else d=$(srcdir); fi; \
          file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \
          for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
-                       $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
+                      $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
            if test -f $$ifile; then \
              relfile=`echo "$$ifile" | sed 's|^.*/||'`; \
              echo " $(INSTALL_DATA) '$$ifile' 
'$(DESTDIR)$(infodir)/$$relfile'"; \
diff --git a/doc/automake.texi b/doc/automake.texi
index 67c5157..d294844 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -4252,7 +4252,7 @@ AC_CONFIG_SUBDIRS, Configuring Other Packages in 
Subdirectories,
 autoconf, The Autoconf Manual}).
 
 Here is an example package for an @code{arm} program that links with
-an @code{hand} library that is a nested package in subdirectory
+a @code{hand} library that is a nested package in subdirectory
 @file{hand/}.
 
 @code{arm}'s @file{configure.ac}:
@@ -7219,7 +7219,7 @@ The value of this variable is passed to the @option{-d} 
option to
 @code{javac}.  It defaults to @samp{$(top_builddir)}.
 
 @item CLASSPATH_ENV
-This variable is an @code{sh} expression that is used to set the
+This variable is a shell expression that is used to set the
 @env{CLASSPATH} environment variable on the @code{javac} command line.
 (In the future we will probably handle class path setting differently.)
 @end vtable
@@ -8045,8 +8045,8 @@ your Makefiles cause some distributed files to be rebuilt 
when the user
 build the package.  (Think about the user missing the tool required to
 build the file; or if the required tool is built by your package,
 consider the cross-compilation case where it can't be run.)  There is
-a FAQ entry about this (@pxref{distcleancheck}), make sure you read it
-before playing with @code{distcleancheck_listfiles}.
+an entry in the FAQ about this (@pxref{distcleancheck}), make sure you
+read it before playing with @code{distcleancheck_listfiles}.
 
 @code{distcheck} also checks that the @code{uninstall} rule works
 properly, both for ordinary and @code{DESTDIR} builds.  It does this
@@ -11188,7 +11188,7 @@ package has 30 pages of documentation, and 38 test 
cases.
 From now on and until version 1.4, new releases will occur at a rate
 of about one a year.  1.1 did not exist, actually 1.1b to 1.1p have
 been the name of beta releases for 1.2.  This is the first time
-Automake uses suffix letters to designate beta releases, an habit that
+Automake uses suffix letters to designate beta releases, a habit that
 lasts.
 
 @item 1996-10-10 Kevin Dalley packages Automake 1.0 for Debian GNU/Linux.
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 853b570..1b9fd98 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -192,7 +192,7 @@ install-info-am: $(INFO_DEPS)
 ## `foo' becomes `foo.i' too.
          file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \
          for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
-                       $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
+                      $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
            if test -f $$ifile; then \
 ## Strip directory
              relfile=`echo "$$ifile" | sed 's|^.*/||'`; \
diff --git a/lib/depcomp b/lib/depcomp
index e985f43..18b0fc5 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2009-03-04.20
+scriptversion=2009-04-22.22
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
 # Software Foundation, Inc.
@@ -476,7 +476,7 @@ makedepend)
   fi
   # X makedepend
   shift
-  cleared=no
+  cleared=no eat=no
   for arg
   do
     case $cleared in
@@ -484,11 +484,17 @@ makedepend)
       set ""; shift
       cleared=yes ;;
     esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
     case "$arg" in
     -D*|-I*)
       set fnord "$@" "$arg"; shift ;;
     # Strip any option that makedepend may not understand.  Remove
     # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
     -*|$object)
       ;;
     *)
diff --git a/m4/depend.m4 b/m4/depend.m4
index 451312a..efe8643 100644
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -63,6 +63,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
   fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac])
+
   for depmode in $am_compiler_list; do
     # Setup a source with many dependencies, because some compilers
     # like to wrap large dependency lists on column 80 (with \), and
@@ -87,6 +97,10 @@ AC_CACHE_CHECK([dependency style of $depcc],
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
     nosideeffect)
       # after this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested


hooks/post-receive
-- 
GNU Automake