Added targets for PDF and multi-page HTML

 - also updated -M to -b which is supported by sphinx 2.x

diff --git a/doc/Makefile.am b/doc/Makefile.am
index da65824d768c5781461aee8d5d73f4a49406c1bf..8af9ce31f66ffb4676c9982c732a16ec5e97a6b0 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -185,6 +185,12 @@ devel:
 guide:
        $(MAKE) -C guide kea-guide.html
 
+pdf:
+       $(MAKE) -C guide kea-guide.pdf
+
+pages:
+       $(MAKE) -C guide pages
+
 clean:
        rm -rf html
 

diff --git a/doc/guide/Makefile.am b/doc/guide/Makefile.am
index 755fbd24d2cf7c78549212e607eca2008da757d3..d43c785d0dbb0578560f776242f56a5d29ba5c9a 100644 (file)
--- a/doc/guide/Makefile.am
+++ b/doc/guide/Makefile.am
@@ -36,12 +36,15 @@ sphinxbuild = sphinx-build
 sphinxopts = -E
 
 kea-guide.pdf: $(rst_sources)
-       @$(sphinxbuild) -M latexpdf $(srcdir) $(builddir)/_build $(sphinxopts)
+       @$(sphinxbuild) -b latex $(srcdir) $(builddir)/_build $(sphinxopts)
 
 kea-guide.html: $(rst_sources)
-       @$(sphinxbuild) -M singlehtml $(srcdir) $(builddir)/_build $(sphinxopts)
+       @$(sphinxbuild) -b singlehtml $(srcdir) $(builddir)/_build $(sphinxopts)
+
+pages: $(rst_sources)
+       @$(sphinxbuild) -b html $(srcdir) $(builddir)/_build2 $(sphinxopts)
 
 
 EXTRA_DIST = $(rst_sources)
 
-# TODO: here should ba added some stuff for DIST, etc to be consumed by automake/autoconf
+# TODO: here should be added some stuff for DIST, etc to be consumed by automake/autoconf