From 792ade225616d5b3ab2cbe1d82af9177704e734f Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Wed, 11 Jun 2008 18:38:15 -0700
Subject: [PATCH] doc: Makefile fixes missing from previous checkin

---
 doc/Makefile.in | 23 ++++++++++++++++-------
 1 file 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
-- 
2.11.4.GIT