summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
Diffstat (limited to 'mk')
-rw-r--r--mk/config.mk.in23
-rw-r--r--mk/flavours/bench-cross.mk6
-rw-r--r--mk/flavours/bench-llvm.mk6
-rw-r--r--mk/flavours/bench.mk6
-rw-r--r--mk/flavours/devel1.mk6
-rw-r--r--mk/flavours/devel2.mk6
-rw-r--r--mk/flavours/perf-cross.mk6
-rw-r--r--mk/flavours/perf-llvm.mk6
-rw-r--r--mk/flavours/perf.mk6
-rw-r--r--mk/flavours/prof.mk6
-rw-r--r--mk/flavours/quick-cross.mk6
-rw-r--r--mk/flavours/quick-llvm.mk6
-rw-r--r--mk/flavours/quick.mk6
-rw-r--r--mk/flavours/quickest.mk6
-rw-r--r--mk/flavours/validate.mk6
15 files changed, 50 insertions, 57 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 1b46ed73f7..a2ca97eafd 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -755,21 +755,14 @@ HSCOLOUR_CMD = @HSCOLOUR@
TIME_CMD = @TimeCmd@
#-----------------------------------------------------------------------------
-# DocBook XML stuff
-
-BUILD_DOCBOOK_HTML = @BUILD_DOCBOOK_HTML@
-BUILD_DOCBOOK_PS = @BUILD_DOCBOOK_PS@
-BUILD_DOCBOOK_PDF = @BUILD_DOCBOOK_PDF@
-DBLATEX = @DblatexCmd@
-# filename.as.url=0 is needed with dblatex 0.3.4 (#7486)
-DBLATEX_OPTS = -P 'filename.as.url=0' -P 'latex.unicode.use=1'
-XSLTPROC = @XsltprocCmd@
-XMLLINT = @XmllintCmd@
-HAVE_DOCBOOK_XSL = @HAVE_DOCBOOK_XSL@
-XSLTPROC_HTML_STYLESHEET = http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl
-XSLTPROC_LABEL_OPTS = --stringparam toc.section.depth 3 \
- --stringparam section.autolabel 1 \
- --stringparam section.label.includes.component.label 1
+# Sphinx stuff
+
+SPHINXBUILD = @SPHINXBUILD@
+BUILD_MAN = @BUILD_MAN@
+BUILD_SPHINX_HTML = @BUILD_SPHINX_HTML@
+BUILD_SPHINX_PDF = @BUILD_SPHINX_PDF@
+SPHINXOPTS = -D latex_paper_size=letter
+XELATEX = @XELATEX@
#-----------------------------------------------------------------------------
# FPtools support software
diff --git a/mk/flavours/bench-cross.mk b/mk/flavours/bench-cross.mk
index 496d38acc7..0dea042e51 100644
--- a/mk/flavours/bench-cross.mk
+++ b/mk/flavours/bench-cross.mk
@@ -5,9 +5,9 @@ GhcLibHcOpts = -O2 -fllvm
BUILD_PROF_LIBS = NO
SplitObjs = NO
HADDOCK_DOCS = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS = NO
-BUILD_DOCBOOK_PDF = NO
+BUILD_SPHINX_HTML = NO
+BUILD_SPHINX_PS = NO
+BUILD_SPHINX_PDF = NO
INTEGER_LIBRARY = integer-simple
Stage1Only = YES
diff --git a/mk/flavours/bench-llvm.mk b/mk/flavours/bench-llvm.mk
index 816d7c7b0d..8a73f551c0 100644
--- a/mk/flavours/bench-llvm.mk
+++ b/mk/flavours/bench-llvm.mk
@@ -5,6 +5,6 @@ GhcLibHcOpts = -O2
BUILD_PROF_LIBS = NO
SplitObjs = NO
HADDOCK_DOCS = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS = NO
-BUILD_DOCBOOK_PDF = NO
+BUILD_SPHINX_HTML = NO
+BUILD_SPHINX_PS = NO
+BUILD_SPHINX_PDF = NO
diff --git a/mk/flavours/bench.mk b/mk/flavours/bench.mk
index ea4b18e3d5..edf73f4270 100644
--- a/mk/flavours/bench.mk
+++ b/mk/flavours/bench.mk
@@ -5,6 +5,6 @@ GhcLibHcOpts = -O2
BUILD_PROF_LIBS = NO
SplitObjs = NO
HADDOCK_DOCS = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS = NO
-BUILD_DOCBOOK_PDF = NO
+BUILD_SPHINX_HTML = NO
+BUILD_SPHINX_PS = NO
+BUILD_SPHINX_PDF = NO
diff --git a/mk/flavours/devel1.mk b/mk/flavours/devel1.mk
index b06b64f72d..6b69adf8f9 100644
--- a/mk/flavours/devel1.mk
+++ b/mk/flavours/devel1.mk
@@ -5,8 +5,8 @@ GhcLibHcOpts = -O -dcore-lint
BUILD_PROF_LIBS = NO
SplitObjs = NO
HADDOCK_DOCS = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS = NO
-BUILD_DOCBOOK_PDF = NO
+BUILD_SPHINX_HTML = NO
+BUILD_SPHINX_PS = NO
+BUILD_SPHINX_PDF = NO
LAX_DEPENDENCIES = YES
diff --git a/mk/flavours/devel2.mk b/mk/flavours/devel2.mk
index 156522687d..c7998229cf 100644
--- a/mk/flavours/devel2.mk
+++ b/mk/flavours/devel2.mk
@@ -5,8 +5,8 @@ GhcLibHcOpts = -O -dcore-lint
BUILD_PROF_LIBS = NO
SplitObjs = NO
HADDOCK_DOCS = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS = NO
-BUILD_DOCBOOK_PDF = NO
+BUILD_SPHINX_HTML = NO
+BUILD_SPHINX_PS = NO
+BUILD_SPHINX_PDF = NO
LAX_DEPENDENCIES = YES
diff --git a/mk/flavours/perf-cross.mk b/mk/flavours/perf-cross.mk
index 0dd9c33cfe..4fa8417494 100644
--- a/mk/flavours/perf-cross.mk
+++ b/mk/flavours/perf-cross.mk
@@ -5,9 +5,9 @@ GhcLibHcOpts = -O2 -fllvm
BUILD_PROF_LIBS = YES
#SplitObjs
HADDOCK_DOCS = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS = NO
-BUILD_DOCBOOK_PDF = NO
+BUILD_SPHINX_HTML = NO
+BUILD_SPHINX_PS = NO
+BUILD_SPHINX_PDF = NO
INTEGER_LIBRARY = integer-simple
Stage1Only = YES
diff --git a/mk/flavours/perf-llvm.mk b/mk/flavours/perf-llvm.mk
index c49849fd36..4a93d6b6bc 100644
--- a/mk/flavours/perf-llvm.mk
+++ b/mk/flavours/perf-llvm.mk
@@ -5,6 +5,6 @@ GhcLibHcOpts = -O2
BUILD_PROF_LIBS = YES
#SplitObjs
#HADDOCK_DOCS
-#BUILD_DOCBOOK_HTML
-#BUILD_DOCBOOK_PS
-#BUILD_DOCBOOK_PDF
+#BUILD_SPHINX_HTML
+#BUILD_SPHINX_PS
+#BUILD_SPHINX_PDF
diff --git a/mk/flavours/perf.mk b/mk/flavours/perf.mk
index d68f2f9102..c94b860af1 100644
--- a/mk/flavours/perf.mk
+++ b/mk/flavours/perf.mk
@@ -5,6 +5,6 @@ GhcLibHcOpts = -O2
BUILD_PROF_LIBS = YES
#SplitObjs
#HADDOCK_DOCS
-#BUILD_DOCBOOK_HTML
-#BUILD_DOCBOOK_PS
-#BUILD_DOCBOOK_PDF
+#BUILD_SPHINX_HTML
+#BUILD_SPHINX_PS
+#BUILD_SPHINX_PDF
diff --git a/mk/flavours/prof.mk b/mk/flavours/prof.mk
index 553cb120f7..c751332743 100644
--- a/mk/flavours/prof.mk
+++ b/mk/flavours/prof.mk
@@ -5,8 +5,8 @@ GhcLibHcOpts = -O
BUILD_PROF_LIBS = YES
SplitObjs = NO
HADDOCK_DOCS = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS = NO
-BUILD_DOCBOOK_PDF = NO
+BUILD_SPHINX_HTML = NO
+BUILD_SPHINX_PS = NO
+BUILD_SPHINX_PDF = NO
GhcProfiled = YES
diff --git a/mk/flavours/quick-cross.mk b/mk/flavours/quick-cross.mk
index 9b6fc27e67..3851bbfd13 100644
--- a/mk/flavours/quick-cross.mk
+++ b/mk/flavours/quick-cross.mk
@@ -5,9 +5,9 @@ GhcLibHcOpts = -O -fllvm
BUILD_PROF_LIBS = NO
SplitObjs = NO
HADDOCK_DOCS = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS = NO
-BUILD_DOCBOOK_PDF = NO
+BUILD_SPHINX_HTML = NO
+BUILD_SPHINX_PS = NO
+BUILD_SPHINX_PDF = NO
INTEGER_LIBRARY = integer-simple
Stage1Only = YES
diff --git a/mk/flavours/quick-llvm.mk b/mk/flavours/quick-llvm.mk
index e565327822..7a19d0b1be 100644
--- a/mk/flavours/quick-llvm.mk
+++ b/mk/flavours/quick-llvm.mk
@@ -5,6 +5,6 @@ GhcLibHcOpts = -O
BUILD_PROF_LIBS = NO
SplitObjs = NO
HADDOCK_DOCS = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS = NO
-BUILD_DOCBOOK_PDF = NO
+BUILD_SPHINX_HTML = NO
+BUILD_SPHINX_PS = NO
+BUILD_SPHINX_PDF = NO
diff --git a/mk/flavours/quick.mk b/mk/flavours/quick.mk
index eef6dc5c1a..ab8d7b3bf0 100644
--- a/mk/flavours/quick.mk
+++ b/mk/flavours/quick.mk
@@ -5,6 +5,6 @@ GhcLibHcOpts = -O
BUILD_PROF_LIBS = NO
SplitObjs = NO
HADDOCK_DOCS = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS = NO
-BUILD_DOCBOOK_PDF = NO
+BUILD_SPHINX_HTML = NO
+BUILD_SPHINX_PS = NO
+BUILD_SPHINX_PDF = NO
diff --git a/mk/flavours/quickest.mk b/mk/flavours/quickest.mk
index 71e7c5e94c..63dd5ebc13 100644
--- a/mk/flavours/quickest.mk
+++ b/mk/flavours/quickest.mk
@@ -5,6 +5,6 @@ GhcLibHcOpts = -O0
BUILD_PROF_LIBS = NO
SplitObjs = NO
HADDOCK_DOCS = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS = NO
-BUILD_DOCBOOK_PDF = NO
+BUILD_SPHINX_HTML = NO
+BUILD_SPHINX_PS = NO
+BUILD_SPHINX_PDF = NO
diff --git a/mk/flavours/validate.mk b/mk/flavours/validate.mk
index 7f74356f05..0bb7b92398 100644
--- a/mk/flavours/validate.mk
+++ b/mk/flavours/validate.mk
@@ -5,9 +5,9 @@ GhcLibHcOpts = -O -dcore-lint
BUILD_PROF_LIBS = NO
SplitObjs = NO
HADDOCK_DOCS = YES
-BUILD_DOCBOOK_HTML = YES
-BUILD_DOCBOOK_PS = NO
-BUILD_DOCBOOK_PDF = NO
+BUILD_SPHINX_HTML = YES
+BUILD_SPHINX_PS = NO
+BUILD_SPHINX_PDF = NO
ifeq "$(ValidateHpc)" "YES"
GhcStage2HcOpts += -fhpc -hpcdir $(TOP)/testsuite/hpc_output/
View Lorry Controller Status