mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2025-02-11 13:51:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* lib/autoscan/Makefile.am: Delete, its contents merged ...
* lib/Makefile.am: ... in here, with proper adjustments.
(SUBDIRS): Drop 'autoscan'.
* configure.ac (AC_CONFIG_FILES): Drop 'lib/autoscan/Makefile'.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
This commit is contained in:
Stefano Lattarini 2013-05-05 17:35:51 +02:00
parent 0e7ac8501f
commit 16d8b403b5
3 changed files with 30 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -207,7 +207,7 @@ 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 lib/autoscan/Makefile
lib/Makefile lib/Autom4te/Makefile
lib/m4sugar/Makefile
lib/autoconf/Makefile lib/autotest/Makefile
])

31
lib/Makefile.am
View File

@ -15,7 +15,7 @@
# 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 autoscan
SUBDIRS = Autom4te m4sugar autoconf autotest
nodist_pkgdata_DATA = autom4te.cfg
EXTRA_DIST = autom4te.in
@ -43,10 +43,37 @@ autom4te.cfg: $(srcdir)/autom4te.in Makefile
chmod a-w autom4te.tmp
mv autom4te.tmp autom4te.cfg
# Make Autoconf Emacs library.
## ----------------------------- ##
## Make Autoconf Emacs library. ##
## ----------------------------- ##
dist_lisp_LISP = emacs/autoconf-mode.el emacs/autotest-mode.el
# TODO: This is required to work around a limitation in older
# Automake. Remove once we can assume Automake 1.13 or later.
CLEANFILES += autoconf-mode.elc autotest-mode.elc
## ----------------------- ##
## Make Autoscan library. ##
## ----------------------- ##
autoscanlibdir = $(pkgdatadir)/autoscan
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' >$@
sed '/^[#]/!q' $(srcdir)/autoscan/autoscan.pre >>$@
( \
sed -n '/^[^#]/p' $(srcdir)/autoscan/autoscan.pre; \
$(MY_AUTOM4TE) --cache '' -M -l autoconf -t'AN_OUTPUT:$$1: $$2 $$3' \
) | LC_ALL=C sort >>$@

40
lib/autoscan/Makefile.am
View File

@ -1,40 +0,0 @@
# Make Autoscan 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/>.
autoscanlibdir = $(pkgdatadir)/autoscan
EXTRA_DIST = autoscan.pre
nodist_autoscanlib_DATA = autoscan.list
CLEANFILES = autoscan.list
## ------------------------ ##
## Building 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 ../freeze.mk
autoscan.list: $(srcdir)/autoscan.pre $(autoconf_m4f_dependencies) Makefile.am
echo '# Automatically Generated: do not edit this file' >autoscan.list
sed '/^[#]/!q' $(srcdir)/autoscan.pre >>autoscan.list
( \
sed -n '/^[^#]/p' $(srcdir)/autoscan.pre; \
$(MY_AUTOM4TE) --cache '' -M -l autoconf -t'AN_OUTPUT:$$1: $$2 $$3' \
) | LC_ALL=C sort >>autoscan.list