[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.13-761-gab76d22

[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=ab76d22dd759153542c2133fbc99c591e17e6791

The branch, ng/master has been updated
       via  ab76d22dd759153542c2133fbc99c591e17e6791 (commit)
       via  51defae0a5af847d6c69de685b8997ae9178584d (commit)
       via  d7bc52272f6e841d1b0813a78fba5102d55c9700 (commit)
       via  5470c2dd9a594dc3cec553cd8ee052841ee5b8bd (commit)
       via  11fac8b2865ce3ed67c178a78bd37c8de709f9f7 (commit)
       via  924ef267ffd8602dcc0be71c589655812fbe4d85 (commit)
       via  162f61c8f8fc7ee14c9597faa5ac7e6695e52e8d (commit)
       via  506f6ce8326e4a96525700eb8052919c9294a06e (commit)
       via  767f8320eba745da0d829e51b8cf0e82a00c1bbb (commit)
       via  ac5c1d7782732c7245bcd8a2cbe63fefdafeda99 (commit)
       via  b6602b334c016042e252545d16733b7d5678fd90 (commit)
      from  78e1c8e561d71ae70b2d014a758502c9dc523a95 (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 ab76d22dd759153542c2133fbc99c591e17e6791
Merge: 78e1c8e 51defae
Author: Stefano Lattarini <address@hidden>
Date:   Mon Dec 31 14:58:00 2012 +0100

    Merge branch 'master' into ng/master
    
    * master:
      docs: adjust comment w.r.t. recent tests renaming
      tests: some more renames for texinfo tests
      tests: enhance and tweak some texinfo tests
      tests: remove a redundant texinfo test
      tests: don't list a removed tests in XFAIL_TESTS
      tests: more explicative names for some tests
      cleanup: drop a redundant %?FIRST% transform
      maint: state when compatibility cruft should be removed or warned about
    
    + Non-trivial extra edits
    
    * t/txinfo-other-suffixes.sh: Remove, Automake-NG only supports
    '.texi' ad suffix for Texinfo files.
    * t/txinfo-without-info-suffix.sh: Remove, Automake-NG doesn't
    support generating suffix-less info files.
    * t/txinfo-no-repeated-targets.sh: Remove, superseded by test
    't/txinfo-rules-once.sh' (see [ng] commit v1.12.1-416-gd5459b9).
    * t/txinfo-dvi-recurs.sh: Remove, basically an obsolete grepping
    test (as was the test 'txinfo10.sh' this was renamed from; see
    [ng] commit v1.12.2-887-gb80d8d2).
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 doc/automake-ng.texi                               |    2 +-
 lib/Automake/Options.pm                            |    1 +
 m4/obsolete-err.m4                                 |    4 ++
 t/{txinfo26.sh => txinfo-absolute-srcdir-pr408.sh} |    0
 t/{txinfo8.sh => txinfo-add-missing-and-dist.sh}   |    0
 t/{txinfo32.sh => txinfo-bsd-make-recurs.sh}       |    0
 t/{txinfo33.sh => txinfo-clean.sh}                 |    0
 t/{txinfo16.sh => txinfo-info-in-srcdir.sh}        |    0
 ...fo20.sh => txinfo-makeinfo-error-no-clobber.sh} |    0
 t/{txinfo21.sh => txinfo-many-output-formats.sh}   |    0
 t/{txinfo2.sh => txinfo-no-extra-dist.sh}          |   31 ++++++++++++++----
 t/{txinfo27.sh => txinfo-no-installinfo.sh}        |    0
 t/{txinfo29.sh => txinfo-override-infodeps.sh}     |    0
 t/{txinfo22.sh => txinfo-override-texinfo-tex.sh}  |    0
 t/{txinfo17.sh => txinfo-setfilename-repeated.sh}  |    0
 ...nfo31.sh => txinfo-setfilename-suffix-strip.sh} |    8 +++-
 t/{txinfo13.sh => txinfo-subdir-pr343.sh}          |    7 ----
 t/{txinfo.sh => txinfo-tex-dist.sh}                |    0
 ...info4.sh => txinfo-unrecognized-info-suffix.sh} |    0
 t/{vtexi.sh => txinfo-vtexi.sh}                    |    0
 t/{vtexi2.sh => txinfo-vtexi2.sh}                  |    0
 t/{vtexi3.sh => txinfo-vtexi3.sh}                  |    4 +-
 t/{vtexi4.sh => txinfo-vtexi4.sh}                  |    4 +-
 t/txinfo7.sh                                       |   33 --------------------
 24 files changed, 40 insertions(+), 54 deletions(-)
 rename t/{txinfo26.sh => txinfo-absolute-srcdir-pr408.sh} (100%)
 rename t/{txinfo8.sh => txinfo-add-missing-and-dist.sh} (100%)
 rename t/{txinfo32.sh => txinfo-bsd-make-recurs.sh} (100%)
 rename t/{txinfo33.sh => txinfo-clean.sh} (100%)
 rename t/{txinfo16.sh => txinfo-info-in-srcdir.sh} (100%)
 rename t/{txinfo20.sh => txinfo-makeinfo-error-no-clobber.sh} (100%)
 rename t/{txinfo21.sh => txinfo-many-output-formats.sh} (100%)
 rename t/{txinfo2.sh => txinfo-no-extra-dist.sh} (59%)
 rename t/{txinfo27.sh => txinfo-no-installinfo.sh} (100%)
 rename t/{txinfo29.sh => txinfo-override-infodeps.sh} (100%)
 rename t/{txinfo22.sh => txinfo-override-texinfo-tex.sh} (100%)
 rename t/{txinfo17.sh => txinfo-setfilename-repeated.sh} (100%)
 rename t/{txinfo31.sh => txinfo-setfilename-suffix-strip.sh} (84%)
 rename t/{txinfo13.sh => txinfo-subdir-pr343.sh} (86%)
 rename t/{txinfo.sh => txinfo-tex-dist.sh} (100%)
 rename t/{txinfo4.sh => txinfo-unrecognized-info-suffix.sh} (100%)
 rename t/{vtexi.sh => txinfo-vtexi.sh} (100%)
 rename t/{vtexi2.sh => txinfo-vtexi2.sh} (100%)
 rename t/{vtexi3.sh => txinfo-vtexi3.sh} (95%)
 rename t/{vtexi4.sh => txinfo-vtexi4.sh} (94%)
 delete mode 100755 t/txinfo7.sh

diff --git a/doc/automake-ng.texi b/doc/automake-ng.texi
index 69d1a9c..aa4b14c 100644
--- a/doc/automake-ng.texi
+++ b/doc/automake-ng.texi
@@ -7868,7 +7868,7 @@ passed to @code{makeinfo} when building @file{.info} 
files; and
 @samp{$(AM_MAKEINFOHTMLFLAGS)} is used when building @file{.html}
 files.
 
address@hidden Keep in sync with txinfo21.sh
address@hidden Keep in sync with txinfo-many-output-formats.sh
 For instance, the following setting can be used to obtain one single
 @file{.html} file per manual, without node separators.
 @example
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index 77e9cbd..a3b8193 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -309,6 +309,7 @@ sub _process_option_list (\%@)
         {
           set_strictness ($_);
         }
+      # TODO: Remove this special check in Automake 1.15.
       elsif ($_ eq 'cygnus')
         {
           error $where, "support for Cygnus-style trees has been removed";
diff --git a/m4/obsolete-err.m4 b/m4/obsolete-err.m4
index 77dab8c..8754342 100644
--- a/m4/obsolete-err.m4
+++ b/m4/obsolete-err.m4
@@ -8,22 +8,26 @@
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+dnl TODO: Remove in Automake 1.15.
 AC_DEFUN([AM_CONFIG_HEADER],
 [AC_FATAL(['$0': this macro is obsolete.
     You should use the 'AC][_CONFIG_HEADERS' macro instead.])])
 
+dnl TODO: Remove in Automake 1.15.
 AC_DEFUN([AM_PROG_CC_STDC],
 [AC_FATAL(['$0': this macro is obsolete.
     You should simply use the 'AC][_PROG_CC' macro instead.
     Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
     but upon 'ac_cv_prog_cc_stdc'.])])
 
+dnl TODO: Remove in Automake 1.16.
 AC_DEFUN([AM_PROG_MKDIR_P],
 [AC_FATAL(['$0': this macro is obsolete.
     You should simply use the 'AC][_PROG_MKDIR_P' macro instead, and
     use '$(MKDIR_P)' instead of '$(mkdir_p)' in your Makefile.am
     files.])])
 
+dnl TODO: Remove in Automake 1.14.
 AC_DEFUN([AM_C_PROTOTYPES],
          [AC_FATAL([automatic de-ANSI-fication support has been removed])])
 AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
diff --git a/t/txinfo26.sh b/t/txinfo-absolute-srcdir-pr408.sh
similarity index 100%
rename from t/txinfo26.sh
rename to t/txinfo-absolute-srcdir-pr408.sh
diff --git a/t/txinfo8.sh b/t/txinfo-add-missing-and-dist.sh
similarity index 100%
rename from t/txinfo8.sh
rename to t/txinfo-add-missing-and-dist.sh
diff --git a/t/txinfo32.sh b/t/txinfo-bsd-make-recurs.sh
similarity index 100%
rename from t/txinfo32.sh
rename to t/txinfo-bsd-make-recurs.sh
diff --git a/t/txinfo33.sh b/t/txinfo-clean.sh
similarity index 100%
rename from t/txinfo33.sh
rename to t/txinfo-clean.sh
diff --git a/t/txinfo16.sh b/t/txinfo-info-in-srcdir.sh
similarity index 100%
rename from t/txinfo16.sh
rename to t/txinfo-info-in-srcdir.sh
diff --git a/t/txinfo20.sh b/t/txinfo-makeinfo-error-no-clobber.sh
similarity index 100%
rename from t/txinfo20.sh
rename to t/txinfo-makeinfo-error-no-clobber.sh
diff --git a/t/txinfo21.sh b/t/txinfo-many-output-formats.sh
similarity index 100%
rename from t/txinfo21.sh
rename to t/txinfo-many-output-formats.sh
diff --git a/t/txinfo2.sh b/t/txinfo-no-extra-dist.sh
similarity index 59%
rename from t/txinfo2.sh
rename to t/txinfo-no-extra-dist.sh
index f566488..177007c 100755
--- a/t/txinfo2.sh
+++ b/t/txinfo-no-extra-dist.sh
@@ -14,8 +14,8 @@
 # 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 ensure that a ".info~" file doesn't end up in the
-# distribution.  Bug report from Greg McGary.
+# Test to ensure that a ".info~" or ".info.bak" file doesn't end up
+# in the distribution.  Bug report from Greg McGary.
 
 . test-init.sh
 
@@ -24,22 +24,39 @@ AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
-info_TEXINFOS = textutils.texi
-.PHONY: test
-test:
+info_TEXINFOS = textutils.texi subdir/main.texi
+test: distdir
        @echo am.dist.all-files = $(am.dist.all-files)
-       case '$(am.dist.all-files)' in *'~'*) exit 1;; *) exit 0;; esac
+       @case '$(am.dist.all-files)' in \
+          *'~'*|*'.bak'*) exit 1;; \
+          *) exit 0;; \
+        esac
+       @st=0; \
+        find $(distdir) | grep '~' && st=1; \
+        find $(distdir) | grep '\.bak' && st=1; \
+        exit $$st
+PHONY: test
 END
 
 : > texinfo.tex
+mkdir subdir
 echo '@setfilename textutils.info' > textutils.texi
-: > textutils.info~
+echo '@setfilename main.info' > subdir/main.texi
 
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE
 
 ./configure
+: > textutils.info
+: > subdir/main.info
+: > textutils.info~
+: > textutils.info.bak
+: > subdir/main.info~
+: > subdir/main.info.bak
 $MAKE test
+$MAKE maintainer-clean
+test -f subdir/main.info~
+test -f subdir/main.info.bak
 
 :
diff --git a/t/txinfo27.sh b/t/txinfo-no-installinfo.sh
similarity index 100%
rename from t/txinfo27.sh
rename to t/txinfo-no-installinfo.sh
diff --git a/t/txinfo29.sh b/t/txinfo-override-infodeps.sh
similarity index 100%
rename from t/txinfo29.sh
rename to t/txinfo-override-infodeps.sh
diff --git a/t/txinfo22.sh b/t/txinfo-override-texinfo-tex.sh
similarity index 100%
rename from t/txinfo22.sh
rename to t/txinfo-override-texinfo-tex.sh
diff --git a/t/txinfo17.sh b/t/txinfo-setfilename-repeated.sh
similarity index 100%
rename from t/txinfo17.sh
rename to t/txinfo-setfilename-repeated.sh
diff --git a/t/txinfo31.sh b/t/txinfo-setfilename-suffix-strip.sh
similarity index 84%
rename from t/txinfo31.sh
rename to t/txinfo-setfilename-suffix-strip.sh
index 567e28f..8526d53 100755
--- a/t/txinfo31.sh
+++ b/t/txinfo-setfilename-suffix-strip.sh
@@ -14,7 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make sure file extensions are matched correctly.
+# Make sure file extensions are matched correctly in the code
+# parsing texi files for @setfilename declarations.
 # Report from Eric Dorland.
 
 . test-init.sh
@@ -25,5 +26,8 @@ cat >bar.texi <<EOF
 EOF
 
 $ACLOCAL
-$AUTOCONF
 $AUTOMAKE --add-missing
+
+$EGREP '[ /]bar-1\.9\.info( |$)' Makefile.in
+
+:
diff --git a/t/txinfo13.sh b/t/txinfo-subdir-pr343.sh
similarity index 86%
rename from t/txinfo13.sh
rename to t/txinfo-subdir-pr343.sh
index 374c44a..0ecb4bf 100755
--- a/t/txinfo13.sh
+++ b/t/txinfo-subdir-pr343.sh
@@ -15,8 +15,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Check for subdir Texinfo (PR/343).
-# Also make sure we do not distribute too much foo.info* files (Report
-# from Vincent Lefevre).
 
 required='makeinfo tex texi2dvi'
 . test-init.sh
@@ -29,8 +27,6 @@ subdir_main_TEXINFOS = subdir/inc.texi
 
 installcheck-local:
        test -f "$(infodir)/main.info"
-check-local:
-       test ! -f $(srcdir)/subdir/main.info.bak
 END
 
 mkdir subdir
@@ -50,8 +46,6 @@ cat > subdir/inc.texi << 'END'
 I'm included.
 END
 
-touch subdir/main.info.bak
-
 $ACLOCAL
 $AUTOMAKE --add-missing
 $AUTOCONF
@@ -62,6 +56,5 @@ cd build
 $MAKE distcheck
 test -f ../subdir/main.info
 test ! -e subdir/main.info
-test -f ../subdir/main.info.bak
 
 :
diff --git a/t/txinfo.sh b/t/txinfo-tex-dist.sh
similarity index 100%
rename from t/txinfo.sh
rename to t/txinfo-tex-dist.sh
diff --git a/t/txinfo4.sh b/t/txinfo-unrecognized-info-suffix.sh
similarity index 100%
rename from t/txinfo4.sh
rename to t/txinfo-unrecognized-info-suffix.sh
diff --git a/t/vtexi.sh b/t/txinfo-vtexi.sh
similarity index 100%
rename from t/vtexi.sh
rename to t/txinfo-vtexi.sh
diff --git a/t/vtexi2.sh b/t/txinfo-vtexi2.sh
similarity index 100%
rename from t/vtexi2.sh
rename to t/txinfo-vtexi2.sh
diff --git a/t/vtexi3.sh b/t/txinfo-vtexi3.sh
similarity index 95%
rename from t/vtexi3.sh
rename to t/txinfo-vtexi3.sh
index 0b000a3..09e74bb 100755
--- a/t/vtexi3.sh
+++ b/t/txinfo-vtexi3.sh
@@ -17,8 +17,8 @@
 # Check that vers*.texi files are automatically created and distributed
 # if @included into a texi source.  Also check that they correctly contain
 # the @values definitions they are advertised to.
-# See also the related test 'vtexi4.sh', which does similar checks, but
-# for version.texi only, and requires makeinfo, tex and texi2dvi.
+# See also the related test 'txinfo-vtexi4.sh', which does similar checks,
+# but for version.texi only, and requires makeinfo, tex and texi2dvi.
 
 . test-init.sh
 
diff --git a/t/vtexi4.sh b/t/txinfo-vtexi4.sh
similarity index 94%
rename from t/vtexi4.sh
rename to t/txinfo-vtexi4.sh
index 8f64b43..e5d8dee 100755
--- a/t/vtexi4.sh
+++ b/t/txinfo-vtexi4.sh
@@ -17,8 +17,8 @@
 # Check that the version.texi file is automatically created and distributed
 # if @included into a texi source.  Also check that is correctly defined
 # @values definitions it is advertised to.
-# See also the related test 'vtexi3.sh', which does similar checks, but
-# for more vers*.texi files, and does not require makeinfo, tex and
+# See also the related test 'txinfo-vtexi4.sh', which does similar checks,
+# but for more vers*.texi files, and does not require makeinfo, tex and
 # texi2dvi.
 
 required='makeinfo tex texi2dvi grep-nonprint'
diff --git a/t/txinfo7.sh b/t/txinfo7.sh
deleted file mode 100755
index 8d72054..0000000
--- a/t/txinfo7.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998-2012 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# 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 texinfo.tex correctly installed by -a.  Bug report
-# by Per Cederqvist.
-
-. test-init.sh
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = textutils.texi
-END
-
-echo '@setfilename textutils.info' > textutils.texi
-
-$ACLOCAL
-$AUTOMAKE -a
-
-test -f texinfo.tex
-
-:


hooks/post-receive
-- 
GNU Automake