[commit: nofib] master: Remove doc-building support from the build system (4a98a31)

Ian Lynagh igloo at earth.li
Tue May 28 22:44:12 CEST 2013


Repository : ssh://darcs.haskell.org//srv/darcs/nofib

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/4a98a31e1c1a2f996f82ffba397d5461e8cc2ce1

>---------------------------------------------------------------

commit 4a98a31e1c1a2f996f82ffba397d5461e8cc2ce1
Author: Ian Lynagh <ian at well-typed.com>
Date:   Tue May 28 20:28:06 2013 +0100

    Remove doc-building support from the build system
    
    We don't build any docs in nofib

>---------------------------------------------------------------

 mk/ghc-paths.mk  |    7 ----
 mk/ghc-suffix.mk |   82 ------------------------------------------------------
 mk/ghc-target.mk |   48 -------------------------------
 3 files changed, 0 insertions(+), 137 deletions(-)

diff --git a/mk/ghc-paths.mk b/mk/ghc-paths.mk
index 8150766..8a4789c 100644
--- a/mk/ghc-paths.mk
+++ b/mk/ghc-paths.mk
@@ -266,10 +266,3 @@ MOSTLY_CLEAN_FILES += \
 
 DLL_PEN = $(FPTOOLS_TOP)/dll
 
-#------------------------------------------------------------------
-#
-# Stylesheet for HTML generated from DocBook XML
-#
-
-FPTOOLS_CSS     = fptools.css
-FPTOOLS_CSS_ABS = $(FPTOOLS_TOP)/mk/$(FPTOOLS_CSS)
diff --git a/mk/ghc-suffix.mk b/mk/ghc-suffix.mk
index 2d34409..4cefd9f 100644
--- a/mk/ghc-suffix.mk
+++ b/mk/ghc-suffix.mk
@@ -245,88 +245,6 @@ endif
 	$(TIME) $(RUNTEST) $(HC) $(RUNTEST_OPTS) $<
 
 #-----------------------------------------------------------------------------
-# DocBook XML suffix rules
-#
-
-%.html : %.xml
-	$(XSLTPROC) --output $@ \
-		    --stringparam html.stylesheet $(FPTOOLS_CSS) \
-		    $(XSLTPROC_LABEL_OPTS) $(XSLTPROC_OPTS) \
-		    $(DIR_DOCBOOK_XSL)/html/docbook.xsl $<
-	cp $(FPTOOLS_CSS_ABS) .
-
-%/index.html : %.xml
-	$(RM) -rf $(dir $@)
-	$(XSLTPROC) --stringparam base.dir $(dir $@) \
-		    --stringparam use.id.as.filename 1 \
-		    --stringparam html.stylesheet $(FPTOOLS_CSS) \
-		    $(XSLTPROC_LABEL_OPTS) $(XSLTPROC_OPTS) \
-		    $(DIR_DOCBOOK_XSL)/html/chunk.xsl $<
-	cp $(FPTOOLS_CSS_ABS) $(dir $@)
-
-# Note: Numeric labeling seems to be uncommon for HTML Help
-%-htmlhelp/index.html : %.xml
-	$(RM) -rf $(dir $@)
-	$(XSLTPROC) --stringparam base.dir $(dir $@) \
-		    --stringparam manifest.in.base.dir 1 \
-		    --stringparam htmlhelp.chm "..\\"$(basename $<).chm \
-		    $(XSLTPROC_OPTS) \
-		    $(DIR_DOCBOOK_XSL)/htmlhelp/htmlhelp.xsl $<
-
-%-htmlhelp2/collection.HxC : %.xml
-	$(RM) -rf $(dir $@)
-	$(XSLTPROC) --stringparam base.dir $(dir $@) \
-		    --stringparam use.id.as.filename 1 \
-		    --stringparam manifest.in.base.dir 1 \
-		    $(XSLTPROC_OPTS) \
-		    $(DIR_DOCBOOK_XSL)/htmlhelp2/htmlhelp2.xsl $<
-
-# TODO: Detect hhc & Hxcomp via autoconf
-#
-# Two obstacles 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
-
-%.HxS : %-htmlhelp2/collection.HxC
-	( cd $(dir $<) && if Hxcomp -p collection.HxC -o ../$@ ; then false ; else true ; fi )
-
-%.ps : %.xml
-	$(DBLATEX) $(DBLATEX_OPTS) $< --ps -o $@
-
-%.pdf : %.xml
-	$(DBLATEX) $(DBLATEX_OPTS) $< --pdf -o $@
-
-%.dvi : %.xml
-	$(DBLATEX) $(DBLATEX_OPTS) $< --dvi -o $@
-
-#-----------------------------------------------------------------------------
-# Doc processing suffix rules
-#
-# ToDo: make these more robust
-#
-
-%.tex : %.tib
-	@$(RM) $*.tex $*.verb-t.tex
-	$(TIB) $*.tib
-	expand $*.tib-t.tex | $(VERBATIM) > $*.tex
-	@$(RM) $*.tib-t.tex
-
-%.ps : %.fig
-	@$(RM) $@
-	fig2dev -L ps $< $@
-
-%.tex : %.fig
-	@$(RM) $@
-	fig2dev -L latex $< $@
-
-#-----------------------------------------------------------------------------
 # Literate suffix rules
 
 %.prl : %.lprl
diff --git a/mk/ghc-target.mk b/mk/ghc-target.mk
index 334a7d8..352c933 100644
--- a/mk/ghc-target.mk
+++ b/mk/ghc-target.mk
@@ -484,54 +484,6 @@ ifneq "$(TAGS_C_SRCS)" ""
 endif
 	@( DEREFFED=`ls -l Makefile | sed -e 's/.*-> \(.*\)/\1/g'` && $(RM) `dirname $$DEREFFED`/TAGS && $(CP) TAGS `dirname $$DEREFFED` ) 2>/dev/null || echo TAGS file generated, perhaps copy over to source tree?
 
-################################################################################
-#
-#			DocBook XML Documentation
-#
-################################################################################
-
-.PHONY: html html-no-chunks chm HxS fo dvi ps pdf
-
-ifneq "$(XML_DOC)" ""
-
-all :: $(XMLDocWays)
-
-# multi-file XML document: main document name is specified in $(XML_DOC),
-# sub-documents (.xml files) listed in $(XML_SRCS).
-
-ifeq "$(XML_SRCS)" ""
-XML_SRCS = $(wildcard *.xml)
-endif
-
-XML_HTML           = $(addsuffix /index.html,$(basename $(XML_DOC)))
-XML_HTML_NO_CHUNKS = $(addsuffix .html,$(XML_DOC))
-XML_CHM            = $(addsuffix .chm,$(XML_DOC))
-XML_HxS            = $(addsuffix .HxS,$(XML_DOC))
-XML_FO             = $(addsuffix .fo,$(XML_DOC))
-XML_DVI            = $(addsuffix .dvi,$(XML_DOC))
-XML_PS             = $(addsuffix .ps,$(XML_DOC))
-XML_PDF            = $(addsuffix .pdf,$(XML_DOC))
-
-$(XML_HTML) $(XML_NO_CHUNKS_HTML) $(XML_FO) $(XML_DVI) $(XML_PS) $(XML_PDF) :: $(XML_SRCS)
-
-html           :: $(XML_HTML)
-html-no-chunks :: $(XML_HTML_NO_CHUNKS)
-chm            :: $(XML_CHM)
-HxS            :: $(XML_HxS)
-fo             :: $(XML_FO)
-dvi            :: $(XML_DVI)
-ps             :: $(XML_PS)
-pdf            :: $(XML_PDF)
-
-CLEAN_FILES += $(XML_HTML_NO_CHUNKS) $(XML_FO) $(XML_DVI) $(XML_PS) $(XML_PDF)
-
-extraclean ::
-	$(RM) -rf $(XML_DOC).out $(FPTOOLS_CSS) $(basename $(XML_DOC)) $(basename $(XML_DOC))-htmlhelp
-
-validate ::
-	$(XMLLINT) --valid --noout $(XMLLINT_OPTS) $(XML_DOC).xml
-endif
-
 ##############################################################################
 #
 #	Targets: clean





More information about the ghc-commits mailing list