Log the rpc call name in the RPC errors message

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0474980..b1c4090 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,7 @@ BUILD_RAPI_RESOURCE_DOC = $(top_srcdir)/doc/build-rapi-resources-doc
 REPLACE_VARS_SED = autotools/replace_vars.sed
 
 hypervisordir = $(pkgpythondir)/hypervisor
+httpdir = $(pkgpythondir)/http
 rapidir = $(pkgpythondir)/rapi
 toolsdir = $(pkglibdir)/tools
 docdir = $(datadir)/doc/$(PACKAGE)
@@ -26,6 +27,7 @@ DIRS = \
        doc \
        doc/examples \
        lib \
+       lib/http \
        lib/hypervisor \
        lib/rapi \
        man \
@@ -46,6 +48,7 @@ CLEANFILES = \
        doc/examples/ganeti.initd \
        doc/examples/ganeti.cron \
        lib/*.py[co] \
+       lib/http/*.py[co] \
        lib/hypervisor/*.py[co] \
        lib/rapi/*.py[co] \
        man/*.[78] \
@@ -69,7 +72,6 @@ pkgpython_PYTHON = \
        lib/constants.py \
        lib/daemon.py \
        lib/errors.py \
-       lib/http.py \
        lib/jqueue.py \
        lib/jstore.py \
        lib/locking.py \
@@ -98,6 +100,12 @@ rapi_PYTHON = \
        lib/rapi/rlib1.py \
        lib/rapi/rlib2.py
 
+http_PYTHON = \
+       lib/http/__init__.py \
+       lib/http/auth.py \
+       lib/http/client.py \
+       lib/http/server.py
+
 
 docsgml = \
        doc/hooks.sgml \
@@ -262,6 +270,15 @@ lib/_autoconf.py: Makefile stamp-directories
        set -e; \
        { echo '# This file is automatically generated, do not edit!'; \
          echo '#'; \
+         echo ''; \
+         echo '"""Build-time configuration for Ganeti.'; \
+         echo '';\
+         echo 'This file is autogenerated by the build process.'; \
+         echo 'For any changes you need to re-run ./configure (and'; \
+         echo 'not edit by hand).'; \
+         echo ''; \
+         echo '"""'; \
+         echo ''; \
          echo "PACKAGE_VERSION = '$(PACKAGE_VERSION)'"; \
          echo "VERSION_MAJOR = '$(VERSION_MAJOR)'"; \
          echo "VERSION_MINOR = '$(VERSION_MINOR)'"; \
@@ -278,6 +295,7 @@ lib/_autoconf.py: Makefile stamp-directories
          echo "FILE_STORAGE_DIR = '$(FILE_STORAGE_DIR)'"; \
          echo "IALLOCATOR_SEARCH_PATH = [$(IALLOCATOR_SEARCH_PATH)]"; \
          echo "KVM_PATH = '$(KVM_PATH)'"; \
+         echo "SOCAT_PATH = '$(SOCAT_PATH)'"; \
        } > $@
 
 $(REPLACE_VARS_SED): Makefile stamp-directories
@@ -301,7 +319,8 @@ $(REPLACE_VARS_SED): Makefile stamp-directories
 #.PHONY: srclinks
 srclinks: stamp-directories
        set -e; \
-       for i in man/footer.sgml $(pkgpython_PYTHON) $(hypervisor_PYTHON) $(rapi_PYTHON); do \
+       for i in man/footer.sgml $(pkgpython_PYTHON) $(hypervisor_PYTHON) \
+                       $(rapi_PYTHON) $(http_PYTHON); do \
                if test ! -f $$i -a -f $(abs_top_srcdir)/$$i; then \
                        $(LN_S) $(abs_top_srcdir)/$$i $$i; \
                fi; \
@@ -330,12 +349,13 @@ stamp-directories: Makefile
 .PHONY: apidoc
 apidoc:
        test -e doc/api || mkdir doc/api
-       TMPDIR=`mktemp -d ./temp-epydoc.XXXXXX` && { \
+       TMPDIR=`mktemp -d ` && { \
                cp -r scripts daemons lib $$TMPDIR && \
                ( \
+                       CDIR=`pwd` && \
                        cd $$TMPDIR && \
                        mv lib ganeti && \
-                       epydoc --conf ../epydoc.conf \
+                       epydoc -v --conf $$CDIR/epydoc.conf -o $$CDIR/doc/api \
                ) ; \
                rm -rf $$TMPDIR ; \
        }