Raise on invalid gnt-cluster queue commands

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2872e7a..7206b09 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,8 @@ CLEANFILES = \
        doc/*.in \
        doc/*.pdf \
        $(patsubst %.dot,%.png,$(docdot)) \
-       doc/rapi-resources.sgml \
+       doc/rapi-resources.gen \
+       doc/examples/bash_completion \
        doc/examples/ganeti.initd \
        doc/examples/ganeti.cron \
        lib/*.py[co] \
@@ -53,6 +54,7 @@ CLEANFILES = \
        lib/rapi/*.py[co] \
        man/*.[78] \
        man/*.in \
+       man/*.html \
        qa/*.py[co] \
        test/*.py[co] \
        stamp-directories \
@@ -106,24 +108,21 @@ http_PYTHON = \
        lib/http/server.py
 
 
-docsgml = \
-       doc/hooks.sgml \
-       doc/install.sgml \
-       doc/admin.sgml \
-       doc/rapi.sgml \
-       doc/iallocator.sgml
-
 docrst = \
+       doc/admin.rst \
        doc/design-2.0.rst \
+       doc/hooks.rst \
+       doc/iallocator.rst \
+       doc/install.rst \
        doc/security.rst
 
 docdot = \
        doc/arch-2.0.dot
 
 doc_DATA = \
-       $(patsubst %.rst,%.html,$(docrst)) \
-       $(patsubst %.sgml,%.html,$(docsgml)) \
-       $(patsubst %.sgml,%.pdf,$(docsgml))
+       $(patsubst %.rst,%.html,$(docrst))
+
+noinst_DATA = $(manhtml)
 
 dist_sbin_SCRIPTS = \
        daemons/ganeti-noded \
@@ -151,8 +150,8 @@ EXTRA_DIST = \
        devel/upload.in \
        $(docrst) \
        $(docdot) \
-       $(docsgml) \
        doc/build-rapi-resources-doc \
+       doc/examples/bash_completion.in \
        doc/examples/ganeti.initd.in \
        doc/examples/ganeti.cron.in \
        doc/examples/dumb-allocator \
@@ -179,17 +178,22 @@ EXTRA_DIST = \
 
 man_MANS = \
        man/ganeti.7 \
+       man/ganeti-masterd.8 \
        man/ganeti-noded.8 \
        man/ganeti-os-interface.7 \
+       man/ganeti-rapi.8 \
        man/ganeti-watcher.8 \
        man/gnt-backup.8 \
        man/gnt-cluster.8 \
+       man/gnt-debug.8 \
        man/gnt-instance.8 \
+       man/gnt-job.8 \
        man/gnt-node.8 \
        man/gnt-os.8
 
 maninput = $(patsubst %.7,%.in,$(patsubst %.8,%.in,$(man_MANS)))
 mansgml = $(patsubst %.in,%.sgml,$(maninput))
+manhtml = $(patsubst %.in,%.html,$(maninput))
 
 TEST_FILES = \
        test/data/bdev-both.txt \
@@ -218,15 +222,17 @@ TESTS = $(dist_TESTS) $(nodist_TESTS)
 
 TESTS_ENVIRONMENT = PYTHONPATH=.:$(top_builddir)
 
+RAPI_RESOURCES = $(wildcard lib/rapi/*.py)
 
 all-local: stamp-directories lib/_autoconf.py devel/upload \
+       doc/examples/bash_completion \
        doc/examples/ganeti.initd doc/examples/ganeti.cron
 
 devel/upload: devel/upload.in stamp-directories $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
        chmod u+x $@
 
-doc/examples/ganeti.%: doc/examples/ganeti.%.in stamp-directories \
+doc/examples/%: doc/examples/%.in stamp-directories \
                $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
 
@@ -239,9 +245,6 @@ man/%.in: man/%.sgml stamp-directories $(REPLACE_VARS_SED)
 doc/%.pdf: doc/%.in $(DOCBOOK_WRAPPER)
        $(DOCBOOK_WRAPPER) "$(DOCBOOK2PDF)" $< $@
 
-doc/%.html: doc/%.in $(DOCBOOK_WRAPPER)
-       $(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $@
-
 doc/%.html: doc/%.rst
        $(RST2HTML) $< $@
 
@@ -250,10 +253,11 @@ doc/%.png: doc/%.dot
 
 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.pdf doc/rapi.html: doc/rapi-resources.gen
 
-doc/rapi-resources.sgml: $(BUILD_RAPI_RESOURCE_DOC) lib/rapi/connector.py
-       PYTHONPATH=.:$(top_builddir) $(BUILD_RAPI_RESOURCE_DOC) > $@ || rm -f $@
+doc/rapi-resources.gen: $(BUILD_RAPI_RESOURCE_DOC) $(RAPI_RESOURCES)
+       PYTHONPATH=.:$(top_builddir) $(BUILD_RAPI_RESOURCE_DOC) > $@ || \
+         rm -f $@
 
 man/%.7: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
        $(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@
@@ -261,6 +265,9 @@ man/%.7: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
 man/%.8: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
        $(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@
 
+man/%.html: man/%.in $(DOCBOOK_WRAPPER)
+       $(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $@
+
 man/footer.sgml $(TESTS): srclinks
 
 $(TESTS) $(BUILD_RAPI_RESOURCE_DOC): ganeti lib/_autoconf.py
@@ -305,13 +312,9 @@ $(REPLACE_VARS_SED): Makefile stamp-directories
          echo 's#@LOCALSTATEDIR@#$(localstatedir)#g'; \
          echo 's#@SBINDIR@#$(sbindir)#g'; \
          echo 's#@GANETI_VERSION@#$(PACKAGE_VERSION)#g'; \
-         echo 's#@LOCALSTATEDIR@#$(localstatedir)#g'; \
          echo 's#@CUSTOM_XEN_KERNEL@#$(XEN_KERNEL)#g'; \
          echo 's#@CUSTOM_XEN_INITRD@#$(XEN_INITRD)#g'; \
-         echo '/@INCLUDE_RAPI_RESOURCES@/ {'; \
-         echo '  r $(abs_top_builddir)/doc/rapi-resources.sgml'; \
-         echo '  d'; \
-         echo '}'; \
+         echo 's#@RPL_FILE_STORAGE_DIR@#$(FILE_STORAGE_DIR)#g'; \
        } > $@
 
 # We need to create symlinks because "make distcheck" will not install Python