From a2358cd76ce06b2d4391c9c16c42105ef4614420 Mon Sep 17 00:00:00 2001 From: Michal Nowikowski Date: Fri, 19 Jul 2019 15:28:15 +0200 Subject: [PATCH] fixed building sphinx docs on ubuntu 18.04 --- Makefile.am | 11 ++--------- doc/sphinx/Makefile.am | 2 +- doc/sphinx/arm/manpages.rst | 12 ------------ doc/sphinx/index.rst | 11 +++++++++++ hammer.py | 2 +- 5 files changed, 15 insertions(+), 23 deletions(-) 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