Mercurial > emacs
changeset 110912:2bfb6bf8a383
Add html targets for some doc/ Makefiles.
* doc/lispref/Makefile.in (.PHONY): Add html.
(html, elisp.html): New targets.
(clean): Delete html files.
($(infodir)/elisp): Remove unnecessary includes.
* doc/lispintro/Makefile.in (MAKEINFO): Use --force like the other
doc/ Makefiles do.
* doc/emacs/Makefile.in (.PHONY): Add html.
(html, emacs.html): New targets.
(clean): Delete html files.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sun, 10 Oct 2010 17:43:27 -0700 |
| parents | 6d7021474f2e |
| children | 1ba912b1a63c |
| files | doc/emacs/ChangeLog doc/emacs/Makefile.in doc/lispintro/ChangeLog doc/lispintro/Makefile.in doc/lispref/ChangeLog doc/lispref/Makefile.in |
| diffstat | 6 files changed, 21 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/emacs/ChangeLog Sun Oct 10 17:30:34 2010 -0700 +++ b/doc/emacs/ChangeLog Sun Oct 10 17:43:27 2010 -0700 @@ -2,9 +2,9 @@ * Makefile.in (.texi.dvi): Remove unnecessary suffix rule. (DVIPS): New variable. - (.PHONY): Add ps. - (ps, emacs.ps, emacs-xtra.ps): New targets. - (clean): Delete ps files. + (.PHONY): Add html, ps. + (html, emacs.html, ps, emacs.ps, emacs-xtra.ps): New targets. + (clean): Delete html, ps files. 2010-10-09 Eli Zaretskii <eliz@gnu.org>
--- a/doc/emacs/Makefile.in Sun Oct 10 17:30:34 2010 -0700 +++ b/doc/emacs/Makefile.in Sun Oct 10 17:43:27 2010 -0700 @@ -115,10 +115,11 @@ ## solution anyway. The second test -d is for parallel builds. mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir} -.PHONY: info dvi pdf ps +.PHONY: info dvi html pdf ps info: $(infodir)/emacs dvi: emacs.dvi +html: emacs.html pdf: emacs.pdf ps: emacs.ps @@ -139,6 +140,8 @@ emacs.pdf: ${EMACSSOURCES} $(ENVADD) $(TEXI2PDF) $< +emacs.html: ${EMACSSOURCES} + $(MAKEINFO) --html -o $@ $< emacs-xtra.dvi: $(EMACS_XTRA) $(ENVADD) $(TEXI2DVI) $< @@ -160,6 +163,7 @@ clean: mostlyclean rm -f emacs.dvi emacs-xtra.dvi emacs.pdf emacs-xtra.pdf \ emacs.ps emacs-xtra.ps + rm -rf emacs.html/ rm -f emacs-manual-${version}.tar* distclean: clean
--- a/doc/lispintro/ChangeLog Sun Oct 10 17:30:34 2010 -0700 +++ b/doc/lispintro/ChangeLog Sun Oct 10 17:43:27 2010 -0700 @@ -4,6 +4,7 @@ (.PHONY): Add ps. (ps, emacs-lisp-intro.ps): New targets. (clean): Delete ps file. + (MAKEINFO): Use --force like the other doc/ Makefiles do. 2010-10-09 Glenn Morris <rgm@gnu.org>
--- a/doc/lispintro/Makefile.in Sun Oct 10 17:30:34 2010 -0700 +++ b/doc/lispintro/Makefile.in Sun Oct 10 17:43:27 2010 -0700 @@ -28,7 +28,7 @@ # Directory with the (customized) texinfo.tex file. texinfodir = $(srcdir)/../misc -MAKEINFO = makeinfo +MAKEINFO = makeinfo --force TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf DVIPS = dvips @@ -48,7 +48,7 @@ # -NN extensions to fit into DOS 8+3 limits without clashing. ${infodir}/eintr: ${srcdir}/emacs-lisp-intro.texi $(mkinfodir) - $(MAKEINFO) $< -o $@ + $(MAKEINFO) -o $@ $< emacs-lisp-intro.dvi: ${srcdir}/emacs-lisp-intro.texi $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $<
--- a/doc/lispref/ChangeLog Sun Oct 10 17:30:34 2010 -0700 +++ b/doc/lispref/ChangeLog Sun Oct 10 17:43:27 2010 -0700 @@ -1,9 +1,10 @@ 2010-10-11 Glenn Morris <rgm@gnu.org> * Makefile.in (DVIPS): New variable. - (.PHONY): Add ps. - (ps, elisp.ps): New targets. - (clean): Delete ps file. + (.PHONY): Add html, ps. + (html, elisp.html, ps, elisp.ps): New targets. + (clean): Delete html, ps files. + ($(infodir)/elisp): Remove unnecessary includes. 2010-10-09 Eli Zaretskii <eliz@gnu.org>
--- a/doc/lispref/Makefile.in Sun Oct 10 17:30:34 2010 -0700 +++ b/doc/lispref/Makefile.in Sun Oct 10 17:43:27 2010 -0700 @@ -100,16 +100,20 @@ info: $(infodir)/elisp dvi: elisp.dvi +html: elisp.html pdf: elisp.pdf ps: elisp.ps $(infodir)/elisp: $(srcs) $(mkinfodir) - $(MAKEINFO) -I. -I$(texinfodir) $< -o $@ + $(MAKEINFO) -o $@ $< elisp.dvi: $(srcs) $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $< +elisp.html: $(srcs) + $(MAKEINFO) --html -o $@ $< + elisp.ps: elisp.dvi $(DVIPS) -o $@ $< @@ -126,6 +130,7 @@ clean: mostlyclean rm -f elisp.dvi elisp.pdf elisp.ps vol[12].pdf + rm -rf elisp.html rm -f emacs-lispref-${version}.tar* distclean: clean