backend.py change to get cluster name from master

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 38efd06..cbc9ac7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,7 +106,17 @@ docsgml = \
        doc/rapi.sgml \
        doc/iallocator.sgml
 
        doc/rapi.sgml \
        doc/iallocator.sgml
 

+docrst = \
+       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-rapi-changes.rst
+

 doc_DATA = \
 doc_DATA = \

+       $(patsubst %.rst,%.html,$(docrst)) \

        $(patsubst %.sgml,%.html,$(docsgml)) \
        $(patsubst %.sgml,%.pdf,$(docsgml))
 
        $(patsubst %.sgml,%.html,$(docsgml)) \
        $(patsubst %.sgml,%.pdf,$(docsgml))
 

@@ -134,11 +144,13 @@ EXTRA_DIST = \
        DEVNOTES \
        autotools/docbook-wrapper \
        devel/upload.in \
        DEVNOTES \
        autotools/docbook-wrapper \
        devel/upload.in \

+       $(docrst) \

        $(docsgml) \
        doc/build-rapi-resources-doc \
        doc/examples/ganeti.initd.in \
        doc/examples/ganeti.cron.in \
        doc/examples/dumb-allocator \
        $(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) \
        test/testutils.py \
        test/mocks.py \
        $(dist_TESTS) \

@@ -146,7 +158,7 @@ EXTRA_DIST = \
        man/footer.sgml \
        $(mansgml) \
        qa/ganeti-qa.py \
        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 \
        qa/qa_cluster.py \
        qa/qa_config.py \
        qa/qa_daemon.py \

@@ -155,7 +167,6 @@ EXTRA_DIST = \
        qa/qa_instance.py \
        qa/qa_node.py \
        qa/qa_os.py \
        qa/qa_instance.py \
        qa/qa_node.py \
        qa/qa_os.py \

-       qa/qa_other.py \

        qa/qa_rapi.py \
        qa/qa_tags.py \
        qa/qa_utils.py
        qa/qa_rapi.py \
        qa/qa_tags.py \
        qa/qa_utils.py

@@ -218,21 +229,24 @@ man/%.in: man/%.sgml stamp-directories $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
 
 doc/%.pdf: doc/%.in $(DOCBOOK_WRAPPER)
        sed -f $(REPLACE_VARS_SED) < $< > $@
 
 doc/%.pdf: doc/%.in $(DOCBOOK_WRAPPER)

-       $(DOCBOOK_WRAPPER) $< $@
+       $(DOCBOOK_WRAPPER) "$(DOCBOOK2PDF)" $< $@

 
 doc/%.html: doc/%.in $(DOCBOOK_WRAPPER)
 
 doc/%.html: doc/%.in $(DOCBOOK_WRAPPER)

-       $(DOCBOOK_WRAPPER) $< $@
+       $(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $@
+
+doc/%.html: doc/%.rst
+       $(RST2HTML) $< $@

 
 

-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)
 
 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)
 
 man/%.8: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)

-       $(DOCBOOK_WRAPPER) $< $@
+       $(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@

 
 man/footer.sgml $(TESTS): srclinks
 
 
 man/footer.sgml $(TESTS): srclinks