This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] Fix binutils html target.


These patches enable building the binutils html target.

I intend to keep this target up to date and tested as much
as possible. If you have any long term thoughts about
documentation building and maintenance please feel free
to comment.

Cheers,
Carlos.
-- 
Carlos O'Donell
CodeSourcery
carlos@codesourcery.com
(650) 331-3385 x716

bfd/doc/

2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>

	* Makefile.am: Add html target.
	* Makefile.in: Regenerate.

bfd/

2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>

	* po/Make-in: Add html target.

binutils/

2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>

	* po/Make-in: Add html target.

etc/

2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>

	* Makefile.in: TEXI2HTML uses makeinfo. Define
	HTMLFILES. Add html targets.
	* configure.texi: Use ifnottex. Add alternative
	image format specfier as jpg.
	* standards.texi: Use ifnottex.

gas/

2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>

	* doc/Makefile.am: Add html target.
	* doc/Makefile.in: Regenerate.
	* po/Make-in: Add html target.

gprof/

2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>

	* po/Make-in: Add html target.

intl/

2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>

	* intl/Makefile.in: Add html target.

ld/

2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>

	* Makefile.am: Add html target.
	* Makefile.in: Regenerate.
	* po/Make-in: Add html target.

opcodes/

2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>

	* po/Make-in: Add html target.

Index: bfd/doc/Makefile.am
===================================================================
RCS file: /cvs/src/src/bfd/doc/Makefile.am,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile.am
--- bfd/doc/Makefile.am	9 May 2005 21:13:56 -0000	1.18
+++ bfd/doc/Makefile.am	16 Feb 2006 17:45:09 -0000
@@ -68,7 +68,7 @@ chew.o: chew.c
 
 protos: libbfd.h libcoff.h bfd.h
 
-$(srcdir)/bfd.info bfd.dvi: $(DOCFILES) bfdsumm.texi bfd.texinfo
+$(srcdir)/bfd.info bfd.dvi bfd.html: $(DOCFILES) bfdsumm.texi bfd.texinfo
 
 # We can't replace these rules with an implicit rule, because
 # makes without VPATH support couldn't find the .h files in `..'.
Index: bfd/doc/Makefile.in
===================================================================
RCS file: /cvs/src/src/bfd/doc/Makefile.in,v
retrieving revision 1.65
diff -u -p -r1.65 Makefile.in
--- bfd/doc/Makefile.in	10 May 2005 01:27:54 -0000	1.65
+++ bfd/doc/Makefile.in	16 Feb 2006 17:45:09 -0000
@@ -596,7 +596,7 @@ chew.o: chew.c
 
 protos: libbfd.h libcoff.h bfd.h
 
-$(srcdir)/bfd.info bfd.dvi: $(DOCFILES) bfdsumm.texi bfd.texinfo
+$(srcdir)/bfd.info bfd.dvi bfd.html: $(DOCFILES) bfdsumm.texi bfd.texinfo
 
 # We can't replace these rules with an implicit rule, because
 # makes without VPATH support couldn't find the .h files in `..'.
Index: bfd/po/Make-in
===================================================================
RCS file: /cvs/src/src/bfd/po/Make-in,v
retrieving revision 1.6
diff -u -p -r1.6 Make-in
--- bfd/po/Make-in	3 Mar 2005 11:41:03 -0000	1.6
+++ bfd/po/Make-in	16 Feb 2006 17:45:09 -0000
@@ -198,7 +198,7 @@ check: all
 
 cat-id-tbl.o: ../intl/libgettext.h
 
-dvi info tags TAGS ID:
+html dvi info tags TAGS ID:
 
 mostlyclean:
 	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
Index: binutils/po/Make-in
===================================================================
RCS file: /cvs/src/src/binutils/po/Make-in,v
retrieving revision 1.3
diff -u -p -r1.3 Make-in
--- binutils/po/Make-in	3 Mar 2005 11:46:13 -0000	1.3
+++ binutils/po/Make-in	16 Feb 2006 17:45:09 -0000
@@ -185,7 +185,7 @@ check: all
 
 cat-id-tbl.o: ../intl/libgettext.h
 
-dvi info tags TAGS ID:
+html dvi info tags TAGS ID:
 
 mostlyclean:
 	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
Index: etc/Makefile.in
===================================================================
RCS file: /cvs/src/src/etc/Makefile.in,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.in
--- etc/Makefile.in	19 May 2005 23:49:46 -0000	1.4
+++ etc/Makefile.in	16 Feb 2006 17:45:09 -0000
@@ -39,7 +39,10 @@ MAKEINFO = `if [ -f ../texinfo/makeinfo/
 TEXI2DVI = `if [ -f ../texinfo/util/texi2dvi ]; \
 	then echo ../texinfo/util/texi2dvi; \
 	else echo texi2dvi; fi`
-TEXI2HTML = texi2html
+TEXI2HTML = `if [ -f ../texinfo/makeinfo/makeinfo ]; \
+	then echo "../texinfo/makeinfo/makeinfo --html"; \
+	else echo "makeinfo --html"; fi`
+
 DVIPS = dvips
 
 # Where to find texinfo.tex to format documentation with TeX.
@@ -50,6 +53,7 @@ TEXIDIR = $(srcdir)/../texinfo
 
 INFOFILES = standards.info configure.info
 DVIFILES = standards.dvi configure.dvi
+HTMLFILES = standards.html configure.html
 
 all: info
 install: install-info
@@ -82,6 +86,18 @@ install-info: info
 	  done; \
 	fi
 
+html:
+	for f in $(HTMLFILES); do \
+	  if test -f $(srcdir)/`echo $$f | sed -e 's/.html$$/.texi/'`; then \
+	    if $(MAKE) "TEXI2HTML=$(TEXI2HTML)" $$f; then \
+	      true; \
+	    else \
+	      exit 1; \
+	    fi; \
+	  fi; \
+	done
+
+
 dvi:
 	for f in $(DVIFILES); do \
 	  if test -f $(srcdir)/`echo $$f | sed -e 's/.dvi$$/.texi/'`; then \
@@ -96,6 +112,9 @@ dvi:
 standards.info: $(srcdir)/standards.texi $(srcdir)/make-stds.texi
 	$(MAKEINFO) --no-split -I$(srcdir) -o standards.info $(srcdir)/standards.texi
 
+standards.html: $(srcdir)/standards.texi $(srcdir)/make-stds.texi
+	$(TEXI2HTML) --no-split -I$(srcdir) -o standards.html $(srcdir)/standards.texi
+
 standards.dvi: $(srcdir)/standards.texi
 	TEXINPUTS=$(TEXIDIR):$$TEXINPUTS $(TEXI2DVI) $(srcdir)/standards.texi
 
@@ -131,12 +150,15 @@ configure.ps: configure.dvi $(srcdir)/co
 	rm -f configdev.eps configbuild.eps
 
 configure.html: $(srcdir)/configure.texi
-	$(TEXI2HTML) -split_chapter $(srcdir)/configure.texi
+	cp $(srcdir)/configdev.jin configdev.jpg
+	cp $(srcdir)/configbuild.jin configbuild.jpg
+	$(TEXI2HTML) --no-split -I$(srcdir) -o configure.html $(srcdir)/configure.texi
 
 clean:
 	rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.log
 	rm -f *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs
-	rm -f configdev.txt configbuild.txt configdev.eps configbuild.eps
+	rm -f configdev.txt configbuild.txt 
+	rm -f configdev.eps configbuild.eps
 	rm -f configdev.jpg configbuild.jpg
 
 mostlyclean: clean
@@ -145,6 +167,7 @@ distclean:   clean
 	rm -f Makefile config.status config.cache
 
 maintainer-clean realclean:   distclean
+	rm -f *.html*
 	rm -f *.info*
 
 Makefile: $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag)
Index: etc/configure.texi
===================================================================
RCS file: /cvs/src/src/etc/configure.texi,v
retrieving revision 1.2
diff -u -p -r1.2 configure.texi
--- etc/configure.texi	16 May 2003 16:30:26 -0000	1.2
+++ etc/configure.texi	16 Feb 2006 17:45:09 -0000
@@ -10,7 +10,7 @@
 * configure: (configure).	The GNU configure and build system
 @end direntry
 
-@ifinfo
+@ifnottex
 This file documents the GNU configure and build system.
 
 Copyright (C) 1998 Cygnus Solutions.
@@ -35,7 +35,7 @@ Permission is granted to copy and distri
 into another language, under the above conditions for modified versions,
 except that this permission notice may be stated in a translation approved
 by the Foundation.
-@end ifinfo
+@end ifnottex
 
 @titlepage
 @title The GNU configure and build system
@@ -60,7 +60,7 @@ except that this permission notice may b
 approved by the Free Software Foundation.
 @end titlepage
 
-@ifinfo
+@ifnottex
 @node Top
 @top GNU configure and build system
 
@@ -79,7 +79,7 @@ The GNU configure and build system.
 * Index::			Index.
 @end menu
 
-@end ifinfo
+@end ifnottex
 
 @node Introduction
 @chapter Introduction
@@ -1085,7 +1085,7 @@ are in rectangles with rounded corners
 @end ifnotinfo
 (e.g., @samp{autoheader} is the name of a tool, not the name of a file).
 
-@image{configdev}
+@image{configdev,,,,jpg}
 
 @node Written Developer Files
 @subsection Written Developer Files
@@ -1235,7 +1235,7 @@ Here is a picture of the files which wil
 @file{config.status} is both a created file and a shell script which is
 run to create other files, and the picture attempts to show that.
 
-@image{configbuild}
+@image{configbuild,,,,jpg}
 
 @node Build Files Description
 @subsection Build Files Description
Index: etc/standards.texi
===================================================================
RCS file: /cvs/src/src/etc/standards.texi,v
retrieving revision 1.2
diff -u -p -r1.2 standards.texi
--- etc/standards.texi	27 Feb 2002 02:13:33 -0000	1.2
+++ etc/standards.texi	16 Feb 2006 17:45:09 -0000
@@ -6,13 +6,13 @@
 @set lastupdate February 14, 2002
 @c %**end of header
 
-@ifinfo
+@ifnottex
 @format
 START-INFO-DIR-ENTRY
 * Standards: (standards).        GNU coding standards.
 END-INFO-DIR-ENTRY
 @end format
-@end ifinfo
+@end ifnottex
 
 @c @setchapternewpage odd
 @setchapternewpage off
@@ -28,11 +28,11 @@ END-INFO-DIR-ENTRY
 @iftex
 @set CHAPTER chapter
 @end iftex
-@ifinfo
+@ifnottex
 @set CHAPTER node
-@end ifinfo
+@end ifnottex
 
-@ifinfo
+@ifnottex
 GNU Coding Standards
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
@@ -43,7 +43,7 @@ with no Invariant Sections, with no
 Front-Cover Texts, and with no Back-Cover Texts.
 A copy of the license is included in the section entitled ``GNU
 Free Documentation License''.
-@end ifinfo
+@end ifnottex
 
 @titlepage
 @title GNU Coding Standards
@@ -63,12 +63,12 @@ A copy of the license is included in the
 Free Documentation License''.
 @end titlepage
 
-@ifinfo
+@ifnottex
 @node Top, Preface, (dir), (dir)
 @top Version
 
 Last updated @value{lastupdate}.
-@end ifinfo
+@end ifnottex
 
 @menu
 * Preface::                     About the GNU Coding Standards
Index: gas/doc/Makefile.am
===================================================================
RCS file: /cvs/src/src/gas/doc/Makefile.am,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile.am
--- gas/doc/Makefile.am	12 Dec 2005 11:25:04 -0000	1.41
+++ gas/doc/Makefile.am	16 Feb 2006 17:45:09 -0000
@@ -64,8 +64,7 @@ gasver.texi: $(srcdir)/../../bfd/configu
 	eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \
 	  echo "@set VERSION $$VERSION" > $@
 
-$(srcdir)/as.info: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
-as.dvi: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
+$(srcdir)/as.info as.dvi as.html: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
 
 # We want install to imply install-info as per GNU standards, despite the
 # cygnus option.
Index: gas/doc/Makefile.in
===================================================================
RCS file: /cvs/src/src/gas/doc/Makefile.in,v
retrieving revision 1.74
diff -u -p -r1.74 Makefile.in
--- gas/doc/Makefile.in	12 Dec 2005 11:25:04 -0000	1.74
+++ gas/doc/Makefile.in	16 Feb 2006 17:45:09 -0000
@@ -343,6 +343,8 @@ distclean-libtool:
 	    rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
 	  exit 1; \
 	fi
+$(srcdir)/as.info: as.texinfo 
+as.dvi: as.texinfo 
 as.pdf: as.texinfo 
 as.html: as.texinfo 
 .dvi.ps:
@@ -586,8 +588,7 @@ gasver.texi: $(srcdir)/../../bfd/configu
 	eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \
 	  echo "@set VERSION $$VERSION" > $@
 
-$(srcdir)/as.info: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
-as.dvi: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
+$(srcdir)/as.info as.dvi as.html: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
 
 # We want install to imply install-info as per GNU standards, despite the
 # cygnus option.
Index: gas/po/Make-in
===================================================================
RCS file: /cvs/src/src/gas/po/Make-in,v
retrieving revision 1.3
diff -u -p -r1.3 Make-in
--- gas/po/Make-in	3 Mar 2005 11:47:57 -0000	1.3
+++ gas/po/Make-in	16 Feb 2006 17:45:09 -0000
@@ -185,7 +185,7 @@ check: all
 
 cat-id-tbl.o: ../intl/libgettext.h
 
-dvi info tags TAGS ID:
+html dvi info tags TAGS ID:
 
 mostlyclean:
 	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
Index: gprof/po/Make-in
===================================================================
RCS file: /cvs/src/src/gprof/po/Make-in,v
retrieving revision 1.5
diff -u -p -r1.5 Make-in
--- gprof/po/Make-in	3 Mar 2005 12:05:13 -0000	1.5
+++ gprof/po/Make-in	16 Feb 2006 17:45:10 -0000
@@ -185,7 +185,7 @@ check: all
 
 cat-id-tbl.o: ../intl/libgettext.h
 
-dvi info tags TAGS ID:
+html dvi info tags TAGS ID:
 
 mostlyclean:
 	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
Index: intl/Makefile.in
===================================================================
RCS file: /cvs/src/src/intl/Makefile.in,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.in
--- intl/Makefile.in	13 May 2005 08:04:30 -0000	1.4
+++ intl/Makefile.in	16 Feb 2006 17:45:10 -0000
@@ -149,7 +149,7 @@ uninstall:
 	  rm -f $(gettextsrcdir)/$$file; \
 	done
 
-info dvi:
+html info dvi:
 
 $(OBJECTS): config.h libgettext.h
 bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h
Index: ld/Makefile.am
===================================================================
RCS file: /cvs/src/src/ld/Makefile.am,v
retrieving revision 1.198
diff -u -p -r1.198 Makefile.am
--- ld/Makefile.am	27 Dec 2005 01:21:01 -0000	1.198
+++ ld/Makefile.am	16 Feb 2006 17:45:10 -0000
@@ -1661,8 +1661,7 @@ ldver.texi: $(srcdir)/../bfd/configure
 	eval `grep '^ *VERSION=' $(srcdir)/../bfd/configure`; \
 	  echo "@set VERSION $$VERSION" > $@
 
-$(srcdir)/ld.info: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
-ld.dvi: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
+$(srcdir)/ld.info ld.dvi ld.html: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
 
 # Build the man page from the texinfo file
 # The sed command removes the no-adjust Nroff command so that
Index: ld/Makefile.in
===================================================================
RCS file: /cvs/src/src/ld/Makefile.in,v
retrieving revision 1.212
diff -u -p -r1.212 Makefile.in
--- ld/Makefile.in	27 Dec 2005 01:21:01 -0000	1.212
+++ ld/Makefile.in	16 Feb 2006 17:45:11 -0000
@@ -829,6 +829,8 @@ distclean-libtool:
 	    rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
 	  exit 1; \
 	fi
+$(srcdir)/ld.info: ld.texinfo 
+ld.dvi: ld.texinfo 
 ld.pdf: ld.texinfo 
 ld.html: ld.texinfo 
 .dvi.ps:
@@ -2454,8 +2456,7 @@ ldver.texi: $(srcdir)/../bfd/configure
 	eval `grep '^ *VERSION=' $(srcdir)/../bfd/configure`; \
 	  echo "@set VERSION $$VERSION" > $@
 
-$(srcdir)/ld.info: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
-ld.dvi: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
+$(srcdir)/ld.info ld.dvi ld.html: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
 
 # Build the man page from the texinfo file
 # The sed command removes the no-adjust Nroff command so that
Index: ld/po/Make-in
===================================================================
RCS file: /cvs/src/src/ld/po/Make-in,v
retrieving revision 1.3
diff -u -p -r1.3 Make-in
--- ld/po/Make-in	3 Mar 2005 11:52:05 -0000	1.3
+++ ld/po/Make-in	16 Feb 2006 17:45:11 -0000
@@ -185,7 +185,7 @@ check: all
 
 cat-id-tbl.o: ../intl/libgettext.h
 
-dvi info tags TAGS ID:
+html dvi info tags TAGS ID:
 
 mostlyclean:
 	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
Index: opcodes/po/Make-in
===================================================================
RCS file: /cvs/src/src/opcodes/po/Make-in,v
retrieving revision 1.3
diff -u -p -r1.3 Make-in
--- opcodes/po/Make-in	3 Mar 2005 11:49:51 -0000	1.3
+++ opcodes/po/Make-in	16 Feb 2006 17:45:11 -0000
@@ -185,7 +185,7 @@ check: all
 
 cat-id-tbl.o: ../intl/libgettext.h
 
-dvi info tags TAGS ID:
+html dvi info tags TAGS ID:
 
 mostlyclean:
 	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]