[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.13.1-38-g8971d23

[Stefano Lattarini]

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=8971d23fb05a19fcb75a7b8c4c66cf402b1037a4

The branch, maint has been updated
       via  8971d23fb05a19fcb75a7b8c4c66cf402b1037a4 (commit)
       via  c328a53e07d3c5158e2b6458be8d0284e042c7e5 (commit)
       via  a28f99b5a17a3930fb67978a8e42c4b3fe0ffeb9 (commit)
       via  965b8b367162c84f431d68877f97422a00f428ed (commit)
       via  744cd575c103166ed2b9e8ea1e8013f3e3e25bfe (commit)
       via  285d7b14cc55c047c432e3ed7322cb1a4f96aab2 (commit)
       via  0ac78fd0580fa4c9b367b61b53120acf5eab9f53 (commit)
      from  297dca7e9b1fd78e6bd441cefe3d16a2c863d687 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 lib/am/texi-vers.am                                |    2 +-
 t/{acloca10.sh => aclocal-I-and-install.sh}        |    4 +-
 t/aclocal-I-order-2.sh                             |    2 +-
 t/aclocal-I-order-3.sh                             |    2 +-
 t/aclocal-pr450.sh                                 |    4 +-
 t/{ccnoco3.sh => ccnoco4.sh}                       |   36 ++++++---------
 t/list-of-tests.mk                                 |    5 ++-
 t/remake-renamed-m4-macro-and-file.sh              |    2 +-
 t/{autodist-stamp-vti.sh => txinfo-nodist-info.sh} |   48 +++++++++++--------
 9 files changed, 54 insertions(+), 51 deletions(-)
 rename t/{acloca10.sh => aclocal-I-and-install.sh} (97%)
 copy t/{ccnoco3.sh => ccnoco4.sh} (67%)
 copy t/{autodist-stamp-vti.sh => txinfo-nodist-info.sh} (58%)

diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am
index 3f91cf1..bddf382 100644
--- a/lib/am/texi-vers.am
+++ b/lib/am/texi-vers.am
@@ -31,7 +31,7 @@ DIST_COMMON += %VTEXI% %STAMPVTI%
 ## %STAMPVTI% is distributed and %DIRSTAMP% isn't: a distributed file
 ## should never be dependent upon a non-distributed built file.
 ## Therefore we ensure that %DIRSTAMP% exists in the rule.
-?DIRSTAMP?     test -f %DIRSTAMP% || $(MAKE) $(AM_MAKEFLAGS) %DIRSTAMP%
+?DIRSTAMP?     @test -f %DIRSTAMP% || $(MAKE) $(AM_MAKEFLAGS) %DIRSTAMP%
        @(dir=.; test -f ./%TEXI% || dir=$(srcdir); \
        set `$(SHELL) %MDDIR%mdate-sh $$dir/%TEXI%`; \
        echo "@set UPDATED $$1 $$2 $$3"; \
diff --git a/t/acloca10.sh b/t/aclocal-I-and-install.sh
similarity index 97%
rename from t/acloca10.sh
rename to t/aclocal-I-and-install.sh
index 632e816..7c1b0d4 100755
--- a/t/acloca10.sh
+++ b/t/aclocal-I-and-install.sh
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Make sure aclocal define macros in the same order as -I's.
-# This is the same as aclocal-I-order-1.sh, with the macro calls
+# This is the similar to aclocal-I-order-1.sh, with the macro calls
 # reversed (it did make a difference).
 #
 # Also check for --install.
@@ -28,8 +28,8 @@ am_create_testdir=empty
 
 cat > configure.ac << 'END'
 AC_INIT
-MACRO1
 MACRO2
+MACRO1
 MACRO3
 END
 
diff --git a/t/aclocal-I-order-2.sh b/t/aclocal-I-order-2.sh
index fd58b4e..c3fe00a 100755
--- a/t/aclocal-I-order-2.sh
+++ b/t/aclocal-I-order-2.sh
@@ -16,7 +16,7 @@
 
 # Make sure that when two files define the same macro in the same
 # directory, the macro from the lexically greatest file is used.
-# See also sister test 'aclocal-I-ordering-2.sh'.
+# See also sister test 'aclocal-I-order-3.sh'.
 
 am_create_testdir=empty
 . test-init.sh
diff --git a/t/aclocal-I-order-3.sh b/t/aclocal-I-order-3.sh
index d2077fe..4fcbf4c 100755
--- a/t/aclocal-I-order-3.sh
+++ b/t/aclocal-I-order-3.sh
@@ -16,7 +16,7 @@
 
 # Make sure that when two files define the same macro in the same
 # directory, the macro from the lexically greatest file is used.
-# Same as acloca-I-ordering.sh, but without calling MACRO2.
+# Same as aclocal-I-order-2.sh, but without calling MACRO2.
 
 am_create_testdir=empty
 . test-init.sh
diff --git a/t/aclocal-pr450.sh b/t/aclocal-pr450.sh
index 7f4796f..184cc33 100755
--- a/t/aclocal-pr450.sh
+++ b/t/aclocal-pr450.sh
@@ -20,8 +20,8 @@
 
 . test-init.sh
 
-cat >configure.ac <<'END'
-AC_INIT([acloca19], [1.0])
+cat >configure.ac <<END
+AC_INIT([$me], [1.0])
 m4_include([aconfig.ac])
 FOO
 AC_OUTPUT
diff --git a/t/ccnoco3.sh b/t/ccnoco4.sh
similarity index 67%
copy from t/ccnoco3.sh
copy to t/ccnoco4.sh
index 7ad5b3b..54b857a 100755
--- a/t/ccnoco3.sh
+++ b/t/ccnoco4.sh
@@ -14,34 +14,30 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Test to make sure 'compile' doesn't call 'mv SRC SRC'.
+# Check that Automake doesn't pass "-c -o" to  losing compiler when
+# the 'subdir-objects' is used but sources are only present in the
+# top-level directory.  Reported by Nick Bowler in the discussion on
+# automake bug#13378:
+# <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13378#35>
+# <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13378#44>
 
 required=gcc
 . test-init.sh
 
+# We deliberately do not call AM_PROG_CC_C_O here.
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 $CC --version; $CC -v; # For debugging.
 AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
 AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = wish
-wish_SOURCES = a.c
+bin_PROGRAMS = foo bar
+bar_SOURCES = foo.c
 END
 
-mkdir sub
-
-cat > a.c << 'END'
-#include <stdio.h>
-
-int main ()
-{
-  printf ("hi\n");
-}
-END
+echo 'int main (void) { return 0; }' > foo.c
 
 cat > Mycomp << END
 #!/bin/sh
@@ -59,7 +55,7 @@ END
 
 chmod +x Mycomp
 
-# Make sure the compiler doesn't understand '-c -o'
+# Make sure the compiler doesn't understand '-c -o'.
 CC=$(pwd)/Mycomp
 export CC
 
@@ -67,12 +63,8 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE --copy --add-missing
 
-mkdir build
-cd build
-
-../configure
-$MAKE 2>stderr || { cat stderr >&2; exit 1; }
-cat stderr >&2
-grep 'mv.*the same file' stderr && exit 1
+./configure
+$MAKE
+$MAKE distcheck
 
 :
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 90eb34a..63e098d 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -30,6 +30,7 @@ t/pm/Version3.pl
 
 XFAIL_TESTS = \
 t/all.sh \
+t/ccnoco4.sh \
 t/cond17.sh \
 t/gcj6.sh \
 t/override-conditional-2.sh \
@@ -71,10 +72,10 @@ t/get-sysconf.sh \
 $(perl_TESTS) \
 t/instspc.tap \
 t/aclocal.sh \
-t/acloca10.sh \
 t/aclocal-I-order-1.sh \
 t/aclocal-I-order-2.sh \
 t/aclocal-I-order-3.sh \
+t/aclocal-I-and-install.sh \
 t/aclocal-acdir.sh \
 t/aclocal-amflags.sh \
 t/aclocal-autoconf-version-check.sh \
@@ -209,6 +210,7 @@ t/canon-name.sh \
 t/ccnoco.sh \
 t/ccnoco2.sh \
 t/ccnoco3.sh \
+t/ccnoco4.sh \
 t/check.sh \
 t/check2.sh \
 t/check4.sh \
@@ -1166,6 +1168,7 @@ t/txinfo-info-in-srcdir.sh \
 t/txinfo-makeinfo-error-no-clobber.sh \
 t/txinfo-many-output-formats.sh \
 t/txinfo-many-output-formats-vpath.sh \
+t/txinfo-nodist-info.sh \
 t/txinfo-no-clutter.sh \
 t/txinfo-no-extra-dist.sh \
 t/txinfo-no-installinfo.sh \
diff --git a/t/remake-renamed-m4-macro-and-file.sh 
b/t/remake-renamed-m4-macro-and-file.sh
index 68d1883..9cd3bc9 100755
--- a/t/remake-renamed-m4-macro-and-file.sh
+++ b/t/remake-renamed-m4-macro-and-file.sh
@@ -16,7 +16,7 @@
 
 # Test remake rules when an m4 file gets renamed and *simultaneously*
 # an m4 macro in it gets renamed.  Kudos to Bruno Haible for thinking
-# about this situation.  See also related test 'acloca22.sh'.
+# about this situation.  See also related test 'aclocal-deleted-header.sh'.
 
 . test-init.sh
 
diff --git a/t/autodist-stamp-vti.sh b/t/txinfo-nodist-info.sh
similarity index 58%
copy from t/autodist-stamp-vti.sh
copy to t/txinfo-nodist-info.sh
index 3bb31f9..265587e 100755
--- a/t/autodist-stamp-vti.sh
+++ b/t/txinfo-nodist-info.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2013 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,45 +14,53 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check that 'stamp-vti' is automatically distributed when info_TEXINFOS
-# and version.texi are involved.
-# Related to automake bug#7819.
+# Check that we can force generated '.info' info files not to be
+# distributed.
 
 required=makeinfo
 . test-init.sh
 
-cat >> configure.ac << END
-AC_OUTPUT
-END
+echo AC_OUTPUT >> configure.ac
 
 cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = info-in-builddir
 info_TEXINFOS = foo.texi
-.PHONY: test
-test: all distdir
-       ls -l $(distdir)
-       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]stamp-vti '
-       test -f $(distdir)/stamp-vti
+CLEANFILES = foo.info
+
+# To make distcheck work without requiring TeX and texi2dvi.
+dvi:
+
+# Do not distribute generated '.info' files.
+dist-info:
+       @:
 END
 
+mkdir subdir
+
 cat > foo.texi << 'END'
 \input texinfo
 @setfilename foo.info
address@hidden Zardoz
address@hidden foo
 @node Top
+Hello walls.
 @include version.texi
-bar baz quux
 @bye
 END
 
-# Required when using Texinfo.
-: > texinfo.tex
-cp "$am_scriptdir"/mdate-sh .
-
 $ACLOCAL
 $AUTOCONF
-$AUTOMAKE -a
+$AUTOMAKE -a -Wno-override
 
 ./configure
-$MAKE test
+$MAKE distdir
+ls -l . $distdir # For debugging.
+test ! -e foo.info
+test ! -e $distdir/foo.info
+$MAKE
+test -f foo.info
+$MAKE distdir
+ls -l $distdir # For debugging.
+test ! -f $distdir/foo.info
+$MAKE distcheck
 
 :


hooks/post-receive
-- 
GNU Automake