summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-06-11 18:38:15 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-06-15 21:18:24 -0700
commitcca25b8a13f107dec2e66396232c7b813822593e (patch)
tree001e643ff58f2060ff30367e7a566f8594cbce24
parent702400f314be8a616e5a7c6bbb8617e1fac5e078 (diff)
downloadnasm-cca25b8a13f107dec2e66396232c7b813822593e.tar.gz
doc: Makefile fixes missing from previous checkin
-rw-r--r--doc/Makefile.in23
1 files changed, 16 insertions, 7 deletions
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 4b65662a..76ec1df0 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -22,7 +22,7 @@ TEXI2DVI = texi2dvi
PS2PDF = ps2pdf # Part of GhostScript
SRCS = nasmdoc.src
-OUT = nasm.info nasmdoc.ps nasmdoc.pdf
+OUT = info html nasmdoc.ps nasmdoc.pdf
# exports
export srcdir
@@ -35,14 +35,22 @@ os2: nasm.inf
inslist.src: inslist.pl ../insns.dat
$(PERL) $(srcdir)/inslist.pl
-# Consider html, txt and ps output a side effect
-nasmdoc.dip: nasmdoc.src rdsrc.pl inslist.src
+.PHONY: html
+html: html/nasmdoc0.html
+
+html/nasmdoc0.html: nasmdoc.src rdsrc.pl inslist.src
mkdir -p html
- $(PERL) $(srcdir)/rdsrc.pl < $<
+ $(PERL) $(srcdir)/rdsrc.pl html < $<
mv -f *.html html
-nasmdoc.texi: nasmdoc.dip
- : Generated by side effect
+nasmdoc.dip: nasmdoc.src rdsrc.pl inslist.src
+ $(PERL) $(srcdir)/rdsrc.pl dip < $<
+
+nasmdoc.texi: nasmdoc.src rdsrc.pl inslist.src
+ $(PERL) $(srcdir)/rdsrc.pl texi < $<
+
+nasmdoc.txt: nasmdoc.src rdsrc.pl inslist.src
+ $(PERL) $(srcdir)/rdsrc.pl txt < $<
nasmdoc.ps: nasmdoc.dip nasmlogo.eps $(srcdir)/../version genpsdriver.pl \
genps.pl psfonts.ph pswidth.ph head.ps
@@ -51,7 +59,8 @@ nasmdoc.ps: nasmdoc.dip nasmlogo.eps $(srcdir)/../version genpsdriver.pl \
nasmdoc.pdf: nasmdoc.ps
$(PS2PDF) nasmdoc.ps
-nasm.info: info/nasm.info
+.PHONY: info
+info: info/nasm.info
info/nasm.info: nasmdoc.texi
mkdir -p info