diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-05 16:14:06 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-06 12:22:00 +0200 |
commit | ac62b53ff750ec88fa2939ef447657ff02d06372 (patch) | |
tree | 783e6d0bc5ff4bc608377da49ac209a165238924 | |
parent | 3184ecc1877108af7ea82dbc17bf223c68b03708 (diff) | |
download | autoconf-ac62b53ff750ec88fa2939ef447657ff02d06372.tar.gz |
build: no more make recursion for 'doc' subdir
* .gitignore: Adjust.
* Makefile.am ($(srcdir)/doc/local.mk): New include.
(SUBDIRS): Drop 'doc'.
(AM_MAKEINFOFLAGS): Rename ...
(custom_MAKEINFOFLAGS): ... like this, to avoid conflicting with
the AM_MAKEINFOFLAGS defined in the included 'doc/local.mk'
($(srcdir)/INSTALL): Adjust recipe.
* doc/Makefile.am: Rename ...
* doc/local.mk: ... like this, and adjust.
* configure.ac (AC_CONFIG_FILES): Drop 'doc/Makefile'.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
-rw-r--r-- | .gitignore | 35 | ||||
-rw-r--r-- | Makefile.am | 8 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | doc/local.mk (renamed from doc/Makefile.am) | 28 |
4 files changed, 56 insertions, 17 deletions
@@ -1,9 +1,36 @@ *.log *.m4f *.tmp +*.AC +*.ACs +*.AT +*.ATs +*.CA +*.CAs +*.MS +*.MSs +*.aux +*.cp +*.cps +*.cv +*.cvs +*.ev +*.evs +*.fn +*.fns +*.ky +*.ov +*.ovs +*.pg +*.pr +*.prs +*.toc +*.tp +*.vr *~ .#* .version +.dirstamp CVS /ChangeLog /Fetchdir @@ -32,15 +59,15 @@ Makefile.in /config.status /configure /configure.scan -/doc/*.?? -!/doc/Makefile.am -/doc/*.??? -/doc/*.html /doc/*.info* /doc/manual /doc/stamp-vti /doc/standards /doc/version.texi +/doc/*.dvi +/doc/*.html +/doc/*.pdf +/doc/*.ps /lib/autom4te.cfg /lib/autoscan/autoscan.list /lib/emacs/*.elc diff --git a/Makefile.am b/Makefile.am index b599499e..757d8bce 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,7 @@ # bin/ must be run first, as it builds executables needed for tests. # autom4te uses autotest.m4f to generate 'testsuite', so build tests last. # Rules in man/ use scripts from both bin/ and tests/, so *it* goes last. -SUBDIRS = bin . lib doc tests man +SUBDIRS = bin . lib tests man ACLOCAL_AMFLAGS = -I m4 @@ -35,7 +35,7 @@ EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 ChangeLog.3 \ ## INSTALL. ## ## --------- ## -AM_MAKEINFOFLAGS = --no-headers --no-validate --no-split +custom_MAKEINFOFLAGS = --no-headers --no-validate --no-split if MAKE_CASE_SENSITIVE pkgdata_DATA = $(srcdir)/INSTALL @@ -49,7 +49,7 @@ CONVERT_QUOTES = "s/\`\([^']*\)'/'\1'/g" $(srcdir)/INSTALL: $(top_srcdir)/doc/install.texi echo @firstparagraphindent insert \ | cat - $(top_srcdir)/doc/install.texi > tmp.texi - $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ + $(MAKEINFO) $(custom_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ --plaintext tmp.texi \ | sed -e $(CONVERT_QUOTES) -e $(OMIT_TRAILING_EMPTY_LINES) \ > $@-t && mv $@-t $@ @@ -102,6 +102,8 @@ dist-hook: gen-ChangeLog distclean-local: if test x"$(VPATH)" != x ; then rm -f GNUmakefile ; fi +include $(srcdir)/doc/local.mk + # Perl coverage statistics. PERL_COVERAGE_DB = `pwd`/cover_db PERL_COVERAGE_FLAGS = -MDevel::Cover=-db,$(PERL_COVERAGE_DB),-silent,on,-summary,off diff --git a/configure.ac b/configure.ac index 1336934a..437206c3 100644 --- a/configure.ac +++ b/configure.ac @@ -207,7 +207,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 doc/Makefile +AC_CONFIG_FILES([Makefile lib/Makefile lib/Autom4te/Makefile lib/autoscan/Makefile lib/m4sugar/Makefile lib/autoconf/Makefile lib/autotest/Makefile diff --git a/doc/Makefile.am b/doc/local.mk index 4ee8c46c..81298ed7 100644 --- a/doc/Makefile.am +++ b/doc/local.mk @@ -17,17 +17,27 @@ AM_MAKEINFOFLAGS = --no-split TEXI2HTML_FLAGS = -split_chapter -TEXINFO_TEX = ../build-aux/texinfo.tex +TEXINFO_TEX = build-aux/texinfo.tex -info_TEXINFOS = autoconf.texi standards.texi -autoconf_TEXINFOS = fdl.texi install.texi -standards_TEXINFOS = fdl.texi gnu-oids.texi make-stds.texi +info_TEXINFOS = doc/autoconf.texi doc/standards.texi +doc_autoconf_TEXINFOS = doc/fdl.texi doc/install.texi +doc_standards_TEXINFOS = doc/fdl.texi doc/gnu-oids.texi doc/make-stds.texi -EXTRA_DIST = gendocs_template +EXTRA_DIST += doc/gendocs_template # Files from texi2dvi that should be removed, but which Automake does # not know. -CLEANFILES = autoconf.ACs autoconf.cvs autoconf.MSs autoconf.prs \ - autoconf.ATs autoconf.evs autoconf.fns autoconf.ovs \ - autoconf.ca autoconf.CA autoconf.cas autoconf.CAs \ - autoconf.tmp +CLEANFILES = \ + autoconf.ACs \ + autoconf.cvs \ + autoconf.MSs \ + autoconf.prs \ + autoconf.ATs \ + autoconf.evs \ + autoconf.fns \ + autoconf.ovs \ + autoconf.ca \ + autoconf.CA \ + autoconf.cas \ + autoconf.CAs \ + autoconf.tmp |