projects
/
jansson.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
8567816
)
Merge branch '1.3'
author
Petri Lehtinen
<petri@digip.org>
Mon, 6 Sep 2010 17:48:25 +0000
(20:48 +0300)
committer
Petri Lehtinen
<petri@digip.org>
Mon, 6 Sep 2010 17:48:25 +0000
(20:48 +0300)
Makefile.am
patch
|
blob
|
history
doc/Makefile.am
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index
a141cd5
..
173c7de
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-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
diff --git
a/doc/Makefile.am
b/doc/Makefile.am
index
74a715c
..
1f2d855
100644
(file)
--- a/
doc/Makefile.am
+++ b/
doc/Makefile.am
@@
-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