From cf663b377e1ef2ae8e4b7166e72562c37f59c410 Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Wed, 19 Sep 2012 01:20:46 -0400 Subject: [PATCH] Update docs directives. --- Makefile.am | 2 -- docs/include.am | 16 +++++++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4394dec4..b0babeca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,8 +54,6 @@ include win32/include.am include m4/include.am -docs: html man - TESTS += ${check_PROGRAMS} EXTRA_DIST+= ${man_MANS} diff --git a/docs/include.am b/docs/include.am index 55e98972..4a69ef07 100644 --- a/docs/include.am +++ b/docs/include.am @@ -135,6 +135,9 @@ man_MANS+= docs/man/memslap.1 man_MANS+= docs/man/memstat.1 if HAVE_SPHINX + +docs: html man + sphinx-help: @echo "Please use \`make ' where is one of" @echo " html to make standalone HTML files" @@ -158,17 +161,20 @@ install-html: html-local @rm -r -f /var/www/libmemcached/* @cp -r docs/html /var/www/libmemcached -html-local: docs/conf.py changes docs +docs/_static: + @$(mkdir_p) docs/_static + +html-local: docs/conf.py docs changes docs/_static PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/html @echo @echo "Build finished. The HTML pages are in $(SPHINX_BUILDDIR)/html." -dirhtml: docs/conf.py changes +dirhtml: html-local PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/dirhtml @echo @echo "Build finished. The HTML pages are in $(SPHINX_BUILDDIR)/dirhtml." -singlehtml: docs/conf.py changes +singlehtml: html-local PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/singlehtml @echo @echo "Build finished. The HTML page is in $(SPHINX_BUILDDIR)/singlehtml." @@ -251,4 +257,8 @@ doctest: @echo "Testing of doctests in the sources finished, look at the " \ "results in $(SPHINX_BUILDDIR)/doctest/output.txt." +else + +docs: + endif -- 2.30.2