support generating multi-html pages in parallel

Use the pattern from other projects where we generate the html pages
in a dir named the same as the project.  So now we have:
gas/doc/gas.html - single html page
gas/doc/gas/ - multiple html pages

This works for projects that have a doc/ subdir already, but gprof &
ld require a little tweaking since they generate their docs in their
respective toplevels.
This commit is contained in:
Mike Frysinger 2021-05-02 12:50:39 -04:00
parent 2faf902da5
commit cf758b3960
15 changed files with 106 additions and 27 deletions

View File

@ -1,3 +1,8 @@
2021-05-08 Mike Frysinger <vapier@gentoo.org>
* doc/Makefile.am (html-local, bfd/index.html): New targets.
* doc/Makefile.in: Regenerate.
2021-05-08 Mike Frysinger <vapier@gentoo.org>
* doc/Makefile.am (AM_MAKEINFOFLAGS): Define.

View File

@ -369,4 +369,9 @@ MAINTAINERCLEANFILES = $(DOCFILES)
# cygnus option.
install: install-info
html-local: bfd/index.html
bfd/index.html: bfd.texi $(bfd_TEXINFOS)
$(AM_V_at)$(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) \
--split=node -I$(srcdir) $(srcdir)/bfd.texi
MAINTAINERCLEANFILES += bfd.info

View File

@ -765,7 +765,7 @@ dvi-am: $(DVIS)
html: html-am
html-am: $(HTMLS)
html-am: $(HTMLS) html-local
info: info-am
@ -916,12 +916,12 @@ uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
.PHONY: all all-am check check-am clean clean-aminfo clean-generic \
clean-libtool cscopelist-am ctags-am dist-info distclean \
distclean-generic distclean-libtool distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-pdf install-pdf-am \
install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
html-am html-local info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-pdf \
install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-aminfo maintainer-clean-generic mostlyclean \
mostlyclean-aminfo mostlyclean-generic mostlyclean-libtool pdf \
pdf-am ps ps-am tags-am uninstall uninstall-am \
@ -1168,6 +1168,11 @@ bfdver.texi: $(srcdir)/Makefile.in
# cygnus option.
install: install-info
html-local: bfd/index.html
bfd/index.html: bfd.texi $(bfd_TEXINFOS)
$(AM_V_at)$(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) \
--split=node -I$(srcdir) $(srcdir)/bfd.texi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -1,3 +1,8 @@
2021-05-08 Mike Frysinger <vapier@gentoo.org>
* doc/Makefile.am (html-local, binutils/index.html): New targets.
* doc/Makefile.in: Regenerate.
2021-05-08 Mike Frysinger <vapier@gentoo.org>
* doc/Makefile.am (AM_MAKEINFOFLAGS): Add --no-split.

View File

@ -175,6 +175,11 @@ $(DEMANGLER_NAME).1: cxxfilt.man Makefile
-e 's/cxxfilt/$(DEMANGLER_NAME)/' < $$man \
> $(DEMANGLER_NAME).1
html-local: binutils/index.html
binutils/index.html: binutils.texi $(binutils_TEXINFOS)
$(AM_V_at)$(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) \
--split=node -I$(srcdir) $(srcdir)/binutils.texi
# Maintenance
# We need it for the taz target in ../../Makefile.in.

View File

@ -745,7 +745,7 @@ dvi-am: $(DVIS)
html: html-am
html-am: $(HTMLS)
html-am: $(HTMLS) html-local
info: info-am
@ -898,7 +898,7 @@ uninstall-man: uninstall-man1
.PHONY: all all-am check check-am clean clean-aminfo clean-generic \
clean-libtool cscopelist-am ctags-am dist-info distclean \
distclean-generic distclean-libtool distdir dvi dvi-am html \
html-am info info-am info-local install install-am \
html-am html-local info info-am info-local install install-am \
install-data install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-man1 \
@ -1030,6 +1030,11 @@ $(DEMANGLER_NAME).1: cxxfilt.man Makefile
-e 's/cxxfilt/$(DEMANGLER_NAME)/' < $$man \
> $(DEMANGLER_NAME).1
html-local: binutils/index.html
binutils/index.html: binutils.texi $(binutils_TEXINFOS)
$(AM_V_at)$(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) \
--split=node -I$(srcdir) $(srcdir)/binutils.texi
# Maintenance
# We need it for the taz target in ../../Makefile.in.

View File

@ -1,3 +1,8 @@
2021-05-08 Mike Frysinger <vapier@gentoo.org>
* doc/Makefile.am (html-local, as/index.html): New targets.
* doc/Makefile.in: Regenerate.
2021-05-08 Mike Frysinger <vapier@gentoo.org>
* doc/Makefile.am (AM_MAKEINFOFLAGS): Add --no-split.

View File

@ -133,4 +133,9 @@ as.1: $(srcdir)/as.texi asconfig.texi $(CPU_DOCS)
(rm -f $@.T$$$$ && exit 1)
rm -f as.pod
html-local: as/index.html
as/index.html: as.texi $(as_TEXINFOS)
$(AM_V_at)$(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) \
--split=node -I$(srcdir) $(srcdir)/as.texi
MAINTAINERCLEANFILES += as.info

View File

@ -772,7 +772,7 @@ dvi-am: $(DVIS)
html: html-am
html-am: $(HTMLS)
html-am: $(HTMLS) html-local
info: info-am
@ -925,7 +925,7 @@ uninstall-man: uninstall-man1
.PHONY: all all-am check check-am clean clean-aminfo clean-generic \
clean-libtool cscopelist-am ctags-am dist-info distclean \
distclean-generic distclean-libtool distdir dvi dvi-am html \
html-am info info-am info-local install install-am \
html-am html-local info info-am info-local install install-am \
install-data install-data-am install-data-local install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
@ -967,6 +967,11 @@ as.1: $(srcdir)/as.texi asconfig.texi $(CPU_DOCS)
(rm -f $@.T$$$$ && exit 1)
rm -f as.pod
html-local: as/index.html
as/index.html: as.texi $(as_TEXINFOS)
$(AM_V_at)$(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) \
--split=node -I$(srcdir) $(srcdir)/as.texi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -1,3 +1,8 @@
2021-05-08 Mike Frysinger <vapier@gentoo.org>
* Makefile.am (html-local, doc/gprof/index.html): New targets.
* Makefile.in: Regenerate.
2021-05-08 Mike Frysinger <vapier@gentoo.org>
* Makefile.am (AM_MAKEINFOFLAGS): Add --no-split.

View File

@ -103,4 +103,10 @@ gprof.1: $(srcdir)/gprof.texi config.texi
(rm -f $@.T$$$$ && exit 1)
rm -f gprof.pod
html-local: doc/gprof/index.html
doc/gprof/index.html: gprof.texi $(gprof_TEXINFOS)
$(MKDIR_P) doc
$(AM_V_at)$(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) \
--split=node -I$(srcdir) $(srcdir)/gprof.texi -o doc/gprof
MAINTAINERCLEANFILES = gprof.info

View File

@ -992,7 +992,7 @@ dvi-am: $(DVIS)
html: html-recursive
html-am: $(HTMLS)
html-am: $(HTMLS) html-local
info: info-recursive
@ -1152,14 +1152,14 @@ uninstall-man: uninstall-man1
clean-binPROGRAMS clean-cscope clean-generic clean-libtool \
cscope cscopelist-am ctags ctags-am dist-info distclean \
distclean-compile distclean-generic distclean-hdr \
distclean-libtool distclean-tags dvi dvi-am html html-am info \
info-am install install-am install-binPROGRAMS install-data \
install-data-am install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-man1 install-pdf \
install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs installdirs-am \
maintainer-clean maintainer-clean-aminfo \
distclean-libtool distclean-tags dvi dvi-am html html-am \
html-local info info-am install install-am install-binPROGRAMS \
install-data install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-man1 \
install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
installdirs-am maintainer-clean maintainer-clean-aminfo \
maintainer-clean-generic mostlyclean mostlyclean-aminfo \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
@ -1198,6 +1198,12 @@ gprof.1: $(srcdir)/gprof.texi config.texi
(rm -f $@.T$$$$ && exit 1)
rm -f gprof.pod
html-local: doc/gprof/index.html
doc/gprof/index.html: gprof.texi $(gprof_TEXINFOS)
$(MKDIR_P) doc
$(AM_V_at)$(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) \
--split=node -I$(srcdir) $(srcdir)/gprof.texi -o doc/gprof
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -1,3 +1,8 @@
2021-05-08 Mike Frysinger <vapier@gentoo.org>
* Makefile.am (html-local, doc/ld/index.html): New targets.
* Makefile.in: Regenerate.
2021-05-08 Mike Frysinger <vapier@gentoo.org>
* Makefile.am (AM_MAKEINFOFLAGS): Add --no-split.

View File

@ -1093,6 +1093,12 @@ diststuff: info $(EXTRA_DIST)
# ld.1 to support parallel build.
info-recursive: ld.1
html-local: doc/ld/index.html
doc/ld/index.html: ld.texi $(ld_TEXINFOS)
$(MKDIR_P) doc
$(AM_V_at)$(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) \
--split=node -I$(srcdir) $(srcdir)/ld.texi -o doc/ld
DISTCLEANFILES = site.exp development.exp enablings.exp site.bak stringify.sed
distclean-local:
rm -rf ldscripts

View File

@ -2013,7 +2013,7 @@ dvi-am: $(DVIS)
html: html-recursive
html-am: $(HTMLS)
html-am: $(HTMLS) html-local
info: info-recursive
@ -2176,12 +2176,12 @@ uninstall-man: uninstall-man1
cscopelist-am ctags ctags-am dist-info distclean \
distclean-DEJAGNU distclean-compile distclean-generic \
distclean-hdr distclean-libtool distclean-local distclean-tags \
dvi dvi-am html html-am info info-am install install-am \
install-bfdpluginLTLIBRARIES install-binPROGRAMS install-data \
install-data-am install-data-local install-dvi install-dvi-am \
install-exec install-exec-am install-exec-local install-html \
install-html-am install-info install-info-am install-man \
install-man1 install-pdf install-pdf-am install-ps \
dvi dvi-am html html-am html-local info info-am install \
install-am install-bfdpluginLTLIBRARIES install-binPROGRAMS \
install-data install-data-am install-data-local install-dvi \
install-dvi-am install-exec install-exec-am install-exec-local \
install-html install-html-am install-info install-info-am \
install-man install-man1 install-pdf install-pdf-am install-ps \
install-ps-am install-strip installcheck installcheck-am \
installdirs installdirs-am maintainer-clean \
maintainer-clean-aminfo maintainer-clean-generic mostlyclean \
@ -2686,6 +2686,12 @@ diststuff: info $(EXTRA_DIST)
# But info isn't a direct target. Make info-recursive to depend on
# ld.1 to support parallel build.
info-recursive: ld.1
html-local: doc/ld/index.html
doc/ld/index.html: ld.texi $(ld_TEXINFOS)
$(MKDIR_P) doc
$(AM_V_at)$(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) \
--split=node -I$(srcdir) $(srcdir)/ld.texi -o doc/ld
distclean-local:
rm -rf ldscripts