Merge updated automake files from master into with-autogenerated

Makefile.am

@@ -32,3 +32,6 @@ ACLOCAL_AMFLAGS = -I m4
 
 # Subdirectories to recurse into
 SUBDIRS = lib src doc m4
+
+# Additional files to distribute
+EXTRA_DIST = build-aux/bootstrap

build-aux/Makefile.am

@@ -1,41 +0,0 @@
-#########################################################################
-#                                                                       #
-#             Star Traders: A Game of Interstellar Trading              #
-#                Copyright (C) 1990-2011, John Zaitseff                 #
-#                                                                       #
-#########################################################################
-
-# Author: John Zaitseff <J.Zaitseff@zap.org.au>
-# $Id$
-#
-# This file, build-aux/Makefile.am, contains the auxiliary build
-# directory Makefile for Star Traders.  It needs to be processed by
-# automake to produce the corresponding Makefile.in.
-#
-#
-# 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 3 of the License, 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/.
-
-
-EXTRA_DIST = \
-	README			\
-	bootstrap		\
-	config.guess		\
-	config.sub		\
-	depcomp			\
-	install-sh		\
-	missing			\
-	snippet/arg-nonnull.h	\
-	snippet/c++defs.h	\
-	snippet/warn-on-use.h	\
-	snippet/_Noreturn.h

configure.ac

@@ -60,6 +60,5 @@ AC_CONFIG_FILES([
 	src/Makefile
 	doc/Makefile
 	m4/Makefile
-	build-aux/Makefile
 ])
 AC_OUTPUT