Use docbook2* paths found during configure for actual build

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7507f85..e8a5599 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
 # - Keep files sorted; one line per file.
 # - Directories in lib/ must have their own *dir variable (see hypervisor).
 # - All directories must be listed DIRS.
-# - Use autogen.sh to generate Makefile.in and configure script
+# - Use autogen.sh to generate Makefile.in and configure script.
 
 # Automake doesn't export these variables before version 1.10.
 abs_top_builddir = @abs_top_builddir@
@@ -30,7 +30,6 @@ DIRS = \
        lib/rapi \
        man \
        qa \
-       qa/hooks \
        scripts \
        test \
        test/data \
@@ -51,7 +50,6 @@ CLEANFILES = \
        man/*.[78] \
        man/*.in \
        qa/*.py[co] \
-       qa/hooks/*.py[co] \
        test/*.py[co] \
        stamp-directories \
        $(nodist_pkgpython_PYTHON)
@@ -71,6 +69,7 @@ pkgpython_PYTHON = \
        lib/errors.py \
        lib/http.py \
        lib/jqueue.py \
+       lib/jstore.py \
        lib/locking.py \
        lib/logger.py \
        lib/luxi.py \
@@ -88,11 +87,11 @@ hypervisor_PYTHON = \
        lib/hypervisor/__init__.py \
        lib/hypervisor/hv_base.py \
        lib/hypervisor/hv_fake.py \
+       lib/hypervisor/hv_kvm.py \
        lib/hypervisor/hv_xen.py
 
 rapi_PYTHON = \
        lib/rapi/__init__.py \
-       lib/rapi/RESTHTTPServer.py \
        lib/rapi/httperror.py \
        lib/rapi/baserlib.py \
        lib/rapi/connector.py \
@@ -107,14 +106,22 @@ docsgml = \
        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_DATA = \
+       $(patsubst %.rst,%.html,$(docrst)) \
        $(patsubst %.sgml,%.html,$(docsgml)) \
        $(patsubst %.sgml,%.pdf,$(docsgml))
 
 dist_sbin_SCRIPTS = \
        daemons/ganeti-noded \
        daemons/ganeti-watcher \
-       daemons/ganeti-master \
        daemons/ganeti-masterd \
        daemons/ganeti-rapi \
        scripts/gnt-backup \
@@ -136,13 +143,13 @@ EXTRA_DIST = \
        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 \
-       qa/hooks/datehook.py \
-       qa/hooks/loghook.py \
+       doc/locking.txt \
        test/testutils.py \
        test/mocks.py \
        $(dist_TESTS) \
@@ -150,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 \
@@ -159,14 +166,12 @@ EXTRA_DIST = \
        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
 
 man_MANS = \
        man/ganeti.7 \
-       man/ganeti-master.8 \
        man/ganeti-noded.8 \
        man/ganeti-os-interface.7 \
        man/ganeti-watcher.8 \
@@ -223,21 +228,24 @@ 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/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
 
@@ -262,6 +270,7 @@ lib/_autoconf.py: Makefile stamp-directories
          echo "XEN_INITRD = '$(XEN_INITRD)'"; \
          echo "FILE_STORAGE_DIR = '$(FILE_STORAGE_DIR)'"; \
          echo "IALLOCATOR_SEARCH_PATH = [$(IALLOCATOR_SEARCH_PATH)]"; \
+         echo "KVM_PATH = '$(KVM_PATH)'"; \
        } > $@
 
 $(REPLACE_VARS_SED): Makefile stamp-directories