X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fsuffix.mk;h=2714c34077cc1a636d47e07bb5e1512ae9a2afd4;hb=0f0e83390daf09bceb7ed0be5b280f3c662c02a8;hp=fb95830dedf0a09a25f92760da937a4fdbc368df;hpb=0ba4b0a1104131cd6eae8d570c1e1a713094543c;p=ghc-hetmet.git

diff --git a/mk/suffix.mk b/mk/suffix.mk
index fb95830..2714c34 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -250,7 +250,7 @@ endif
 		    $(DIR_DOCBOOK_XSL)/html/docbook.xsl $<
 	cp $(FPTOOLS_CSS_ABS) .
 
-%-html/index.html : %.xml
+%/index.html : %.xml
 	$(RM) -rf $(dir $@)
 	$(XSLTPROC) --stringparam base.dir $(dir $@) \
 		    --stringparam use.id.as.filename 1 \
@@ -264,10 +264,23 @@ endif
 	$(RM) -rf $(dir $@)
 	$(XSLTPROC) --stringparam base.dir $(dir $@) \
 		    --stringparam manifest.in.base.dir 1 \
-		    --stringparam htmlhelp.chm $(basename $<).chm \
+		    --stringparam htmlhelp.chm "..\\"$(basename $<).chm \
 		    $(XSLTPROC_OPTS) \
 		    $(DIR_DOCBOOK_XSL)/htmlhelp/htmlhelp.xsl $<
 
+# TODO: Detect hhc via autoconf
+#
+# Two obstables here:
+#
+# * The reason for the strange "if" below is that hhc returns 0 on error and 1
+#   on success, the opposite of what shells and make expect.
+#
+# * There seems to be some trouble with DocBook indices, but the *.chm looks OK,
+#   anyway, therefore we pacify make by "|| true". Ugly...
+#
+%.chm : %-htmlhelp/index.html
+	( cd $(dir $<) && if hhc htmlhelp.hhp ; then false ; else true ; fi ) || true
+
 %.fo : %.xml
 	$(XSLTPROC) --output $@ \
 		    $(XSLTPROC_LABEL_OPTS) $(XSLTPROC_OPTS) \
@@ -323,41 +336,6 @@ endif
 	fig2dev -L latex $< $@
 
 #-----------------------------------------------------------------------------
-# SGML suffix rules
-#
-%.dvi : %.sgml
-	@$(RM) $@
-	$(SGML2DVI) $(SGML2DVI_OPTS) $<
-
-%.ps : %.sgml
-	@$(RM) $@
-	$(SGML2PS) $(SGML2PS_OPTS) $<
-
-%.html : %.sgml
-	@$(RM) $@
-#	$(PERL) $(COLLATEINDEX) -N -o index.sgml
-#	$(JADE) -t sgml -V html-index -d $(SGMLSTYLESHEET) -c $(DOCBOOK_CATALOG) $<
-#	$(PERL) $(COLLATEINDEX) -N -o index.sgml
-	$(SGML2HTML) $(SGML2HTML_OPTS) $<
-# touch the .html file so that it is seen to be built
-	@touch $@
-
-%.html : %.tex
-	@$(RM) $@
-	$(HEVEA) $(HEVEA_OPTS) $(patsubst %.tex,%.hva,$<) $<
-	$(HEVEA) $(HEVEA_OPTS) $(patsubst %.tex,%.hva,$<) $<
-	$(HACHA) $(HACHA_OPTS) $(patsubst %.tex,%.html,$<)
-# Run HeVeA twice to resolve labels
-
-%.rtf : %.sgml
-	@$(RM) $@
-	$(SGML2RTF) $(SGML2RTF_OPTS) $<
-
-%.pdf : %.sgml
-	@$(RM) $@
-	$(SGML2PDF) $(SGML2PDF_OPTS) $<
-
-#-----------------------------------------------------------------------------
 # Literate suffix rules
 
 %.prl : %.lprl
@@ -393,4 +371,5 @@ endif
 
 % : %.pp
 	@$(RM) $@
-	$(CPP) $(RAWCPP_FLAGS) -P $(CPP_OPTS) -x c $< > $@
+	$(CPP) $(RAWCPP_FLAGS) -P $(CPP_OPTS) -x c $< | \
+	grep -v '^#pragma GCC' > $@