Merge branch 'dog-feeding' into maint

* dog-feeding:
  build: move automake and aclocal in 'bin' subdir
  build: break up monolithic Makefile.am in subdir-specific fragments

diff --git a/THANKS b/THANKS
index fd023e2..66b3270 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -261,6 +261,7 @@ Michael Brantley                Michael-Brantley@deshaw.com
 Michael Daniels                 mdaniels@rim.com
 Michael Hofmann                 mhofma@googlemail.com
 Michael Ploujnikov              ploujj@gmail.com
+Michael Zucchi                  notzed@gmail.com
 Michel de Ruiter                mdruiter@cs.vu.nl
 Mike Castle                     dalgoda@ix.netcom.com
 Mike Frysinger                  vapier@gentoo.org

diff --git a/bin/automake.in b/bin/automake.in
index 751dc84..3614b6b 100644 (file)
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -241,7 +241,7 @@ my $configure_ac;
 # Files found by scanning configure.ac for LIBOBJS.
 my %libsources = ();
 
-# Names used in AC_CONFIG_HEADER call.
+# Names used in AC_CONFIG_HEADERS call.
 my @config_headers = ();
 
 # Names used in AC_CONFIG_LINKS call.
@@ -257,8 +257,8 @@ my @configure_input_files = ();
 # List of files in AC_CONFIG_FILES/AC_OUTPUT without Makefile.am's,
 # and their outputs.
 my @other_input_files = ();
-# Where each AC_CONFIG_FILES/AC_OUTPUT/AC_CONFIG_LINK/AC_CONFIG_HEADER appears.
-# The keys are the files created by these macros.
+# Where each AC_CONFIG_FILES/AC_OUTPUT/AC_CONFIG_LINK/AC_CONFIG_HEADERS
+# appears.  The keys are the files created by these macros.
 my %ac_config_files_location = ();
 # The condition under which AC_CONFIG_FOOS appears.
 my %ac_config_files_condition = ();

diff --git a/doc/automake.texi b/doc/automake.texi
index dda78a5..8b5125e 100644 (file)
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -7603,11 +7603,11 @@ libtool, The Libtool Manual}) with the @code{LTLIBRARIES} primary.
 Automake provides some minimal support for Java bytecode compilation with
 the @code{JAVA} primary (in addition to the support for compiling Java to
 native machine code; @pxref{Java Support with gcj}).  Note however that
-@emph{the interface and most features described here are deprecated}; the
-next automake release will strive to provide a better and cleaner
+@emph{the interface and most features described here are deprecated}.
+Future Automake releases will strive to provide a better and cleaner
 interface, which however @emph{won't be backward-compatible}; the present
-interface will probably be removed altogether in future automake releases
-(1.13 or later), so don't use it in new code.
+interface will probably be removed altogether some time after the
+introduction of the new interface (if that ever materializes).
 
 Any @file{.java} files listed in a @code{_JAVA} variable will be
 compiled with @code{JAVAC} at build time.  By default, @file{.java}

diff --git a/lib/am/check.am b/lib/am/check.am
index b39395c..7012d5a 100644 (file)
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -238,7 +238,7 @@ am__set_TESTS_bases = \
        $(MAKE) $(AM_MAKEFLAGS) $<
 
 # Leading 'am--fnord' is there to ensure the list of targets does not
-# exand to empty, as could happen e.g. with make check TESTS=''.
+# expand to empty, as could happen e.g. with make check TESTS=''.
 am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
 am--force-recheck:
        @:

diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 4b9cc04..1a6f28e 100644 (file)
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -33,8 +33,7 @@ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 
 ## Shell code that determines whether the current make instance is
 ## running with a given one-letter option (e.g., -k, -n) that takes
-## no argument.  Actually, the only supported option at the moment
-## is '-n' (support for '-k' will be added soon).
+## no argument.
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -53,7 +52,7 @@ am__make_running_with_option = \
 ## brittle, but is the best we can do.
     case $$MAKEFLAGS in \
 ## If we run "make TESTS='snooze nap'", FreeBSD make will export MAKEFLAGS
-## to " TESTS=foo\ nap", so that the simpler loop below (on word-splitted
+## to " TESTS=foo\ nap", so that the simpler loop below (on word-split
 ## $$MAKEFLAGS) would see a "make flag" equal to "nap", and would wrongly
 ## misinterpret that as and indication that make is running in dry mode.
 ## This has already happened in practice.  So we need this hack.
@@ -111,7 +110,7 @@ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 
 ## Shell code that determines whether make is running in "keep-going mode"
 ## ("make -k") or not.  Useful in rules that must recursively descend into
-## subdirectories, and decide whther to stop at the first error or not.
+## subdirectories, and decide whether to stop at the first error or not.
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 
 ## Some derived variables that have been found to be useful.

diff --git a/lib/am/library.am b/lib/am/library.am
index 2462984..c01d221 100644 (file)
--- a/lib/am/library.am
+++ b/lib/am/library.am
@@ -13,6 +13,7 @@
 
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 %LIBRARY%: $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_DEPENDENCIES) $(EXTRA_%XLIBRARY%_DEPENDENCIES) %DIRSTAMP%
        %SILENT%-rm -f %LIBRARY%
        %VERBOSE%$(%XLIBRARY%_AR) %LIBRARY% $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_LIBADD)

diff --git a/lib/am/ltlibrary.am b/lib/am/ltlibrary.am
index 0c6f4c6..642d032 100644 (file)
--- a/lib/am/ltlibrary.am
+++ b/lib/am/ltlibrary.am
@@ -13,5 +13,6 @@
 
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 %LTLIBRARY%: $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_DEPENDENCIES) $(EXTRA_%XLTLIBRARY%_DEPENDENCIES) %DIRSTAMP%
        %VERBOSE%$(%XLINK%) %RPATH% $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_LIBADD) $(LIBS)

diff --git a/lib/am/program.am b/lib/am/program.am
index c3b7962..131c4a9 100644 (file)
--- a/lib/am/program.am
+++ b/lib/am/program.am
@@ -13,6 +13,7 @@
 
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 %PROGRAM%%EXEEXT%: $(%XPROGRAM%_OBJECTS) $(%XPROGRAM%_DEPENDENCIES) $(EXTRA_%XPROGRAM%_DEPENDENCIES) %DIRSTAMP%
 ## Remove program before linking.  Otherwise the link will fail if the
 ## program is running somewhere.  FIXME: this could be a loss if

diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am
index f2a203f..979427d 100644 (file)
--- a/lib/am/remake-hdr.am
+++ b/lib/am/remake-hdr.am
@@ -15,9 +15,9 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 %CONFIG_H%: %STAMP%
-## Recover from removal of CONFIG_HEADER
-       @if test ! -f $@; then rm -f %STAMP%; else :; fi
-       @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) %STAMP%; else :; fi
+## Recover from removal of CONFIG_HEADER.
+       @test -f $@ || rm -f %STAMP%
+       @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) %STAMP%
 
 
 %STAMP%: %CONFIG_H_DEPS% $(top_builddir)/config.status

diff --git a/maintainer/maint.mk b/maintainer/maint.mk
index 56c52be..ac29a72 100644 (file)
--- a/maintainer/maint.mk
+++ b/maintainer/maint.mk
@@ -290,7 +290,11 @@ announcement: NEWS
          && X \
          && X "-*-*-*-" \
          && X \
-         && sed -n -e '/^~~~/q' -e p $(srcdir)/NEWS >> $@-t \
+         && $(AWK) '\
+               ($$0 == "New in $(VERSION):") { wait_for_end=1; } \
+               (/^~~~/ && wait_for_end) { exit(0) } \
+               { print } \
+            ' <$(srcdir)/NEWS >> $@-t \
          && mv -f $@-t $@
 .PHONY: announcement
 CLEANFILES += announcement

diff --git a/t/lex-multiple.sh b/t/lex-multiple.sh
index e1c71a1..7383eaf 100755 (executable)
--- a/t/lex-multiple.sh
+++ b/t/lex-multiple.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2012-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
@@ -43,11 +43,11 @@ liblex_a_SOURCES = 0.l
 
 # We need the output to always be named 'lex.yy.c', in order for
 # ylwrap to pick it up.
-liblex_foo_a_LFLAGS = -Pfoo --outfile=lex.yy.c
+liblex_foo_a_LFLAGS = -Pfoo -olex.yy.c
 liblex_foo_a_SOURCES = a.l
 
 # Ditto.
-liblex_bar_a_LFLAGS = -Pbar_ --outfile=lex.yy.c
+liblex_bar_a_LFLAGS = -Pbar_ -olex.yy.c
 liblex_bar_a_SOURCES = b.l
 END