Run Sphinx without the -W flag when building documentation

In "make html", don't use the -W flag with Sphinx. This makes it
possible to create the documentation with Sphinx 1.0 without errors,
as the warning about using old-style C markup isn't turned to an
error.

Don't build documentation in "make check". Instead, add a new make
target "check-doc" to build the documentation with the -W flag.
This commit is contained in:
Petri Lehtinen
2010-09-06 20:46:14 +03:00
parent 145032a57f
commit 3d5c0f46f1
2 changed files with 3 additions and 2 deletions

View File

@@ -1,7 +1,8 @@
EXTRA_DIST = CHANGES LICENSE README.rst
SUBDIRS = doc src test
check-local: html
check-doc:
$(MAKE) SPHINXOPTS_EXTRA=-W html
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = jansson.pc

View File

@@ -3,7 +3,7 @@ EXTRA_DIST = conf.py apiref.rst changes.rst conformance.rst \
ext/refcounting.py
SPHINXBUILD = sphinx-build
SPHINXOPTS = -d _build/doctrees -W
SPHINXOPTS = -d _build/doctrees $(SPHINXOPTS_EXTRA)
html-local:
$(SPHINXBUILD) -b html $(SPHINXOPTS) $(srcdir) _build/html