X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/6d81475ca04828b3e849541581ad6008b0dc81c6..cd098c41522469e462efeb1e157a8718ff7b7809:/Makefile.am?ds=sidebyside

diff --git a/Makefile.am b/Makefile.am
index d441fae..bfb5862 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,10 +37,12 @@ DIRS = \
 	tools
 
 MAINTAINERCLEANFILES = \
-	$(dochtml) \
-	$(patsubst %.dot,%.png,$(docdot)) \
+	$(docpng) \
 	$(maninput)
 
+maintainer-clean-local:
+	-rm -rf doc/api doc/build doc/html
+
 CLEANFILES = \
 	autotools/replace_vars.sed \
 	devel/upload \
@@ -109,20 +111,31 @@ http_PYTHON = \
 docrst = \
 	doc/admin.rst \
 	doc/design-2.0.rst \
+	doc/glossary.rst \
 	doc/hooks.rst \
 	doc/iallocator.rst \
+	doc/index.rst \
 	doc/install.rst \
 	doc/rapi.rst \
 	doc/security.rst
 
-dochtml = $(patsubst %.rst,%.html,$(docrst))
+doc/html: $(docrst) $(docpng) doc/conf.py configure.ac
+	@test -n "$(SPHINX)" || \
+	    { echo 'sphinx-build' not found during configure; exit 1; }
+	mkdir -p doc/build/doctrees
+	PYTHONPATH=.:$(top_builddir) sphinx-build -q -b html \
+	    -d doc/build/doctrees \
+	    -D version="$(VERSION_MAJOR).$(VERSION_MINOR)" \
+	    -D release="$(PACKAGE_VERSION)" \
+	    $(top_srcdir)/doc doc/html
+	touch "$@"
 
 docdot = \
 	doc/arch-2.0.dot
 
-doc_DATA = $(dochtml)
+docpng = $(patsubst %.dot,%.png,$(docdot))
 
-noinst_DATA = $(manhtml)
+noinst_DATA = $(manhtml) doc/html
 
 dist_sbin_SCRIPTS = \
 	daemons/ganeti-noded \
@@ -149,8 +162,10 @@ EXTRA_DIST = \
 	DEVNOTES \
 	autotools/docbook-wrapper \
 	devel/upload.in \
-	$(docrst) \
 	$(docdot) \
+	$(docrst) \
+	doc/conf.py \
+	doc/html \
 	doc/examples/bash_completion.in \
 	doc/examples/ganeti.initd.in \
 	doc/examples/ganeti.cron.in \
@@ -197,9 +212,11 @@ maninput = $(patsubst %.7,%.7.in,$(patsubst %.8,%.8.in,$(man_MANS))) $(patsubst
 
 TEST_FILES = \
 	test/data/bdev-both.txt \
+	test/data/bdev-8.3-both.txt \
 	test/data/bdev-disk.txt \
 	test/data/bdev-net.txt \
-	test/data/proc_drbd8.txt
+	test/data/proc_drbd8.txt \
+	test/data/proc_drbd83.txt
 
 dist_TESTS = \
 	test/ganeti.bdev_unittest.py \
@@ -220,7 +237,7 @@ nodist_TESTS =
 
 TESTS = $(dist_TESTS) $(nodist_TESTS)
 
-TESTS_ENVIRONMENT = PYTHONPATH=.:$(top_builddir)
+TESTS_ENVIRONMENT = PYTHONPATH=.:$(top_builddir) $(PYTHON)
 
 all-local: stamp-directories lib/_autoconf.py devel/upload \
 	doc/examples/bash_completion \
@@ -234,16 +251,10 @@ doc/examples/%: doc/examples/%.in stamp-directories \
 		$(REPLACE_VARS_SED)
 	sed -f $(REPLACE_VARS_SED) < $< > $@
 
-doc/%.html: doc/%.rst
-	@test -n "$(RST2HTML)" || { echo 'rst2html' not found during configure; exit 1; }
-	$(RST2HTML) $< $@
-
 doc/%.png: doc/%.dot
 	@test -n "$(DOT)" || { echo 'dot' not found during configure; exit 1; }
 	$(DOT) -Tpng -o $@ $<
 
-doc/design-2.0.html: doc/design-2.0.rst doc/arch-2.0.png
-
 man/%.7.in man/%.8.in: man/%.sgml man/footer.sgml $(DOCBOOK_WRAPPER)
 	@test -n "$(DOCBOOK2MAN)" || { echo 'docbook2html' not found during configure; exit 1; }
 	TMPDIR=`mktemp -d` && { \
@@ -364,4 +375,11 @@ apidoc:
 		rm -rf $$TMPDIR ; \
 	}
 
+.PHONY: TAGS
+TAGS:
+	rm -f TAGS
+	find . -path './lib/*.py' -o -path 'scripts/gnt-*' -o \
+	  -path 'daemons/ganeti-*' -o -path 'tools/*' | \
+	  etags -
+
 # vim: set noet :