Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com> --- .gitignore | 35 +++++++++++++++++++++++++++++++---- Makefile.am | 8 +++++--- configure.ac | 2 +- doc/{Makefile.am => local.mk} | 28 +++++++++++++++++++--------- 4 files changed, 56 insertions(+), 17 deletions(-) rename doc/{Makefile.am => local.mk} (64%)
diff --git a/.gitignore b/.gitignore index b40b90a..033b037 100644 --- a/.gitignore +++ b/.gitignore @@ -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 b599499..757d8bc 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 1336934..437206c 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 similarity index 64% rename from doc/Makefile.am rename to doc/local.mk index 4ee8c46..81298ed 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 -- 1.8.3.rc0.19.g7e6a0cc