ドキュメント作成用のMakefileを整理。中間ファイルはすぐに削除

diff --git a/doc/Makefile b/doc/Makefile
index e5b87fd..44d63a8 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,29 +1,41 @@
 DOCNAME = yacasl2
 SRC = $(DOCNAME).texi
 CSS = style.css
-TEXBIN = /usr/local/teTeX/bin
+TEXBIN = /usr/local/texlive/2010/bin/x86_64-linux
 PTEX = $(TEXBIN)/ptex
 TEXINDEX = $(TEXBIN)/texindex
 DVI2PDF = $(TEXBIN)/dvipdfmx
-TEXOBJDIR = texobj
+MAKEINFO = makeinfo
 
 .PHONY: all htmlnosplit pdf clean
+
+.INTERMEDIATE: yacasl2.dvi
+
+htmlnosplit: $(DOCNAME).html
+
 all: info htmlnosplit html pdf
+
+html: $(SRC) $(CSS)
+       @if test ! -s $@; then mkdir $@; fi;
+       @cp $(CSS) $@/$(CSS)
+       @$(MAKEINFO) -o $@ --html --css-ref=style.css $(SRC)
+
+pdf: $(DOCNAME).pdf
+
 info: $(DOCNAME).info
+
 $(DOCNAME).info: $(SRC)
-       @makeinfo -o $@ $^
-htmlnosplit: $(DOCNAME).html
+       @$(MAKEINFO) -o $@ $^
+
 $(DOCNAME).html: $(SRC) $(CSS)
-       @makeinfo -o $@ --no-split --no-headers --html --css-include=$(CSS) $(SRC)
-html: $(SRC) $(CSS)
-       @if test ! -s $@; then mkdir $@; fi; \
-     cp $(CSS) $@/$(CSS); \
-     makeinfo -o $@ --html --css-ref=style.css $(SRC)
-pdf: $(DOCNAME).pdf
+       @$(MAKEINFO) -o $@ --no-split --no-headers --html --css-include=$(CSS) $(SRC)
+
 $(DOCNAME).pdf: $(DOCNAME).dvi
        @$(DVI2PDF) $^
+
 $(DOCNAME).dvi: $(SRC)
-       @if test ! -s $(TEXOBJDIR); then mkdir $(TEXOBJDIR); fi; \
-     TEX=ptex texi2dvi -q --texinfo=@afourpaper $^
+       @TEX=ptex texi2dvi -q --texinfo=@afourpaper -o $@ $<
+       @rm -rf $(DOCNAME).aux $(DOCNAME).cp $(DOCNAME).cps $(DOCNAME).fn $(DOCNAME).ky $(DOCNAME).log $(DOCNAME).pg $(DOCNAME).pgs $(DOCNAME).tmp $(DOCNAME).toc $(DOCNAME).tp $(DOCNAME).vr
+
 clean:
-       @rm -rf html $(TEXOBJDIR) $(DOCNAME).info $(DOCNAME).?? $(DOCNAME).???
+       @rm -rf html $(DOCNAME).info $(DOCNAME).pdf $(DOCNAME).html $(DOCNAME).dvi

diff --git a/doc/yacasl2.html b/doc/yacasl2.html
index 3ddd0bb..40df70a 100644 (file)
--- a/doc/yacasl2.html
+++ b/doc/yacasl2.html
@@ -3,7 +3,7 @@
 <title>YACASL2 - Linux上のCASL II処理系</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="description" content="YACASL2 - Linux上のCASL II処理系">
-<meta name="generator" content="makeinfo 4.11">
+<meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
 <!--