configury: fold doc/Makefile.am into Makefile.am.

* doc/Makefile.am: Remove.
* Makefile.am: Reinstate rules here.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>

3 files changed, 27 insertions, 46 deletions

diff --git a/Makefile.am b/Makefile.am
index 3867254f..628bc092 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@
 config_aux_dir	= build-aux
 config_macro_dir= $(config_aux_dir)/m4
 
-SUBDIRS		= po m4/gnu . doc tests/gnu
+SUBDIRS		= po m4/gnu . tests/gnu
 
 ACLOCAL_AMFLAGS = -I build-aux/m4
 AUTOMAKE_OPTIONS = nostdinc
@@ -47,6 +47,7 @@ BUILT_SOURCES	=
 CLEANFILES	=
 DISTCLEANFILES	=
 MOSTLYCLEANFILES=
+MAINTAINERCLEANFILES =
 
 include_HEADERS	=
 noinst_LTLIBRARIES=
@@ -76,7 +77,7 @@ $(changelog): FORCE
 	  cat '$(changelog_old)' >> '$@';		\
 	fi
 
-MAINTAINERCLEANFILES = \
+MAINTAINERCLEANFILES += \
 		  ABOUT-NLS INSTALL Makefile.in aclocal.m4 \
 		  config-h.in configure stamp-h.in \
 		  po/cat-id-tbl.c po/m4.pot po/stamp-cat-id
@@ -245,6 +246,30 @@ dist-hook:
 EXTRA_DIST     += m4/system_.h
 
 
+## -------------- ##
+## Documentation. ##
+## -------------- ##
+info_TEXINFOS	= doc/m4.texi
+m4_TEXINFOS	= doc/regexprops-generic.texi doc/fdl-1.3.texi doc/gpl-3.0.texi
+dist_man_MANS	= $(srcdir)/doc/m4.1
+EXTRA_DIST	+= doc/gendocs_template
+MAINTAINERCLEANFILES += doc/gendocs_template
+HELP2MAN	= $(SHELL) $(top_srcdir)/$(config_aux_dir)/missing --run help2man
+
+# Build the man page once in the srcdir, rather than in every VPATH build
+# dir, to match how automake builds info pages.  This is safe for 'make
+# distcheck' since it is distributed pre-built.
+$(srcdir)/doc/m4.1: .version $(srcdir)/src/main.c
+	@echo "Updating the \`man' page \`$@'"; \
+	$(HELP2MAN) --name="macro processor" --source=FSF \
+	  --info-page=m4 --output=$@ src/m4$(EXEEXT)
+
+TAGS_FILES	= $(infos_TEXINFOS)
+TAGS_DEPENDENCIES = $(TAGS_FILES)
+ETAGS_ARGS	+= --language=none --regex='/@node \([^,]*\)/\1/' $(TAGS_FILES)
+
+MAINTAINERCLEANFILES += $(dist_man_MANS)
+
 ## --------- ##
 ## Examples. ##
 ## --------- ##
diff --git a/configure.ac b/configure.ac
index 70f39ae8..2fe6d9e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -280,7 +280,6 @@ M4_SYSCMD
 ## -------- ##
 AC_CONFIG_FILES([
 Makefile
-doc/Makefile
 m4/gnu/Makefile
 m4/system.h:m4/system_.h
 tests/atlocal
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 88787ea5..00000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-## Makefile.am - template for generating Makefile via Automake
-##
-## Copyright (C) 2009-2010, 2013 Free Software Foundation, Inc.
-##
-## This file is part of GNU M4.
-##
-## GNU M4 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.
-##
-## GNU M4 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/>.
-
-MAINTAINERCLEANFILES =
-EXTRA_DIST =
-config_aux_dir = build-aux
-
-info_TEXINFOS	= m4.texi
-m4_TEXINFOS	= regexprops-generic.texi fdl-1.3.texi gpl-3.0.texi
-dist_man_MANS	= $(srcdir)/m4.1
-EXTRA_DIST	+= gendocs_template
-MAINTAINERCLEANFILES += gendocs_template
-HELP2MAN	= $(SHELL) $(top_srcdir)/$(config_aux_dir)/missing --run help2man
-
-# Build the man page once in the srcdir, rather than in every VPATH build
-# dir, to match how automake builds info pages.  This is safe for 'make
-# distcheck' since it is distributed pre-built.
-$(srcdir)/m4.1: ../.version $(srcdir)/../src/main.c
-	@echo "Updating the \`man' page \`$@'"; \
-	$(HELP2MAN) --name="macro processor" --source=FSF \
-	  --info-page=m4 --output=$@ ../src/m4$(EXEEXT)
-
-TAGS_FILES	= $(infos_TEXINFOS)
-TAGS_DEPENDENCIES = $(TAGS_FILES)
-ETAGS_ARGS	= --language=none --regex='/@node \([^,]*\)/\1/' $(TAGS_FILES)
-
-MAINTAINERCLEANFILES += $(dist_man_MANS)