From cf758b396026089fe2684afcc5ccd6bd3b7923c0 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 2 May 2021 12:50:39 -0400 Subject: [PATCH] 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. --- bfd/ChangeLog | 5 +++++ bfd/doc/Makefile.am | 5 +++++ bfd/doc/Makefile.in | 19 ++++++++++++------- binutils/ChangeLog | 5 +++++ binutils/doc/Makefile.am | 5 +++++ binutils/doc/Makefile.in | 9 +++++++-- gas/ChangeLog | 5 +++++ gas/doc/Makefile.am | 5 +++++ gas/doc/Makefile.in | 9 +++++++-- gprof/ChangeLog | 5 +++++ gprof/Makefile.am | 6 ++++++ gprof/Makefile.in | 24 +++++++++++++++--------- ld/ChangeLog | 5 +++++ ld/Makefile.am | 6 ++++++ ld/Makefile.in | 20 +++++++++++++------- 15 files changed, 106 insertions(+), 27 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 77bec4440b3..376e8fd540c 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2021-05-08 Mike Frysinger + + * doc/Makefile.am (html-local, bfd/index.html): New targets. + * doc/Makefile.in: Regenerate. + 2021-05-08 Mike Frysinger * doc/Makefile.am (AM_MAKEINFOFLAGS): Define. diff --git a/bfd/doc/Makefile.am b/bfd/doc/Makefile.am index 22bb654b906..631e6abea61 100644 --- a/bfd/doc/Makefile.am +++ b/bfd/doc/Makefile.am @@ -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 diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in index ab3efe9f3fa..0724b77826d 100644 --- a/bfd/doc/Makefile.in +++ b/bfd/doc/Makefile.in @@ -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: diff --git a/binutils/ChangeLog b/binutils/ChangeLog index bef66bf9e50..2c6b4271730 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2021-05-08 Mike Frysinger + + * doc/Makefile.am (html-local, binutils/index.html): New targets. + * doc/Makefile.in: Regenerate. + 2021-05-08 Mike Frysinger * doc/Makefile.am (AM_MAKEINFOFLAGS): Add --no-split. diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am index eb42b238f4e..ba53f92560b 100644 --- a/binutils/doc/Makefile.am +++ b/binutils/doc/Makefile.am @@ -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. diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in index 681eff3fb44..024a642e799 100644 --- a/binutils/doc/Makefile.in +++ b/binutils/doc/Makefile.in @@ -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. diff --git a/gas/ChangeLog b/gas/ChangeLog index 60ea990f1fa..5892659c905 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2021-05-08 Mike Frysinger + + * doc/Makefile.am (html-local, as/index.html): New targets. + * doc/Makefile.in: Regenerate. + 2021-05-08 Mike Frysinger * doc/Makefile.am (AM_MAKEINFOFLAGS): Add --no-split. diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am index 34ff5d5b543..f2c6654e89d 100644 --- a/gas/doc/Makefile.am +++ b/gas/doc/Makefile.am @@ -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 diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in index 369f74f3188..89d2ca067eb 100644 --- a/gas/doc/Makefile.in +++ b/gas/doc/Makefile.in @@ -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: diff --git a/gprof/ChangeLog b/gprof/ChangeLog index e8fc312b1ec..24deb11f95b 100644 --- a/gprof/ChangeLog +++ b/gprof/ChangeLog @@ -1,3 +1,8 @@ +2021-05-08 Mike Frysinger + + * Makefile.am (html-local, doc/gprof/index.html): New targets. + * Makefile.in: Regenerate. + 2021-05-08 Mike Frysinger * Makefile.am (AM_MAKEINFOFLAGS): Add --no-split. diff --git a/gprof/Makefile.am b/gprof/Makefile.am index 4ed2f29584e..5a267075383 100644 --- a/gprof/Makefile.am +++ b/gprof/Makefile.am @@ -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 diff --git a/gprof/Makefile.in b/gprof/Makefile.in index b40040684d6..0f766a3660c 100644 --- a/gprof/Makefile.in +++ b/gprof/Makefile.in @@ -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: diff --git a/ld/ChangeLog b/ld/ChangeLog index b8b5c188f89..b7a6adc372a 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2021-05-08 Mike Frysinger + + * Makefile.am (html-local, doc/ld/index.html): New targets. + * Makefile.in: Regenerate. + 2021-05-08 Mike Frysinger * Makefile.am (AM_MAKEINFOFLAGS): Add --no-split. diff --git a/ld/Makefile.am b/ld/Makefile.am index cb90dae5313..0314a58a5a3 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -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 diff --git a/ld/Makefile.in b/ld/Makefile.in index b654700045f..211e62000a7 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -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 -- 2.30.2