Add missing empty line

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2851204..07332a8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,9 +11,11 @@ abs_top_srcdir = @abs_top_srcdir@
 
 ACLOCAL_AMFLAGS = -I autotools
 DOCBOOK_WRAPPER = $(top_srcdir)/autotools/docbook-wrapper
+BUILD_RAPI_RESOURCE_DOC = $(top_srcdir)/doc/build-rapi-resources-doc
 REPLACE_VARS_SED = autotools/replace_vars.sed
 
 hypervisordir = $(pkgpythondir)/hypervisor
+rapidir = $(pkgpythondir)/rapi
 toolsdir = $(pkglibdir)/tools
 docdir = $(datadir)/doc/$(PACKAGE)
 
@@ -25,6 +27,7 @@ DIRS = \
        doc/examples \
        lib \
        lib/hypervisor \
+       lib/rapi \
        man \
        qa \
        qa/hooks \
@@ -39,10 +42,12 @@ CLEANFILES = \
        doc/*.html \
        doc/*.in \
        doc/*.pdf \
+       doc/rapi-resources.sgml \
        doc/examples/ganeti.initd \
        doc/examples/ganeti.cron \
        lib/*.py[co] \
        lib/hypervisor/*.py[co] \
+       lib/rapi/*.py[co] \
        man/*.[78] \
        man/*.in \
        qa/*.py[co] \
@@ -64,6 +69,7 @@ pkgpython_PYTHON = \
        lib/config.py \
        lib/constants.py \
        lib/errors.py \
+       lib/http.py \
        lib/jqueue.py \
        lib/locking.py \
        lib/logger.py \
@@ -75,7 +81,8 @@ pkgpython_PYTHON = \
        lib/serializer.py \
        lib/ssconf.py \
        lib/ssh.py \
-       lib/utils.py
+       lib/utils.py \
+       lib/workerpool.py
 
 hypervisor_PYTHON = \
        lib/hypervisor/__init__.py \
@@ -83,10 +90,21 @@ hypervisor_PYTHON = \
        lib/hypervisor/hv_fake.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 \
+       lib/rapi/rlib1.py \
+       lib/rapi/rlib2.py
+
+
 docsgml = \
        doc/hooks.sgml \
        doc/install.sgml \
        doc/admin.sgml \
+       doc/rapi.sgml \
        doc/iallocator.sgml
 
 doc_DATA = \
@@ -98,6 +116,7 @@ dist_sbin_SCRIPTS = \
        daemons/ganeti-watcher \
        daemons/ganeti-master \
        daemons/ganeti-masterd \
+       daemons/ganeti-rapi \
        scripts/gnt-backup \
        scripts/gnt-cluster \
        scripts/gnt-debug \
@@ -118,6 +137,7 @@ EXTRA_DIST = \
        autotools/docbook-wrapper \
        devel/upload.in \
        $(docsgml) \
+       doc/build-rapi-resources-doc \
        doc/examples/ganeti.initd.in \
        doc/examples/ganeti.cron.in \
        doc/examples/dumb-allocator \
@@ -140,6 +160,7 @@ EXTRA_DIST = \
        qa/qa_node.py \
        qa/qa_os.py \
        qa/qa_other.py \
+       qa/qa_rapi.py \
        qa/qa_tags.py \
        qa/qa_utils.py
 
@@ -172,6 +193,8 @@ dist_TESTS = \
        test/ganeti.ssh_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.constants_unittest.py
 
 nodist_TESTS =
@@ -204,6 +227,11 @@ doc/%.pdf: doc/%.in $(DOCBOOK_WRAPPER)
 doc/%.html: doc/%.in $(DOCBOOK_WRAPPER)
        $(DOCBOOK_WRAPPER) $< $@
 
+doc/rapi.pdf doc/rapi.html: 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) $< $@
 
@@ -212,7 +240,7 @@ man/%.8: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
 
 man/footer.sgml $(TESTS): srclinks
 
-$(TESTS): ganeti
+$(TESTS) $(BUILD_RAPI_RESOURCE_DOC): ganeti lib/_autoconf.py
 
 lib/_autoconf.py: Makefile stamp-directories
        set -e; \
@@ -245,6 +273,10 @@ $(REPLACE_VARS_SED): Makefile stamp-directories
          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 '}'; \
        } > $@
 
 # We need to create symlinks because "make distcheck" will not install Python
@@ -252,7 +284,7 @@ $(REPLACE_VARS_SED): Makefile stamp-directories
 #.PHONY: srclinks
 srclinks: stamp-directories
        set -e; \
-       for i in man/footer.sgml $(pkgpython_PYTHON) $(hypervisor_PYTHON); do \
+       for i in man/footer.sgml $(pkgpython_PYTHON) $(hypervisor_PYTHON) $(rapi_PYTHON); do \
                if test ! -f $$i -a -f $(abs_top_srcdir)/$$i; then \
                        $(LN_S) $(abs_top_srcdir)/$$i $$i; \
                fi; \
@@ -278,4 +310,17 @@ stamp-directories: Makefile
        @mkdir_p@ $(DIRS)
        touch $@
 
+.PHONY: apidoc
+apidoc:
+       test -e doc/api || mkdir doc/api
+       TMPDIR=`mktemp -d ./temp-epydoc.XXXXXX` && { \
+               cp -r scripts daemons lib $$TMPDIR && \
+               ( \
+                       cd $$TMPDIR && \
+                       mv lib ganeti && \
+                       epydoc --conf ../epydoc.conf \
+               ) ; \
+               rm -rf $$TMPDIR ; \
+       }
+
 # vim: set noet :