7 files changed, 75 insertions, 8 deletions
diff --git a/lib/am/Makefile.inc b/lib/am/Makefile.inc
new file mode 100644
index 000000000..da9468284
--- /dev/null
+++ b/lib/am/Makefile.inc
@@ -0,0 +1,65 @@
+## Included by top-level Makefile for Automake.
+
+## Copyright (C) 1995-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
+## 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/>.
+
+## --------------------- ##
+##  Makefile fragments.  ##
+## --------------------- ##
+
+amdir = @amdir@
+
+dist_am_DATA = \
+  %D%/check.am \
+  %D%/check2.am \
+  %D%/clean-hdr.am \
+  %D%/clean.am \
+  %D%/compile.am \
+  %D%/configure.am \
+  %D%/data.am \
+  %D%/dejagnu.am \
+  %D%/depend.am \
+  %D%/depend2.am \
+  %D%/distdir.am \
+  %D%/footer.am \
+  %D%/header-vars.am \
+  %D%/header.am \
+  %D%/install.am \
+  %D%/inst-vars.am \
+  %D%/java.am \
+  %D%/lang-compile.am \
+  %D%/lex.am \
+  %D%/library.am \
+  %D%/libs.am \
+  %D%/libtool.am \
+  %D%/lisp.am \
+  %D%/ltlib.am \
+  %D%/ltlibrary.am \
+  %D%/mans-vars.am \
+  %D%/mans.am \
+  %D%/program.am \
+  %D%/progs.am \
+  %D%/python.am \
+  %D%/remake-hdr.am \
+  %D%/scripts.am \
+  %D%/subdirs.am \
+  %D%/tags.am \
+  %D%/texi-vers.am \
+  %D%/texibuild.am \
+  %D%/texinfos.am \
+  %D%/vala.am \
+  %D%/yacc.am
+
+# vim: ft=automake noet
diff --git a/lib/am/check.am b/lib/am/check.am
index b39395c70..7012d5a2b 100644
--- 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 4b9cc04cb..1a6f28eb3 100644
--- 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 246298460..c01d221ef 100644
--- 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 0c6f4c63e..642d032ba 100644
--- 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 c3b79626e..131c4a9c6 100644
--- 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 f2a203f2d..979427d41 100644
--- 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