build: no more recursion for 'lib/autotest' subdir

* lib/autotest/Makefile.am: Delete, its contents merged ...
* lib/Makefile.am: ... in here, with proper adjustments.
(SUBDIRS): Drop 'autotest'.
Other minor related modifications.
* configure.ac (AC_CONFIG_FILES): Drop 'lib/autotest/Makefile'.
* lib/freeze.mk (MY_AUTOM4TE): Small required adjustments.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
This commit is contained in:
Stefano Lattarini 2013-05-05 18:10:15 +02:00
parent 16d8b403b5
commit 6cef85e8d6
4 changed files with 33 additions and 55 deletions

View File

@ -209,7 +209,7 @@ AC_CONFIG_LINKS([GNUmakefile:GNUmakefile])
AC_CONFIG_FILES([Makefile
lib/Makefile lib/Autom4te/Makefile
lib/m4sugar/Makefile
lib/autoconf/Makefile lib/autotest/Makefile
lib/autoconf/Makefile
])
AC_OUTPUT

View File

@ -15,7 +15,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
SUBDIRS = Autom4te m4sugar autoconf autotest
## Required by rules to build autoscan and autotest libraries.
include $(srcdir)/freeze.mk
SUBDIRS = Autom4te m4sugar autoconf
nodist_pkgdata_DATA = autom4te.cfg
EXTRA_DIST = autom4te.in
@ -63,12 +66,6 @@ EXTRA_DIST += autoscan/autoscan.pre
nodist_autoscanlib_DATA = autoscan/autoscan.list
CLEANFILES += autoscan/autoscan.list
## autoscan.list might change when autoconf.m4f sources change.
## Therefore we want the same dependencies as autoconf.m4f, which
## are listed in freeze.mk. It also ensure that tests/autom4te
## is built (we need it in the command below).
include $(srcdir)/freeze.mk
autoscan/autoscan.list: $(srcdir)/autoscan/autoscan.pre $(autoconf_m4f_dependencies) Makefile.am
$(MKDIR_P) $(@D)
echo '# Automatically Generated: do not edit this file' >$@
@ -77,3 +74,29 @@ autoscan/autoscan.list: $(srcdir)/autoscan/autoscan.pre $(autoconf_m4f_dependenc
sed -n '/^[^#]/p' $(srcdir)/autoscan/autoscan.pre; \
$(MY_AUTOM4TE) --cache '' -M -l autoconf -t'AN_OUTPUT:$$1: $$2 $$3' \
) | LC_ALL=C sort >>$@
## ----------------------- ##
## Make Autotest library. ##
## ----------------------- ##
autotestlibdir = $(pkgdatadir)/autotest
dist_autotestlib_DATA = \
autotest/autotest.m4 \
autotest/general.m4 \
autotest/specific.m4
nodist_autotestlib_DATA = autotest/autotest.m4f
CLEANFILES += $(nodist_autotestlib_DATA)
## Building TAGS.
TAGS_FILES = $(dist_autotestlib_DATA)
ETAGS_ARGS = $(ETAGS_FOR_AUTOCONF)
## Checks.
check-local: check-forbidden-patterns
forbidden_patterns = -e '^_*EOF' -e ' cmp '
forbidden_patterns_files = $(dist_autotestlib_DATA)
## The frozen files.
autotest/autotest.m4f: $(autotest_m4f_dependencies)

View File

@ -1,46 +0,0 @@
# Make Autotest library.
# Copyright (C) 2001-2002, 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/>.
autotestlibdir = $(pkgdatadir)/autotest
dist_autotestlib_DATA = autotest.m4 general.m4 specific.m4
nodist_autotestlib_DATA = autotest.m4f
CLEANFILES = $(nodist_autotestlib_DATA)
## --------------- ##
## Building TAGS. ##
## --------------- ##
TAGS_FILES = $(dist_autotestlib_DATA)
ETAGS_ARGS = $(ETAGS_FOR_AUTOCONF)
## -------- ##
## Checks. ##
## -------- ##
check-local: check-forbidden-patterns
forbidden_patterns = -e '^_*EOF' -e ' cmp '
forbidden_patterns_files = $(dist_autotestlib_DATA)
## ------------------ ##
## The frozen files. ##
## ------------------ ##
autotest.m4f: $(autotest_m4f_dependencies)
include ../freeze.mk

View File

@ -42,8 +42,9 @@ MY_AUTOM4TE = \
# It may happen that the output does not end with an end of line, hence
# force an end of line when reporting errors.
.m4.m4f:
$(MKDIR_P) $(@D)
$(MY_AUTOM4TE) \
--language=$* \
--language=$(*F) \
--freeze \
--output=$@