burnin: fix default growth parameter

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a76de28..0474980 100644 (file)
--- 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 \
@@ -106,17 +107,12 @@ docsgml = \
        doc/iallocator.sgml
 
 docrst = \
-       doc/design-2.0-cluster-parameters.rst \
-       doc/design-2.0-commandline-parameters.rst \
-       doc/design-2.0-disk-handling.rst \
-       doc/design-2.0-index.rst \
-       doc/design-2.0-job-queue.rst \
-       doc/design-2.0-locking.rst \
-       doc/design-2.0-master-daemon.rst \
-       doc/design-2.0-os-interface.rst \
-       doc/design-2.0-rapi-changes.rst \
+       doc/design-2.0.rst \
        doc/security.rst
 
+docdot = \
+       doc/arch-2.0.dot
+
 doc_DATA = \
        $(patsubst %.rst,%.html,$(docrst)) \
        $(patsubst %.sgml,%.html,$(docsgml)) \
@@ -147,6 +143,7 @@ EXTRA_DIST = \
        autotools/docbook-wrapper \
        devel/upload.in \
        $(docrst) \
+       $(docdot) \
        $(docsgml) \
        doc/build-rapi-resources-doc \
        doc/examples/ganeti.initd.in \
@@ -194,18 +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.cli_unittest.py
+       test/ganeti.serializer_unittest.py \
+       test/ganeti.ssh_unittest.py \
+       test/ganeti.utils_unittest.py \
+       test/ganeti.workerpool_unittest.py
 
 nodist_TESTS =
 
@@ -240,6 +238,11 @@ doc/%.html: doc/%.in $(DOCBOOK_WRAPPER)
 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.in: doc/rapi-resources.sgml
 
 doc/rapi-resources.sgml: $(BUILD_RAPI_RESOURCE_DOC) lib/rapi/connector.py
@@ -306,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: