[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.3-842-g485e9b7

[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=485e9b76fa99dd688794b54f3540139dfda49318

The branch, ng/master has been updated
       via  485e9b76fa99dd688794b54f3540139dfda49318 (commit)
       via  f1dbf0e9d3b2c3e2452b6f0d4937f5251f246fb3 (commit)
       via  2d09f0e6ab7c80c82f5f61606039402d4d804b03 (commit)
       via  f32cbc88e80ddd5439274cc8b2c718d92e73ad7f (commit)
       via  154fedbdbbc962f112989cc3c963daa4467b7618 (commit)
       via  c1b83e1af60b866cf5cdeebf77d0275019bad8b2 (commit)
       via  f25f4bfcc358152a619b246bf91aa8653eb6cadd (commit)
       via  9c4ad6973eedb074a9381e14a6c1eeeb285c2465 (commit)
       via  94b7b8ecd4bae85782b45a9bb36f42c4d2b93805 (commit)
       via  076e8fa284c2453099286876684be913512af381 (commit)
       via  db5437316ffeb3ad51c126ce447cde8396108060 (commit)
       via  c298a4af18bc58c92da0f033eebeecae4a4d9f90 (commit)
       via  27fc108a01b54c392f240fab9328314cda07da0e (commit)
       via  175cbfc39c91e526d8abde24bfe3293aae2b9a58 (commit)
       via  cf41f5af46f715077219cd2ec86471021e782937 (commit)
      from  6154da4d88442ffcbd3423a71d632b5a4a547878 (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 485e9b76fa99dd688794b54f3540139dfda49318
Author: Stefano Lattarini <address@hidden>
Date:   Sun Sep 16 09:52:02 2012 +0200

    fixup: few minor typofixes in comments
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit f1dbf0e9d3b2c3e2452b6f0d4937f5251f246fb3
Author: Stefano Lattarini <address@hidden>
Date:   Sun Sep 16 09:47:19 2012 +0200

    tests: fix spurious failure in test on TAGS support
    
    * t/tags-pr12372.sh (Makefile.am): Use pattern rules rather than
    old-fashioned suffix rules.
    (sub/Makefile.am): Likewise.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 2d09f0e6ab7c80c82f5f61606039402d4d804b03
Author: Stefano Lattarini <address@hidden>
Date:   Sun Sep 16 09:40:46 2012 +0200

    tests: warnings in the 'obsolete' category: fix spurious failure
    
    * t/warnings-obsolete-default.sh: $(INCLUDES) is no longer supported
    in any way by Automake-NG, to a point that its definition will just
    be ignored, but cause no warning; so, instead, use the two-argument
    invocation form of AM_INIT_AUTOMAKE to elicit warnings in the 'obsolete'
    category.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit f32cbc88e80ddd5439274cc8b2c718d92e73ad7f
Merge: 6154da4 154fedb
Author: Stefano Lattarini <address@hidden>
Date:   Sun Sep 16 09:10:46 2012 +0200

    Merge branch 'master' into ng/master
    
    * master:
      fix typos in mk-dirp.m4
      tags: automake bug bug#12372 is fixed
      coverage: better exposure for automake bug#12372 (tags-related)
      coverage: expose automake bug#12372 (tags-related)
      sync: update files from upstream with "make fetch"
      news: cygnus will be removed in automake 1.13
      news: some changes for 1.13 has been "de-planned"
      news: report that the have seen fixlets after 1.12.3
      warns: enable category 'obsolete' by default
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 NEWS                                           |   74 +++++++++++++++++++-----
 doc/automake-ng.texi                           |    2 +-
 lib/Automake/ChannelDefs.pm                    |    2 +-
 lib/am/distcheck.mk                            |    2 +-
 lib/texinfo.tex                                |   19 +++++-
 t/backcompat6.sh                               |    5 +-
 t/ctags.sh                                     |    4 +-
 t/{recurs-user-many.sh => tags-pr12372.sh}     |   67 +++++++++++-----------
 t/{ar-lib7.sh => warnings-obsolete-default.sh} |   20 ++++--
 9 files changed, 131 insertions(+), 64 deletions(-)
 copy t/{recurs-user-many.sh => tags-pr12372.sh} (52%)
 copy t/{ar-lib7.sh => warnings-obsolete-default.sh} (61%)

diff --git a/NEWS b/NEWS
index 5490e72..46aa8cd 100644
--- a/NEWS
+++ b/NEWS
@@ -127,10 +127,15 @@ New in 1.13:
     specifying the name of such targets in invocations of the new
     'AM_EXTRA_RECURSIVE_TARGETS' m4 macro.
 
+* Tags:
+
   - Any failure in the recipe of the "tags", "ctags", "cscope" or
     "cscopelist" targets in a subdirectory is now propagated to the
     top-level make invocation.
 
+  - Tags are correctly computed also for files in _SOURCES variables that
+    only list files with non-standard suffixes (see automake bug#12372).
+
 * Improvements to aclocal and related rebuilds rules:
 
   - The Autoconf-provided macro AC_CONFIG_MACRO_DIR is now traced by
@@ -144,7 +149,7 @@ New in 1.13:
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-New in 1.12.3:
+New in 1.12.4:
 
 * WARNING: Future backward-incompatibilities!
 
@@ -152,11 +157,24 @@ New in 1.12.3:
     long-deprecated 'configure.in' name for the Autoconf input file.
     You are advised to use the recommended name 'configure.ac' instead.
 
-  - Starting from the next major Automake version (1.13), the rules to
-    build pdf, ps and dvi output from Texinfo input will use the '--tidy'
-    option by default.  Since such an option was introduced in Texinfo
-    4.9, this means that Makefiles generated by future Automake versions
-    will require at least that version of Texinfo.
+  - Support for the "Cygnus-style" trees (as enabled by the 'cygnus'
+    option) will be removed in the next major Automake release (1.13).
+
+  - The long-obsolete (since automake 1.10) AM_PROG_MKDIR m4 macro will
+    be removed in Automake 1.13.  The $(mkdir_p) make variable and the
+    @mkdir_p@ substitution will still remain available (as aliases of
+    $(MKDIR_P)) for the moment, for better backward compatibility.
+
+  - Autoconf 2.65 or later will be required by the next major Automake
+    version (1.13).  Until now, Automake has required Autoconf version
+    2.62 or later.
+
+  - Starting from the next major Automake version (1.13), the rules
+    to build pdf, ps and dvi output from Texinfo input will use the
+    '--build-dir' option by default.  Since such an option was only
+    introduced in Texinfo 4.9, this means that Makefiles generated by
+    future Automake versions will require at least that version of
+    Texinfo.
 
   - Starting from the next major Automake version (1.13), the parallel
     testsuite harness (previously only enabled by the 'parallel-tests'
@@ -164,13 +182,28 @@ New in 1.12.3:
     harness will still be available through the use of the 'serial-tests'
     option.
 
-  - Support for the two- and three-arguments invocation forms of the
-    AM_INIT_AUTOMAKE macro is deprecated, and will be removed in the
-    next major Automake version (1.13).
+  - The following long-obsolete m4 macros will be removed in the
+    next major Automake version (1.13):
+
+      AM_PROG_CC_STDC:    superseded by AC_PROG_CC since October 2002
+      fp_PROG_CC_STDC:    broken alias for AM_PROG_CC_STDC
+      fp_WITH_DMALLOC:    old alias for AM_WITH_DMALLOC
+      AM_CONFIG_HEADER:   superseded by AC_CONFIG_HEADERS since July 2002
+      ud_PATH_LISPDIR:    old alias for AM_PATH_LISPDIR
+      jm_MAINTAINER_MODE: old alias for AM_MAINTAINER_MODE
+      ud_GNU_GETTEXT:     old alias for AM_GNU_GETTEXT
+      gm_PROG_LIBTOOL:    old alias for AC_PROG_LIBTOOL
+      fp_C_PROTOTYPES:    old alias for AM_C_PROTOTYPES (which was part
+                          of the now-removed automatic de-ANSI-fication
+                          support of Automake)
+
+  - All the "old alias" macros in 'm4/obsolete.m4' will be removed in
+    the next major Automake version (1.13).
 
-  - The exact order in which the directories in the aclocal macro
-    search path are looked up is probably going to be changed in the
-    next Automake release (1.13).
+  - The '--acdir' option of aclocal is deprecated, and will probably
+    be removed in the next major Automake release (1.13).  You should
+    use the options '--automake-acdir' and '--system-acdir' instead
+    (which have been introduced in Automake 1.11.2).
 
   - The 'missing' script will not try anymore to update the timestamp
     of out-of-date files that require a maintainer-specific tool to be
@@ -179,6 +212,19 @@ New in 1.12.3:
     giving more useful warnings than a bare "command not found" from a
     make recipe would.
 
+* Warnings and deprecations:
+
+  - Warnings in the 'obsolete' category are enabled by default both in
+    automake and aclocal.
+
+* Miscellaneous changes:
+
+  - Some testsuite weaknesses and spurious failures have been fixed.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+New in 1.12.3:
+
 * Miscellaneous changes:
 
   - The '.m4' files provided by Automake does not define serial numbers
@@ -275,8 +321,8 @@ New in 1.12.1:
 
   - Use of the long-deprecated two- and three-arguments invocation forms
     of the AM_INIT_AUTOMAKE macro now elicits a warning in the 'obsolete'
-    category.  Starting from the next major Automake release (1.13), such
-    usages won't be allowed anymore.
+    category.  Starting from some future major Automake release (likely
+    post-1.13), such usages won't be allowed anymore.
 
   - Support for the "Cygnus-style" trees (enabled by the 'cygnus' option) is
     now deprecated (its use triggers a warning in the 'obsolete' category).
diff --git a/doc/automake-ng.texi b/doc/automake-ng.texi
index 63a1a92..6bc5467 100644
--- a/doc/automake-ng.texi
+++ b/doc/automake-ng.texi
@@ -2692,7 +2692,7 @@ A category can be turned off by prefixing its name with 
@samp{no-}.  For
 instance, @option{-Wno-syntax} will hide the warnings about unused
 variables.
 
-The categories output by default are @samp{syntax} and
+The categories output by default are @samp{obsolete}, @samp{syntax} and
 @samp{unsupported}.  Additionally, @samp{gnu} and @samp{portability}
 are enabled in @option{--gnu} and @option{--gnits} strictness.
 
diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm
index bc4c6a8..34bda8b 100644
--- a/lib/Automake/ChannelDefs.pm
+++ b/lib/Automake/ChannelDefs.pm
@@ -148,7 +148,7 @@ register_channel 'automake', type => 'fatal', backtrace => 
1,
 
 register_channel 'extra-portability', type => 'warning', silent => 1;
 register_channel 'gnu', type => 'warning';
-register_channel 'obsolete', type => 'warning', silent => 1;
+register_channel 'obsolete', type => 'warning';
 register_channel 'override', type => 'warning', silent => 1;
 register_channel 'portability', type => 'warning', silent => 1;
 register_channel 'syntax', type => 'warning';
diff --git a/lib/am/distcheck.mk b/lib/am/distcheck.mk
index 421b15b..b89395c 100644
--- a/lib/am/distcheck.mk
+++ b/lib/am/distcheck.mk
@@ -31,7 +31,7 @@
 # present in the archive are really unusual.
 # ----------------------------------------------------------------------
 
-# TODO: this definition-oriented interface is almost god enough to offer
+# TODO: this definition-oriented interface is almost good enough to offer
 # as a public API allowing the user to define and use new archive formats.
 # However, we must think carefully about possible problems before setting
 # the API in stone.  So, for the moment, we keep this internal and
diff --git a/lib/texinfo.tex b/lib/texinfo.tex
index dc4bf64..f458ba7 100644
--- a/lib/texinfo.tex
+++ b/lib/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2012-07-29.17}
+\def\texinfoversion{2012-09-04.17}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -594,7 +594,7 @@
 \def\:{\spacefactor=1000 }
 
 % @* forces a line break.
-\def\*{\hfil\break\hbox{}\ignorespaces}
+\def\*{\unskip\hfil\break\hbox{}\ignorespaces}
 
 % @/ allows a line break.
 \let\/=\allowbreak
@@ -3269,6 +3269,19 @@ end
   \finishedtitlepagetrue
 }
 
+% Settings used for typesetting titles: no hyphenation, no indentation,
+% don't worry much about spacing, ragged right.  This should be used
+% inside a \vbox, and fonts need to be set appropriately first.  Because
+% it is always used for titles, nothing else, we call \rmisbold.
+% 
+\def\raggedtitlesettings{%
+  \rmisbold
+  \hyphenpenalty=10000
+  \parindent=0pt
+  \tolerance=5000
+  \ptexraggedright
+}
+
 % Macros to be used within @titlepage:
 
 \let\subtitlerm=\tenrm
@@ -3276,7 +3289,7 @@ end
 
 \parseargdef\title{%
   \checkenv\titlepage
-  \leftline{\titlefonts\rmisbold #1}
+  \vbox{\titlefonts \raggedtitlesettings #1}
   % print a rule at the page bottom also.
   \finishedtitlepagefalse
   \vskip4pt \hrule height 4pt width \hsize \vskip4pt
diff --git a/t/backcompat6.sh b/t/backcompat6.sh
index 9fc4946..bcfd3dc 100755
--- a/t/backcompat6.sh
+++ b/t/backcompat6.sh
@@ -15,7 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Backward-compatibility test: try to build and distribute a package
-# using obsoleted forms of AC_INIT, AM_INIT_AUTOMAKE and AC_OUTPUT.
+# using obsoleted forms of AC_INIT, AM_INIT_AUTOMAKE and AC_OUTPUT,
+# and 'configure.in' as autconf input file.
 # This script can also serve as mild stress-testing for Automake.
 # See also the similar test 'backcompat5.test'.
 
@@ -77,7 +78,7 @@ int main (void)
 }
 END
 
-$ACLOCAL
+$ACLOCAL -Wno-obsolete
 $AUTOMAKE -Wno-obsolete --add-missing
 $AUTOCONF
 
diff --git a/t/ctags.sh b/t/ctags.sh
index bbbb22d..77c59cc 100755
--- a/t/ctags.sh
+++ b/t/ctags.sh
@@ -72,7 +72,7 @@ SUBDIRS = subsub .
 noinst_HEADERS = subsub/foo.h
 subsub/foo.h:
        # Use and inlined function, not a #define, for the sake of
-       # Emacs an XEmacs ctags (at least up to versions 22 and 23).
+       # Emacs and XEmacs ctags (at least up to version 23).
        echo 'inline int IsBigger (int a, int b) { return (a > b); }' >$@
 CLEANFILES = $(noinst_HEADERS)
 END
@@ -94,7 +94,7 @@ cat > sub2/subsub/bar.f77 << 'END'
       end
 END
 
-# No file to tag here, deliberately.
+# No files to tag here, deliberately.
 : > sub3/Makefile.am
 
 $ACLOCAL
diff --git a/t/recurs-user-many.sh b/t/tags-pr12372.sh
similarity index 52%
copy from t/recurs-user-many.sh
copy to t/tags-pr12372.sh
index c1e4757..caba463 100755
--- a/t/recurs-user-many.sh
+++ b/t/tags-pr12372.sh
@@ -14,60 +14,61 @@
 # 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 many user-defined recursive targets can be supported
-# at once, and that calls to 'AM_EXTRA_RECURSIVE_TARGETS' are
-# cumulative.
+# Test to make sure tags are processed also for files with non-standard
+# extensions.  See automake bug#12372.
 
+required='cc etags'
 . ./defs || exit 1
 
 cat >> configure.ac <<'END'
+AC_PROG_CC
 AC_CONFIG_FILES([sub/Makefile])
-## NOTE: extra white spaces, tabs, newlines and backslashes in the
-## lines below: on purpose.
-AM_EXTRA_RECURSIVE_TARGETS([ foo  \
-       bar  ])
-AC_SUBST([CLEANFILES], ['foo bar baz'])
 AC_OUTPUT
-# Yes, this appears after AC_OUTPUT.  So what?
-AM_EXTRA_RECURSIVE_TARGETS([baz])
 END
 
-mkdir sub
-
 cat > Makefile.am <<'END'
+all-local: tags
+%.o: %.pc
+       sed -e 's/\[/{/' -e 's/\]/}/' $(srcdir)/$*.pc >$*.c
+       $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $*.c
+       rm -f $*.c
+
+LINK = $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@
+noinst_PROGRAMS = foo
+foo_SOURCES = foo-main.pc barbar.c
 SUBDIRS = sub
-foo-local:
-       : > foo
-bar-local:
-       echo x > bar
-baz-local: ; touch baz
-check-local: foo bar baz
-       ls -l . sub ;: For debugging.
-       test -f foo
-       test -f bar
-       test -f baz
-       test -f sub/foo
-       test -f sub/bar
-       test -f sub/baz
 END
 
+mkdir sub
 cat > sub/Makefile.am <<'END'
-foo-local bar-local baz-local:
-       touch `echo $@ | sed 's/-local$$//'`
+all-local: tags
+%.o: %.pc
+       sed -e 's/@/a/g' $(srcdir)/$*.pc >$*.c
+       $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $*.c
+       rm -f $*.c
+
+LINK = $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@
+noinst_PROGRAMS = zap
+zap_SOURCES = zardoz.pc
 END
 
+echo 'int main(void) [ return bar(1); ]' > foo-main.pc
+echo 'int bar(int x) { return !x; }' > barbar.c
+echo 'int address@hidden(void) { return 0; }' > sub/zardoz.pc
+
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE
 
-for t in foo bar baz; do
-  $FGREP "$t-am" Makefile.in
-  $FGREP "$t-am" sub/Makefile.in
-done
-
 ./configure
 
-$MAKE check
+$MAKE
+cat TAGS
+cat sub/TAGS
+$FGREP foo-main.pc TAGS
+$FGREP barbar.c TAGS
+$FGREP zardoz.pc sub/TAGS
+
 $MAKE distcheck
 
 :
diff --git a/t/ar-lib7.sh b/t/warnings-obsolete-default.sh
similarity index 61%
copy from t/ar-lib7.sh
copy to t/warnings-obsolete-default.sh
index c27cabf..6f4680d 100755
--- a/t/ar-lib7.sh
+++ b/t/warnings-obsolete-default.sh
@@ -14,21 +14,27 @@
 # 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 if automake warns if ar-lib is missing when AM_PROG_AR is used.
+# Check that automake warnings in the 'obsolete' category are enabled
+# by default.
 
 . ./defs || exit 1
 
-cat >> configure.ac << 'END'
-AM_PROG_AR
+# We want (almost) complete control over automake options.
+AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror"
+
+cat > configure.ac <<'END'
+AC_INIT
+AM_INIT_AUTOMAKE([foo], [1.0])
+AC_CONFIG_FILES([Makefile])
 END
 
-:> Makefile.am
+: > Makefile.am
 
 $ACLOCAL
 AUTOMAKE_fails
+grep '^configure\.ac:2:.*AM_INIT_AUTOMAKE.*arguments.*deprecated' stderr
 
-grep '^configure\.ac:.*ar-lib.*not found' stderr
-
-$AUTOMAKE --add-missing
+# Check that we can override warnings about obsolete stuff.
+$AUTOMAKE -Wno-obsolete
 
 :


hooks/post-receive
-- 
GNU Automake