[1/3] generate single html manual page by default

Message ID 20210502170743.6488-1-vapier@gentoo.org
State New
Headers show
Series
  • [1/3] generate single html manual page by default
Related show

Commit Message

H.J. Lu via Binutils May 2, 2021, 5:07 p.m.
This better matches other GNU projects like autoconf/automake where
the html manual is the single page form.  We'll support the multi-page
form in a follow up change.
---
 bfd/doc/Makefile.am      | 3 +++
 bfd/doc/Makefile.in      | 2 ++
 binutils/doc/Makefile.am | 4 +++-
 binutils/doc/Makefile.in | 4 +++-
 gas/doc/Makefile.am      | 4 +++-
 gas/doc/Makefile.in      | 4 +++-
 gprof/Makefile.am        | 4 +++-
 gprof/Makefile.in        | 5 ++++-
 ld/Makefile.am           | 3 ++-
 ld/Makefile.in           | 3 ++-
 10 files changed, 28 insertions(+), 8 deletions(-)

-- 
2.31.1

Comments

H.J. Lu via Binutils May 2, 2021, 5:21 p.m. | #1
On 02 May 2021 13:07, Mike Frysinger via Binutils wrote:
> --- a/bfd/doc/Makefile.am

> +++ b/bfd/doc/Makefile.am

> @@ -71,6 +71,9 @@ TEXIDIR = $(srcdir)/../../texinfo/fsf

>  info_TEXINFOS = bfd.texi

>  bfd_TEXINFOS = $(DOCFILES) bfdsumm.texi

>  

> +AM_MAKEINFOFLAGS_no_split = --no-split

> +AM_MAKEINFOFLAGS = $(AM_MAKEINFOFLAGS_no_split)


i might not need the sep AM_MAKEINFOFLAGS_no_split after all.  i was
playing with things in earlier revisions that needed a sep var, but i
only noticed after sending it out that i can collapse it now.
-mike

Patch

diff --git a/bfd/doc/Makefile.am b/bfd/doc/Makefile.am
index 36e35277445d..480e65f8507d 100644
--- a/bfd/doc/Makefile.am
+++ b/bfd/doc/Makefile.am
@@ -71,6 +71,9 @@  TEXIDIR = $(srcdir)/../../texinfo/fsf
 info_TEXINFOS = bfd.texi
 bfd_TEXINFOS = $(DOCFILES) bfdsumm.texi
 
+AM_MAKEINFOFLAGS_no_split = --no-split
+AM_MAKEINFOFLAGS = $(AM_MAKEINFOFLAGS_no_split)
+
 MKDOC = chew$(EXEEXT_FOR_BUILD)
 
 AM_CPPFLAGS = -I.. -I$(srcdir)/.. -I$(srcdir)/../../include \
diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in
index 93ba83ae4ac7..11409b2cab11 100644
--- a/bfd/doc/Makefile.in
+++ b/bfd/doc/Makefile.in
@@ -445,6 +445,8 @@  SRCIPROT = $(srcdir)/../cache.c $(srcdir)/../libbfd.c \
 TEXIDIR = $(srcdir)/../../texinfo/fsf
 info_TEXINFOS = bfd.texi
 bfd_TEXINFOS = $(DOCFILES) bfdsumm.texi
+AM_MAKEINFOFLAGS_no_split = --no-split
+AM_MAKEINFOFLAGS = $(AM_MAKEINFOFLAGS_no_split)
 MKDOC = chew$(EXEEXT_FOR_BUILD)
 AM_CPPFLAGS = -I.. -I$(srcdir)/.. -I$(srcdir)/../../include \
 	-I$(srcdir)/../../intl -I../../intl
diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am
index 85ad536846a8..82cdb36d19c0 100644
--- a/binutils/doc/Makefile.am
+++ b/binutils/doc/Makefile.am
@@ -51,8 +51,10 @@  man_MANS = \
 info_TEXINFOS = binutils.texi
 binutils_TEXI = $(srcdir)/binutils.texi
 
+AM_MAKEINFOFLAGS_no_split = --no-split
 AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
-		   -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc
+		   -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc \
+		   $(AM_MAKEINFOFLAGS_no_split)
 TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
 		    -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc
 
diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in
index 3ad6021699c0..ffaf57d62a25 100644
--- a/binutils/doc/Makefile.in
+++ b/binutils/doc/Makefile.in
@@ -430,8 +430,10 @@  man_MANS = \
 
 info_TEXINFOS = binutils.texi
 binutils_TEXI = $(srcdir)/binutils.texi
+AM_MAKEINFOFLAGS_no_split = --no-split
 AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
-		   -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc
+		   -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc \
+		   $(AM_MAKEINFOFLAGS_no_split)
 
 TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
 		    -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc
diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am
index 4d25e56126e4..b5601e9b15c2 100644
--- a/gas/doc/Makefile.am
+++ b/gas/doc/Makefile.am
@@ -35,8 +35,10 @@  man_MANS = as.1
 info_TEXINFOS = as.texi
 as_TEXINFOS = asconfig.texi $(CPU_DOCS)
 
+AM_MAKEINFOFLAGS_no_split = --no-split
 AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
-		   -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc
+		   -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc \
+		   $(AM_MAKEINFOFLAGS_no_split)
 TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
 		   -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc
 
diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in
index 4ae77bef3292..14bdd6759270 100644
--- a/gas/doc/Makefile.in
+++ b/gas/doc/Makefile.in
@@ -395,8 +395,10 @@  POD2MAN = pod2man --center="GNU Development Tools" \
 man_MANS = as.1
 info_TEXINFOS = as.texi
 as_TEXINFOS = asconfig.texi $(CPU_DOCS)
+AM_MAKEINFOFLAGS_no_split = --no-split
 AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
-		   -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc
+		   -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc \
+		   $(AM_MAKEINFOFLAGS_no_split)
 
 TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
 		   -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc
diff --git a/gprof/Makefile.am b/gprof/Makefile.am
index c642f173fc08..9ae1fa443ceb 100644
--- a/gprof/Makefile.am
+++ b/gprof/Makefile.am
@@ -84,7 +84,9 @@  info_TEXINFOS = gprof.texi
 gprof_TEXINFOS = config.texi
 man_MANS = gprof.1
 
-AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../bfd/doc" -I ../bfd/doc
+AM_MAKEINFOFLAGS_no_split = --no-split
+AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../bfd/doc" -I ../bfd/doc \
+		   $(AM_MAKEINFOFLAGS_no_split)
 TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../bfd/doc" -I ../bfd/doc
 
 config.texi:
diff --git a/gprof/Makefile.in b/gprof/Makefile.in
index 2767699cdfe9..93294d78e4c8 100644
--- a/gprof/Makefile.in
+++ b/gprof/Makefile.in
@@ -476,7 +476,10 @@  POD2MAN = pod2man --center="GNU" --release="binutils-$(VERSION)" --section=1
 info_TEXINFOS = gprof.texi
 gprof_TEXINFOS = config.texi
 man_MANS = gprof.1
-AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../bfd/doc" -I ../bfd/doc
+AM_MAKEINFOFLAGS_no_split = --no-split
+AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../bfd/doc" -I ../bfd/doc \
+		   $(AM_MAKEINFOFLAGS_no_split)
+
 TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../bfd/doc" -I ../bfd/doc
 MAINTAINERCLEANFILES = gprof.info
 all: $(BUILT_SOURCES) gconfig.h
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 606a9179b199..6deddd959915 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -133,8 +133,9 @@  ld_TEXINFOS = configdoc.texi
 noinst_TEXINFOS = ldint.texi
 man_MANS = ld.1
 
+AM_MAKEINFOFLAGS_no_split = --no-split
 AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc -I ../bfd/doc \
-		   -I $(top_srcdir)/../libiberty
+		   -I $(top_srcdir)/../libiberty $(AM_MAKEINFOFLAGS_no_split)
 TEXI2DVI = texi2dvi -I $(srcdir) -I $(BFDDIR)/doc -I ../bfd/doc \
 		    -I $(top_srcdir)/../libiberty
 
diff --git a/ld/Makefile.in b/ld/Makefile.in
index f1be6bc320f2..bce2780c343e 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -625,8 +625,9 @@  info_TEXINFOS = ld.texi
 ld_TEXINFOS = configdoc.texi
 noinst_TEXINFOS = ldint.texi
 man_MANS = ld.1
+AM_MAKEINFOFLAGS_no_split = --no-split
 AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc -I ../bfd/doc \
-		   -I $(top_srcdir)/../libiberty
+		   -I $(top_srcdir)/../libiberty $(AM_MAKEINFOFLAGS_no_split)
 
 TEXI2DVI = texi2dvi -I $(srcdir) -I $(BFDDIR)/doc -I ../bfd/doc \
 		    -I $(top_srcdir)/../libiberty