X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/a39ec11ae3c5435de86a9fd669371c22179da29d..f768530ce68d9a61209e2519753860edb0478830:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c1d7cd7..0474980 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,6 +41,7 @@ CLEANFILES = \
 	doc/*.html \
 	doc/*.in \
 	doc/*.pdf \
+	$(patsubst %.dot,%.png,$(docdot)) \
 	doc/rapi-resources.sgml \
 	doc/examples/ganeti.initd \
 	doc/examples/ganeti.cron \
@@ -66,12 +67,12 @@ pkgpython_PYTHON = \
 	lib/cmdlib.py \
 	lib/config.py \
 	lib/constants.py \
+	lib/daemon.py \
 	lib/errors.py \
 	lib/http.py \
 	lib/jqueue.py \
 	lib/jstore.py \
 	lib/locking.py \
-	lib/logger.py \
 	lib/luxi.py \
 	lib/mcpu.py \
 	lib/objects.py \
@@ -92,7 +93,6 @@ hypervisor_PYTHON = \
 
 rapi_PYTHON = \
 	lib/rapi/__init__.py \
-	lib/rapi/httperror.py \
 	lib/rapi/baserlib.py \
 	lib/rapi/connector.py \
 	lib/rapi/rlib1.py \
@@ -106,7 +106,15 @@ docsgml = \
 	doc/rapi.sgml \
 	doc/iallocator.sgml
 
+docrst = \
+	doc/design-2.0.rst \
+	doc/security.rst
+
+docdot = \
+	doc/arch-2.0.dot
+
 doc_DATA = \
+	$(patsubst %.rst,%.html,$(docrst)) \
 	$(patsubst %.sgml,%.html,$(docsgml)) \
 	$(patsubst %.sgml,%.pdf,$(docsgml))
 
@@ -134,11 +142,14 @@ EXTRA_DIST = \
 	DEVNOTES \
 	autotools/docbook-wrapper \
 	devel/upload.in \
+	$(docrst) \
+	$(docdot) \
 	$(docsgml) \
 	doc/build-rapi-resources-doc \
 	doc/examples/ganeti.initd.in \
 	doc/examples/ganeti.cron.in \
 	doc/examples/dumb-allocator \
+	doc/locking.txt \
 	test/testutils.py \
 	test/mocks.py \
 	$(dist_TESTS) \
@@ -146,7 +157,7 @@ EXTRA_DIST = \
 	man/footer.sgml \
 	$(mansgml) \
 	qa/ganeti-qa.py \
-	qa/qa-sample.yaml \
+	qa/qa-sample.json \
 	qa/qa_cluster.py \
 	qa/qa_config.py \
 	qa/qa_daemon.py \
@@ -180,17 +191,19 @@ TEST_FILES = \
 	test/data/proc_drbd8.txt
 
 dist_TESTS = \
+	test/ganeti.bdev_unittest.py \
+	test/ganeti.cli_unittest.py \
+	test/ganeti.cmdlib_unittest.py \
 	test/ganeti.config_unittest.py \
+	test/ganeti.constants_unittest.py \
 	test/ganeti.hooks_unittest.py \
-	test/ganeti.utils_unittest.py \
-	test/ganeti.bdev_unittest.py \
-	test/ganeti.ssh_unittest.py \
+	test/ganeti.http_unittest.py \
 	test/ganeti.locking_unittest.py \
-	test/ganeti.serializer_unittest.py \
-	test/ganeti.workerpool_unittest.py \
 	test/ganeti.rapi.resources_unittest.py \
-	test/ganeti.http_unittest.py \
-	test/ganeti.constants_unittest.py
+	test/ganeti.serializer_unittest.py \
+	test/ganeti.ssh_unittest.py \
+	test/ganeti.utils_unittest.py \
+	test/ganeti.workerpool_unittest.py
 
 nodist_TESTS =
 
@@ -217,21 +230,29 @@ man/%.in: man/%.sgml stamp-directories $(REPLACE_VARS_SED)
 	sed -f $(REPLACE_VARS_SED) < $< > $@
 
 doc/%.pdf: doc/%.in $(DOCBOOK_WRAPPER)
-	$(DOCBOOK_WRAPPER) $< $@
+	$(DOCBOOK_WRAPPER) "$(DOCBOOK2PDF)" $< $@
 
 doc/%.html: doc/%.in $(DOCBOOK_WRAPPER)
-	$(DOCBOOK_WRAPPER) $< $@
+	$(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $@
+
+doc/%.html: doc/%.rst
+	$(RST2HTML) $< $@
+
+doc/%.png: doc/%.dot
+	$(DOT) -Tpng -o $@ $<
+
+doc/design-2.0.html: doc/design-2.0.rst doc/arch-2.0.png
 
-doc/rapi.pdf doc/rapi.html: doc/rapi-resources.sgml
+doc/rapi.pdf doc/rapi.html doc/rapi.in: doc/rapi-resources.sgml
 
 doc/rapi-resources.sgml: $(BUILD_RAPI_RESOURCE_DOC) lib/rapi/connector.py
 	PYTHONPATH=.:$(top_builddir) $(BUILD_RAPI_RESOURCE_DOC) > $@ || rm -f $@
 
 man/%.7: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
-	$(DOCBOOK_WRAPPER) $< $@
+	$(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@
 
 man/%.8: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
-	$(DOCBOOK_WRAPPER) $< $@
+	$(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@
 
 man/footer.sgml $(TESTS): srclinks
 
@@ -288,7 +309,7 @@ srclinks: stamp-directories
 
 .PHONY: ganeti
 ganeti:
-	cd $(top_builddir) && rm -f $@ && $(LN_S) lib $@
+	cd $(top_builddir) && test -h "$@" || { rm -f $@ && $(LN_S) lib $@; }
 
 # a dist hook rule for catching revision control directories
 distcheck-hook: