From: Michal Nowikowski <godfryd@isc.org>
Date: Fri, 19 Jul 2019 13:28:15 +0000 (+0200)
Subject: fixed building sphinx docs on ubuntu 18.04
X-Git-Tag: Kea-1.6.1~10^2~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2358cd76ce06b2d4391c9c16c42105ef4614420;p=thirdparty%2Fkea.git

fixed building sphinx docs on ubuntu 18.04
---

diff --git a/Makefile.am b/Makefile.am
index b8a1e628bc..c34c8b9ebd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -147,15 +147,8 @@ cppcheck:
 		src
 
 # this is a shortcut that builds only documentation dependecies and documentation itself
-gen-docs:
-	$(MAKE) -C src/lib/exceptions
-	$(MAKE) -C src/lib/asiolink
-	$(MAKE) -C src/lib/util
-	$(MAKE) -C src/lib/cc
-	$(MAKE) -C tools
-	$(MAKE) -C doc api
-	$(MAKE) -C doc
-	$(MAKE) -C doc/guide pdf
+docs:
+	$(MAKE) -C doc/sphinx
 
 
 # These steps are necessary during installation
diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
index ed988366ad..f0a9993e79 100644
--- a/doc/sphinx/Makefile.am
+++ b/doc/sphinx/Makefile.am
@@ -9,7 +9,7 @@ sphinxopts+=-v
 sphinxopts+=-E
 sphinxopts+=-a
 sphinxopts+=-W
-sphinxopts+=-j auto
+sphinxopts+=-j 2
 sphinxopts+=-c "${abs_srcdir}"
 
 
diff --git a/doc/sphinx/arm/manpages.rst b/doc/sphinx/arm/manpages.rst
index 362a9901a1..400ba93ba2 100644
--- a/doc/sphinx/arm/manpages.rst
+++ b/doc/sphinx/arm/manpages.rst
@@ -12,15 +12,3 @@
 
 Manual Pages
 ============
-
-.. include:: ../man/kea-shell.8.rst
-.. include:: ../man/kea-admin.8.rst
-.. include:: ../man/keactrl.8.rst
-.. include:: ../man/kea-ctrl-agent.8.rst
-.. include:: ../man/kea-dhcp4.8.rst
-.. include:: ../man/kea-dhcp6.8.rst
-.. include:: ../man/kea-dhcp-ddns.8.rst
-.. include:: ../man/kea-lfc.8.rst
-.. include:: ../man/kea-netconf.8.rst
-.. include:: ../man/kea-shell.8.rst
-.. include:: ../man/perfdhcp.8.rst
diff --git a/doc/sphinx/index.rst b/doc/sphinx/index.rst
index 71a386601c..75f2b76405 100644
--- a/doc/sphinx/index.rst
+++ b/doc/sphinx/index.rst
@@ -47,6 +47,17 @@ Kea, can be found in ISC's `Knowledgebase <https://kb.isc.org/docs/kea-administr
 
    api
    arm/manpages
+   man/kea-shell.8
+   man/kea-admin.8
+   man/keactrl.8
+   man/kea-ctrl-agent.8
+   man/kea-dhcp4.8
+   man/kea-dhcp6.8
+   man/kea-dhcp-ddns.8
+   man/kea-lfc.8
+   man/kea-netconf.8
+   man/kea-shell.8
+   man/perfdhcp.8
    kea-messages
    arm/acknowledgments
 
diff --git a/hammer.py b/hammer.py
index 73a1045233..d2560466e4 100755
--- a/hammer.py
+++ b/hammer.py
@@ -1143,7 +1143,7 @@ def prepare_system_local(features, check_times):
                 packages.append('googletest')
 
         if 'docs' in features:
-            packages.extend(['dblatex', 'xsltproc', 'elinks', 'docbook-xsl'])
+            packages.extend(['python3-sphinx', 'python3-sphinx-rtd-theme', 'latexmk'])
 
         if 'native-pkg' in features:
             packages.extend(['build-essential', 'fakeroot', 'devscripts'])