[PATCH v2 10/17] build: no more recursion for 'lib/Autom4te' subdir

* lib/Autom4te/Makefile.am: Delete, its contents merged ...
* lib/Makefile.am: ... in here, with proper adjustments.
(SUBDIRS): Delete (last component 'Autom4te' has been dropped).
* configure.ac (AC_CONFIG_FILES): Drop 'lib/Autom4te/Makefile'.

Signed-off-by: Stefano Lattarini <[email protected]>
---
 configure.ac             |  4 +---
 lib/Autom4te/Makefile.am | 37 -------------------------------------
 lib/Makefile.am          | 20 +++++++++++++++++++-
 3 files changed, 20 insertions(+), 41 deletions(-)
 delete mode 100644 lib/Autom4te/Makefile.am

diff --git a/configure.ac b/configure.ac
index f045af9..b3f3fa9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -206,9 +206,7 @@ AC_PROG_MAKE_CASE_SENSITIVE
 dnl Allow maintainer rules under GNU make even in VPATH builds.
 AC_CONFIG_LINKS([GNUmakefile:GNUmakefile])
 
-AC_CONFIG_FILES([Makefile
-		 lib/Makefile lib/Autom4te/Makefile
-		 ])
+AC_CONFIG_FILES([Makefile lib/Makefile])
 
 AC_OUTPUT
 # Report the state of this version of Autoconf if this is a beta.
diff --git a/lib/Autom4te/Makefile.am b/lib/Autom4te/Makefile.am
deleted file mode 100644
index 4a2c6bf..0000000
--- a/lib/Autom4te/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-## Process this file with automake to create Makefile.in
-
-# Copyright (C) 2001, 2003, 2009-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 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/>.
-
-perllibdir = $(pkgdatadir)/Autom4te
-dist_perllib_DATA = \
-  C4che.pm \
-  ChannelDefs.pm \
-  Channels.pm \
-  Configure_ac.pm \
-  FileUtils.pm \
-  General.pm \
-  Getopt.pm \
-  Request.pm \
-  XFile.pm
-
-
-## --------------- ##
-## Building TAGS.  ##
-## --------------- ##
-
-TAGS_FILES = $(dist_perllib_DATA)
-
-ETAGS_ARGS = --lang=perl
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5dedc67..1004622 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -27,7 +27,25 @@ check-local: check-forbidden-patterns
 forbidden_patterns = -e '^_*EOF' -e ' cmp '
 forbidden_patterns_files = # Incrementally updated later.
 
-SUBDIRS = Autom4te
+## ---------------------------------------------------------------- ##
+## Auxiliary perl modules used by autom4te and other perl scripts.  ##
+## ---------------------------------------------------------------- ##
+
+perllibdir = $(pkgdatadir)/Autom4te
+
+dist_perllib_DATA = \
+  Autom4te/C4che.pm \
+  Autom4te/ChannelDefs.pm \
+  Autom4te/Channels.pm \
+  Autom4te/Configure_ac.pm \
+  Autom4te/FileUtils.pm \
+  Autom4te/General.pm \
+  Autom4te/Getopt.pm \
+  Autom4te/Request.pm \
+  Autom4te/XFile.pm
+
+TAGS_FILES += $(dist_perllib_DATA)
+ETAGS_ARGS += --lang=perl
 
 ## ------------------------------------------ ##
 ## Make Autom4te default configuration file.  ##
-- 
1.8.3.rc0.19.g7e6a0cc