diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/Makefile.in | 7 | ||||
| -rw-r--r-- | gdb/doc/ChangeLog | 15 | ||||
| -rw-r--r-- | gdb/doc/Makefile.in | 43 |
4 files changed, 49 insertions, 21 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7bfa117..a46ddea 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2009-04-18 Carlos O'Donell <carlos@codesourcery.com> + + * Makefile.in (MAKEHTML): Set to makeinfo --html. + (MAKEHTMLFLAGS): Set to empty. + 2009-04-18 Eli Zaretskii <eliz@gnu.org> * NEWS: Mention all new set/show commands added since GDB 6.8 was diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 0170af4..8ee2dfe 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -111,11 +111,8 @@ YLWRAP = $(srcdir)/../ylwrap # where to find makeinfo, preferably one designed for texinfo-2 MAKEINFO=makeinfo -# Contrary to documentation, the current directory is not -# searched by texi2html, so specify it explicitly. -# -macro 2007-07-26 -MAKEHTML = texi2html -MAKEHTMLFLAGS = -menu -split_chapter -I . +MAKEHTML = $(MAKEINFO) --html +MAKEHTMLFLAGS = # Set this up with gcc if you have gnu ld and the loader will print out # line numbers for undefined references. diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 68f691f..428da00 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,18 @@ +2009-04-18 Carlos O'Donell <carlos@codesourcery.com> + Joseph Myers <joseph@codesourcery.com> + + * Makefile.in (MAKEHTML): Set to makeinfo --html. + (MAKEHTMLFLAGS): Set to empty. + (html__strip_dir): Define. + (HTMLFILES): Define. + (HTMLFILES_INSTALL): Define. + (install-html): Copy new automake rule. + (html): Depend on $(HTMLFILES). + (gdb_toc.html): Rename to gdb/index.html. + (gdbint_toc.html): Rename to gdbint/index.html. + (stabs_toc.html): Rename to stabs/index.html. + (annotate_toc.html): Rename to annotate/index.html. + 2009-04-17 Carlos O'Donell <carlos@codesourcery.com> * Makefile.in: Set pdfdir and htmldir from configure diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in index 2b3473f..34ee07c 100644 --- a/gdb/doc/Makefile.in +++ b/gdb/doc/Makefile.in @@ -46,14 +46,8 @@ TEXIDIR=${gdbdir}/../texinfo # where to find makeinfo, preferably one designed for texinfo-2 MAKEINFO=makeinfo -# Note that texinfo 4.0's makeinfo --html can only generate a -# single file, which would be too large, so continue to use -# texi2html. -sts 2000-03-28 -# Contrary to documentation, the current directory is not -# searched by texi2html, so specify it explicitly. -# -macro 2007-07-26 -MAKEHTML = texi2html -MAKEHTMLFLAGS = -menu -split_chapter -I . +MAKEHTML = $(MAKEINFO) --html +MAKEHTMLFLAGS = # where to find texi2roff, ditto TEXI2ROFF=texi2roff @@ -80,6 +74,9 @@ INFO_DEPS = gdb.info gdbint.info stabs.info annotate.info # Files which should be generated via 'pdf' and installed by 'install-pdf' PDFFILES = gdb.pdf gdbint.pdf stabs.pdf refcard.pdf annotate.pdf +# Files which should be generated via 'html' and installed by 'install-html' +HTMLFILES = gdb/index.html gdbint/index.html stabs/index.html annotate/index.html +HTMLFILES_INSTALL = gdb gdbint stabs annotate # There may be alternate predefined collections of switches to configure # the GDB manual. Normally this is not done in synch with the software @@ -163,7 +160,7 @@ all: info: $(INFO_DEPS) dvi: gdb.dvi gdbint.dvi stabs.dvi refcard.dvi annotate.dvi ps: gdb.ps gdbint.ps stabs.ps refcard.ps annotate.ps -html: gdb_toc.html gdbint_toc.html stabs_toc.html annotate_toc.html +html: $(HTMLFILES) pdf: $(PDFFILES) all-doc: info dvi ps # pdf diststuff: info @@ -205,9 +202,23 @@ uninstall-info: (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \ done -install-html: html - for i in *.html ; do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(htmldir)/$$i ; \ +html__strip_dir = `echo $$p | sed -e 's|^.*/||'`; + +install-html: $(HTMLFILES) + @$(NORMAL_INSTALL) + test -z "$(htmldir)" || $(mkinstalldirs) "$(DESTDIR)$(htmldir)" + @list='$(HTMLFILES_INSTALL)'; for p in $$list; do \ + if test -f "$$p" || test -d "$$p"; then d=""; else d="$(srcdir)/"; fi; \ + f=$(html__strip_dir) \ + if test -d "$$d$$p"; then \ + echo " $(mkinstalldirs) '$(DESTDIR)$(htmldir)/$$f'"; \ + $(mkinstalldirs) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ + echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \ + $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \ + else \ + echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \ + $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \ + fi; \ done pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`; @@ -417,7 +428,7 @@ gdb.mm: $(GDB_DOC_FILES) links2roff # GDB MANUAL: HTML file -gdb_toc.html: ${GDB_DOC_FILES} +gdb/index.html: ${GDB_DOC_FILES} $(MAKEHTML) $(MAKEHTMLFLAGS) -I ${READLINE_DIR} -I ${GDBMI_DIR} -I $(srcdir) $(srcdir)/gdb.texinfo # Clean these up before each run. Avoids a catch 22 with not being @@ -445,7 +456,7 @@ gdbint.info: $(GDBINT_DOC_FILES) # GDB INTERNALS MANUAL: HTML file -gdbint_toc.html: $(GDBINT_DOC_FILES) +gdbint/index.html: $(GDBINT_DOC_FILES) $(MAKEHTML) $(MAKEHTMLFLAGS) $(srcdir)/gdbint.texinfo stabs.info: $(STABS_DOC_FILES) @@ -453,7 +464,7 @@ stabs.info: $(STABS_DOC_FILES) # STABS DOCUMENTATION: HTML file -stabs_toc.html: $(STABS_DOC_FILES) +stabs/index.html: $(STABS_DOC_FILES) $(MAKEHTML) $(MAKEHTMLFLAGS) $(srcdir)/stabs.texinfo # Clean these up before each run. Avoids a catch 22 with not being @@ -495,7 +506,7 @@ annotate.pdf: $(ANNOTATE_DOC_FILES) annotate.info: $(ANNOTATE_DOC_FILES) $(MAKEINFO) -I $(srcdir) -o annotate.info $(srcdir)/annotate.texinfo -annotate_toc.html: $(ANNOTATE_DOC_FILES) +annotate/index.html: $(ANNOTATE_DOC_FILES) $(MAKEHTML) $(MAKEHTMLFLAGS) $(srcdir)/annotate.texinfo force: |