remove XmlDocWays relic

[ghc-hetmet.git] / mk / config.mk.in

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 980e493..ad4bc04 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -51,11 +51,8 @@ BootingFromHc = @BootingFromHc@
 # rather than registerised code, i.e., disable the mangler?
 BootingFromUnregisterisedHc = @BootingFromUnregisterisedHc@
 
-#
-# Which ways should DocBook XML documents be built?
-# options are: dvi ps pdf html chm HxS
-#
-XMLDocWays=
+NO_INCLUDE_DEPS = NO
+NO_INCLUDE_PKGDATA = NO
 
 # Should we build latex docs?
 LATEX_DOCS = NO
@@ -360,38 +357,6 @@ PapiIncludeDir=
 
 ################################################################################
 #
-#              nofib
-#
-#      nofib specific options
-#
-################################################################################
-
-WithNofibHc = $(GHC_INPLACE)
-
-# NoFibSubDirs controls which set of tests should be run
-# You can run one or more of
-#      imaginary 
-#      spectral
-#      real
-#      parallel
-#      PRIVATE
-#      PENDING
-#      UNUSED
-NoFibSubDirs = imaginary spectral real
-
-# The different ways to build nofib. Default is just to mirror
-# what is done for the ghc prelude libraries.
-#
-NoFibWays = $(GhcLibWays)
-
-# Haskell compiler options for nofib
-NoFibHcOpts = -O
-
-# Number of times to run each program
-NoFibRuns = 5
-
-################################################################################
-#
 #              Paths (see paths.mk)
 #
 ################################################################################
@@ -610,7 +575,6 @@ GHC_COMPAT_DIR          = compat
 
 GHC_MKDEPENDC_DIR       = $(GHC_UTILS_DIR)/mkdependC
 GHC_LTX_DIR             = $(GHC_UTILS_DIR)/ltx
-GHC_RUNTEST_DIR         = $(GHC_UTILS_DIR)/runstdtest
 GHC_LNDIR_DIR           = $(GHC_UTILS_DIR)/lndir
 GHC_MKDIRHIER_DIR       = $(GHC_UTILS_DIR)/mkdirhier
 GHC_DOCBOOK_DIR         = $(GHC_UTILS_DIR)/docbook
@@ -651,7 +615,6 @@ GHC_MKDEPENDC_PGM       = mkdependC
 GHC_LTX_PGM             = ltx$(exeext)
 GHC_MKDIRHIER_PGM       = mkdirhier
 GHC_LNDIR_PGM           = lndir
-GHC_RUNTEST_PGM         = runstdtest
 GHC_DUMMY_GHC_PGM       = dummy-ghc$(exeext)
 
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
@@ -669,7 +632,6 @@ SPLIT                       = $(INPLACE_LIB)/$(GHC_SPLIT_PGM)
 SYSMAN                         = $(GHC_SYSMAN_DIR)/$(GHC_SYSMAN_PGM)
 LTX                    = $(GHC_LTX_DIR)/$(GHC_LTX_PGM)
 LNDIR                  = $(GHC_LNDIR_DIR)/$(GHC_LNDIR_PGM)
-RUNTEST                        = $(GHC_RUNTEST_DIR)/$(GHC_RUNTEST_PGM)
 
 INPLACE                        = inplace
 INPLACE_BIN            = $(INPLACE)/bin
@@ -924,12 +886,12 @@ ISCC                    =
 #-----------------------------------------------------------------------------
 # DocBook XML stuff
 
+BUILD_DOCBOOK_HTML = @BUILD_DOCBOOK_HTML@
+BUILD_DOCBOOK_PS = @BUILD_DOCBOOK_PS@
+BUILD_DOCBOOK_PDF = @BUILD_DOCBOOK_PDF@
+DBLATEX                = @DblatexCmd@
 XSLTPROC               = @XsltprocCmd@
 XMLLINT                        = @XmllintCmd@
-FOP                    = @FopCmd@
-XMLTEX                 = @XmltexCmd@
-PDFXMLTEX              = @PdfxmltexCmd@
-DVIPS                  = @DvipsCmd@
 
 DIR_DOCBOOK_XSL                = @DIR_DOCBOOK_XSL@