[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-515-g423f2f8

[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=423f2f8bcbbcc5936341521d9bf9a352cda994c7

The branch, master has been updated
       via  423f2f8bcbbcc5936341521d9bf9a352cda994c7 (commit)
       via  1b194c5ea3b0535e890406d70967857b7a6b1018 (commit)
       via  12cf69ebc08277cddec64083b5d016099d16d688 (commit)
      from  993c736280f3c499a551b407c856e8548463f5bb (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 423f2f8bcbbcc5936341521d9bf9a352cda994c7
Merge: 993c736 1b194c5
Author: Stefano Lattarini <address@hidden>
Date:   Tue Dec 14 00:21:07 2010 +0100

    Merge branch 'tests-libobj-fix'

commit 1b194c5ea3b0535e890406d70967857b7a6b1018
Author: Stefano Lattarini <address@hidden>
Date:   Tue Dec 14 00:11:25 2010 +0100

    Libobj tests: refer to automake bug tracker for limitations.
    
    * tests/libobj15b.test (configure.in): In the comment explaining
    why an apparently redundant AC_OUTPUT is indeed needed, refer
    to the relevant entry in the Automake bug tracker rather than
    describing the bug in detail with a FIXME-style comment.
    * tests/libobj15c.test: Likewise.
    * tests/libobj20b.test: Likewise.

commit 12cf69ebc08277cddec64083b5d016099d16d688
Author: Stefano Lattarini <address@hidden>
Date:   Mon Dec 13 23:11:54 2010 +0100

    Libobj tests: do not use `##' automake comments in-line.
    
    * tests/libobj19.test (Makefile.am): Do not use inline `##'
    comments in the definition of AUTOMAKE_OPTIONS.
    * tests/libobj20c.test: Likewise.
    
    Report by Ralf Wildenhues.

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

Summary of changes:
 ChangeLog            |   16 ++++++++++++++++
 tests/libobj15b.test |    5 ++---
 tests/libobj15c.test |    5 ++---
 tests/libobj19.test  |    2 +-
 tests/libobj20b.test |    5 ++---
 tests/libobj20c.test |    2 +-
 6 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0a5e0e4..d61bbf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2010-12-13  Stefano Lattarini  <address@hidden>
+
+       Libobj tests: refer to automake bug tracker for limitations.
+       * tests/libobj15b.test (configure.in): In the comment explaining
+       why an apparently redundant AC_OUTPUT is indeed needed, refer
+       to the relevant entry in the Automake bug tracker rather than
+       describing the bug in detail with a FIXME-style comment.
+       * tests/libobj15c.test: Likewise.
+       * tests/libobj20b.test: Likewise.
+
+       Libobj tests: do not use `##' automake comments in-line.
+       * tests/libobj19.test (Makefile.am): Do not use inline `##'
+       comments in the definition of AUTOMAKE_OPTIONS.
+       * tests/libobj20c.test: Likewise.
+       Report by Ralf Wildenhues.
+
 2010-12-13  Ralf Wildenhues  <address@hidden>
 
        Fix testsuite failure of check12.test without DejaGNU.
diff --git a/tests/libobj15b.test b/tests/libobj15b.test
index 000ba1f..3816602 100755
--- a/tests/libobj15b.test
+++ b/tests/libobj15b.test
@@ -24,9 +24,8 @@ cat >> configure.in << 'END'
 AC_PROG_CC
 AC_PROG_RANLIB
 AC_LIBSOURCE([foobar.c])
-# FIXME: without a call to AC_OUTPUT, Automake does not fail when file(s)
-#        specified in AC_LIBSOURCE call(s) do not exist.  Should we fix
-#        this limitation?  Or is the current behaviour good enough?
+# NOTE: this call to AC_OUTPUT is really needed; see Automake bug #7635
+#       <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7635>
 AC_OUTPUT
 END
 
diff --git a/tests/libobj15c.test b/tests/libobj15c.test
index f1aa259..29e0aa7 100755
--- a/tests/libobj15c.test
+++ b/tests/libobj15c.test
@@ -24,9 +24,8 @@ cat >> configure.in << 'END'
 AC_PROG_CC
 AC_PROG_RANLIB
 AC_LIBSOURCES([foobar.c, bazquux.c])
-# FIXME: without a call to AC_OUTPUT, Automake does not fail when file(s)
-#        specified in AC_LIBSOURCES call(s) do not exist.  Should we fix
-#        this limitation?  Or is the current behaviour good enough?
+# NOTE: this call to AC_OUTPUT is really needed; see Automake bug #7635
+#       <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7635>
 AC_OUTPUT
 END
 
diff --git a/tests/libobj19.test b/tests/libobj19.test
index 4fd150b..e19a759 100755
--- a/tests/libobj19.test
+++ b/tests/libobj19.test
@@ -29,7 +29,7 @@ AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects ## required for our setup to work
+AUTOMAKE_OPTIONS = subdir-objects
 noinst_LIBRARIES = libtu.a
 libtu_a_SOURCES =
 libtu_a_LIBADD = $(LIBOBJS)
diff --git a/tests/libobj20b.test b/tests/libobj20b.test
index 1662110..f57a78b 100755
--- a/tests/libobj20b.test
+++ b/tests/libobj20b.test
@@ -26,9 +26,8 @@ AC_CONFIG_LIBOBJ_DIR([libobj-dir])
 AC_PROG_CC
 AC_PROG_RANLIB
 AC_LIBSOURCE([foobar.c])
-# FIXME: without a call to AC_OUTPUT, Automake does not fail when file(s)
-#        specified in AC_LIBSOURCE call(s) do not exist.  Should we fix
-#        this limitation?  Or is the current behaviour good enough?
+# NOTE: this call to AC_OUTPUT is really needed; see Automake bug #7635
+#       <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7635>
 AC_OUTPUT
 END
 
diff --git a/tests/libobj20c.test b/tests/libobj20c.test
index 4884359..4635183 100755
--- a/tests/libobj20c.test
+++ b/tests/libobj20c.test
@@ -29,7 +29,7 @@ AC_LIBOBJ([foobar])
 END
 
 cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects ## required for our setup to work
+AUTOMAKE_OPTIONS = subdir-objects
 noinst_LIBRARIES = libtu.a
 libtu_a_SOURCES =
 libtu_a_LIBADD = $(LIBOBJS)


hooks/post-receive
-- 
GNU Automake