* lib/autoconf/Makefile.am: Delete, its contents merged ... * lib/Makefile.am: ... in here, with proper adjustments. (SUBDIRS): Drop 'autoconf'. * configure.ac (AC_CONFIG_FILES): Drop 'lib/autoconf/Makefile'.
Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com> --- configure.ac | 1 - lib/Makefile.am | 41 ++++++++++++++++++++++++++++++++++-- lib/autoconf/Makefile.am | 54 ------------------------------------------------ 3 files changed, 39 insertions(+), 57 deletions(-) delete mode 100644 lib/autoconf/Makefile.am diff --git a/configure.ac b/configure.ac index 79ff609..f045af9 100644 --- a/configure.ac +++ b/configure.ac @@ -208,7 +208,6 @@ AC_CONFIG_LINKS([GNUmakefile:GNUmakefile]) AC_CONFIG_FILES([Makefile lib/Makefile lib/Autom4te/Makefile - lib/autoconf/Makefile ]) AC_OUTPUT diff --git a/lib/Makefile.am b/lib/Makefile.am index 832693a..5dedc67 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -27,7 +27,7 @@ check-local: check-forbidden-patterns forbidden_patterns = -e '^_*EOF' -e ' cmp ' forbidden_patterns_files = # Incrementally updated later. -SUBDIRS = Autom4te autoconf +SUBDIRS = Autom4te ## ------------------------------------------ ## ## Make Autom4te default configuration file. ## @@ -71,9 +71,46 @@ dist_lisp_LISP = emacs/autoconf-mode.el emacs/autotest-mode.el CLEANFILES += autoconf-mode.elc autotest-mode.elc ## ----------------------- ## -## Make Autoscan library. ## +## Make Autoconf library. ## ## ----------------------- ## +autoconflibdir = $(pkgdatadir)/autoconf + +dist_autoconflib_DATA = \ + autoconf/autoconf.m4 \ + autoconf/general.m4 \ + autoconf/status.m4 \ + autoconf/oldnames.m4 \ + autoconf/specific.m4 \ + autoconf/autoheader.m4 \ + autoconf/autoupdate.m4 \ + autoconf/autotest.m4 \ + autoconf/autoscan.m4 \ + autoconf/lang.m4 \ + autoconf/c.m4 \ + autoconf/erlang.m4 \ + autoconf/fortran.m4 \ + autoconf/functions.m4 \ + autoconf/go.m4 \ + autoconf/headers.m4 \ + autoconf/types.m4 \ + autoconf/libs.m4 \ + autoconf/programs.m4 + +nodist_autoconflib_DATA = autoconf/autoconf.m4f +CLEANFILES += $(nodist_autoconflib_DATA) + +TAGS_FILES += $(dist_autoconflib_DATA) +ETAGS_ARGS += $(ETAGS_FOR_AUTOCONF) + +forbidden_patterns_files += $(dist_autoconflib_DATA) + +autoconf/autoconf.m4f: $(autoconf_m4f_dependencies) + +## ------------------------ ## +## Make Autoscan library. ## +## ------------------------ ## + autoscanlibdir = $(pkgdatadir)/autoscan EXTRA_DIST += autoscan/autoscan.pre diff --git a/lib/autoconf/Makefile.am b/lib/autoconf/Makefile.am deleted file mode 100644 index a6ec393..0000000 --- a/lib/autoconf/Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ -# Make Autoconf library. - -# Copyright (C) 2001-2002, 2006, 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/>. - -autoconflibdir = $(pkgdatadir)/autoconf -dist_autoconflib_DATA = \ - autoconf.m4 \ - general.m4 status.m4 oldnames.m4 specific.m4 \ - autoheader.m4 autoupdate.m4 autotest.m4 autoscan.m4 \ - lang.m4 c.m4 erlang.m4 fortran.m4 \ - functions.m4 go.m4 headers.m4 types.m4 libs.m4 programs.m4 - -nodist_autoconflib_DATA = autoconf.m4f -CLEANFILES = $(nodist_autoconflib_DATA) - - -## --------------- ## -## Building TAGS. ## -## --------------- ## - -TAGS_FILES = $(dist_autoconflib_DATA) - -ETAGS_ARGS = $(ETAGS_FOR_AUTOCONF) - - -## -------- ## -## Checks. ## -## -------- ## - -check-local: check-forbidden-patterns -forbidden_patterns = -e '^_*EOF' -e ' cmp ' -forbidden_patterns_files = $(dist_autoconflib_DATA) - - -## ------------------ ## -## The frozen files. ## -## ------------------ ## - -autoconf.m4f: $(autoconf_m4f_dependencies) -include ../freeze.mk -- 1.8.3.rc0.19.g7e6a0cc