[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101906: Add html targets for some do
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101906: Add html targets for some doc/ Makefiles. |
Date: |
Sun, 10 Oct 2010 17:43:27 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101906
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2010-10-10 17:43:27 -0700
message:
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.
modified:
doc/emacs/ChangeLog
doc/emacs/Makefile.in
doc/lispintro/ChangeLog
doc/lispintro/Makefile.in
doc/lispref/ChangeLog
doc/lispref/Makefile.in
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2010-10-11 00:30:34 +0000
+++ b/doc/emacs/ChangeLog 2010-10-11 00:43:27 +0000
@@ -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 <address@hidden>
=== modified file 'doc/emacs/Makefile.in'
--- a/doc/emacs/Makefile.in 2010-10-11 00:30:34 +0000
+++ b/doc/emacs/Makefile.in 2010-10-11 00:43:27 +0000
@@ -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
=== modified file 'doc/lispintro/ChangeLog'
--- a/doc/lispintro/ChangeLog 2010-10-11 00:30:34 +0000
+++ b/doc/lispintro/ChangeLog 2010-10-11 00:43:27 +0000
@@ -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 <address@hidden>
=== modified file 'doc/lispintro/Makefile.in'
--- a/doc/lispintro/Makefile.in 2010-10-11 00:30:34 +0000
+++ b/doc/lispintro/Makefile.in 2010-10-11 00:43:27 +0000
@@ -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) $<
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2010-10-11 00:30:34 +0000
+++ b/doc/lispref/ChangeLog 2010-10-11 00:43:27 +0000
@@ -1,9 +1,10 @@
2010-10-11 Glenn Morris <address@hidden>
* 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 <address@hidden>
=== modified file 'doc/lispref/Makefile.in'
--- a/doc/lispref/Makefile.in 2010-10-11 00:30:34 +0000
+++ b/doc/lispref/Makefile.in 2010-10-11 00:43:27 +0000
@@ -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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101906: Add html targets for some doc/ Makefiles.,
Glenn Morris <=