Fix disk adoption breakage
[ganeti-local] / Makefile.am
index ceaa04f..9d1f66d 100644 (file)
@@ -10,19 +10,24 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 
 ACLOCAL_AMFLAGS = -I autotools
-DOCBOOK_WRAPPER = $(top_srcdir)/autotools/docbook-wrapper
 BUILD_BASH_COMPLETION = $(top_srcdir)/autotools/build-bash-completion
 RUN_IN_TEMPDIR = $(top_srcdir)/autotools/run-in-tempdir
 CHECK_PYTHON_CODE = $(top_srcdir)/autotools/check-python-code
 CHECK_MAN = $(top_srcdir)/autotools/check-man
+CHECK_VERSION = $(top_srcdir)/autotools/check-version
+CHECK_NEWS = $(top_srcdir)/autotools/check-news
 REPLACE_VARS_SED = autotools/replace_vars.sed
 
+clientdir = $(pkgpythondir)/client
 hypervisordir = $(pkgpythondir)/hypervisor
 httpdir = $(pkgpythondir)/http
 masterddir = $(pkgpythondir)/masterd
 confddir = $(pkgpythondir)/confd
 rapidir = $(pkgpythondir)/rapi
+serverdir = $(pkgpythondir)/server
+watcherdir = $(pkgpythondir)/watcher
 impexpddir = $(pkgpythondir)/impexpd
+utilsdir = $(pkgpythondir)/utils
 toolsdir = $(pkglibdir)/tools
 docdir = $(datadir)/doc/$(PACKAGE)
 
@@ -38,6 +43,7 @@ DIRS = \
        doc/examples/hooks \
        doc/examples/gnt-debug \
        lib \
+       lib/client \
        lib/build \
        lib/confd \
        lib/http \
@@ -45,16 +51,22 @@ DIRS = \
        lib/impexpd \
        lib/masterd \
        lib/rapi \
+       lib/server \
+       lib/utils \
+       lib/watcher \
        man \
        qa \
-       scripts \
        test \
        test/data \
        tools
 
-BUILDTIME_DIRS = \
+BUILDTIME_DIR_AUTOCREATE = \
+       scripts \
        doc/api \
-       doc/coverage \
+       doc/coverage
+
+BUILDTIME_DIRS = \
+       $(BUILDTIME_DIR_AUTOCREATE) \
        doc/html
 
 DIRCHECK_EXCLUDE = \
@@ -62,11 +74,14 @@ DIRCHECK_EXCLUDE = \
        ganeti-[0-9]*.[0-9]*.[0-9]* \
        doc/html/_*
 
+all_dirfiles = $(addsuffix /.dir,$(DIRS) $(BUILDTIME_DIR_AUTOCREATE))
+
 MAINTAINERCLEANFILES = \
        $(docpng) \
        $(maninput) \
        doc/install-quick.rst \
        doc/news.rst \
+       doc/upgrade.rst \
        vcs-version
 
 maintainer-clean-local:
@@ -74,6 +89,9 @@ maintainer-clean-local:
 
 CLEANFILES = \
        $(addsuffix /*.py[co],$(DIRS)) \
+       $(all_dirfiles) \
+       $(PYTHON_BOOTSTRAP) \
+       epydoc.conf \
        autotools/replace_vars.sed \
        daemons/daemon-util \
        daemons/ensure-dirs \
@@ -81,20 +99,24 @@ CLEANFILES = \
        devel/upload \
        doc/examples/bash_completion \
        doc/examples/ganeti.initd \
+       doc/examples/ganeti-kvm-poweroff.initd \
        doc/examples/ganeti.cron \
        doc/examples/gnt-config-backup \
        doc/examples/hooks/ipsec \
        $(man_MANS) \
        $(manhtml) \
-       stamp-directories \
+       tools/kvm-ifup \
        stamp-srclinks \
        $(nodist_pkgpython_PYTHON)
 
+# BUILT_SOURCES should only be used as a dependency on phony targets. Otherwise
+# it'll cause the target to rebuild every time.
 BUILT_SOURCES = \
        ganeti \
        stamp-srclinks \
-       stamp-directories \
-       lib/_autoconf.py
+       lib/_autoconf.py \
+       $(all_dirfiles) \
+       $(PYTHON_BOOTSTRAP)
 
 nodist_pkgpython_PYTHON = \
        lib/_autoconf.py
@@ -115,6 +137,7 @@ pkgpython_PYTHON = \
        lib/constants.py \
        lib/daemon.py \
        lib/errors.py \
+       lib/ht.py \
        lib/jqueue.py \
        lib/jstore.py \
        lib/locking.py \
@@ -123,15 +146,28 @@ pkgpython_PYTHON = \
        lib/netutils.py \
        lib/objects.py \
        lib/opcodes.py \
+       lib/qlang.py \
+       lib/query.py \
        lib/rpc.py \
+       lib/runtime.py \
        lib/serializer.py \
        lib/ssconf.py \
        lib/ssh.py \
        lib/storage.py \
-       lib/utils.py \
        lib/uidpool.py \
        lib/workerpool.py
 
+client_PYTHON = \
+       lib/client/__init__.py \
+       lib/client/gnt_backup.py \
+       lib/client/gnt_cluster.py \
+       lib/client/gnt_debug.py \
+       lib/client/gnt_group.py \
+       lib/client/gnt_instance.py \
+       lib/client/gnt_job.py \
+       lib/client/gnt_node.py \
+       lib/client/gnt_os.py
+
 hypervisor_PYTHON = \
        lib/hypervisor/__init__.py \
        lib/hypervisor/hv_base.py \
@@ -168,11 +204,40 @@ masterd_PYTHON = \
 impexpd_PYTHON = \
        lib/impexpd/__init__.py
 
+watcher_PYTHON = \
+       lib/watcher/__init__.py
+
+server_PYTHON = \
+       lib/server/__init__.py \
+       lib/server/confd.py \
+       lib/server/masterd.py \
+       lib/server/noded.py \
+       lib/server/rapi.py
+
+utils_PYTHON = \
+       lib/utils/__init__.py \
+       lib/utils/algo.py \
+       lib/utils/filelock.py \
+       lib/utils/hash.py \
+       lib/utils/io.py \
+       lib/utils/log.py \
+       lib/utils/mlock.py \
+       lib/utils/nodesetup.py \
+       lib/utils/process.py \
+       lib/utils/retry.py \
+       lib/utils/text.py \
+       lib/utils/wrapper.py \
+       lib/utils/x509.py
+
 docrst = \
        doc/admin.rst \
        doc/design-2.0.rst \
        doc/design-2.1.rst \
        doc/design-2.2.rst \
+       doc/design-2.3.rst \
+       doc/design-2.4.rst \
+       doc/design-oob.rst \
+       doc/design-query2.rst \
        doc/cluster-merge.rst \
        doc/devnotes.rst \
        doc/glossary.rst \
@@ -186,11 +251,16 @@ docrst = \
        doc/news.rst \
        doc/rapi.rst \
        doc/security.rst \
+       doc/upgrade.rst \
        doc/walkthrough.rst
 
-doc/html/.stamp: $(docrst) $(docpng) doc/conf.py configure.ac
+$(RUN_IN_TEMPDIR): | $(all_dirfiles)
+
+doc/html/index.html: $(docrst) $(docpng) doc/conf.py configure.ac \
+       $(RUN_IN_TEMPDIR)
        @test -n "$(SPHINX)" || \
            { echo 'sphinx-build' not found during configure; exit 1; }
+       @mkdir_p@ $(dir $@)
        PYTHONPATH=. $(RUN_IN_TEMPDIR) $(SPHINX) -q -W -b html \
            -d . \
            -D version="$(VERSION_MAJOR).$(VERSION_MINOR)" \
@@ -199,17 +269,13 @@ doc/html/.stamp: $(docrst) $(docpng) doc/conf.py configure.ac
        rm -f doc/html/.buildinfo doc/html/objects.inv
        touch $@
 
-doc/html: doc/html/.stamp
+doc/html: doc/html/index.html
 
+doc/install-quick.rst: INSTALL
 doc/news.rst: NEWS
-       set -e; \
-       { echo '.. This file is automatically updated at build time from $<.'; \
-         echo '.. Do not edit.'; \
-         echo; \
-         cat $<; \
-       } > $@
+doc/upgrade.rst: UPGRADE
 
-doc/install-quick.rst: INSTALL
+doc/install-quick.rst doc/news.rst doc/upgrade.rst:
        set -e; \
        { echo '.. This file is automatically updated at build time from $<.'; \
          echo '.. Do not edit.'; \
@@ -232,6 +298,7 @@ noinst_DATA = \
        doc/examples/bash_completion \
        doc/examples/ganeti.cron \
        doc/examples/ganeti.initd \
+       doc/examples/ganeti-kvm-poweroff.initd \
        doc/examples/gnt-config-backup \
        doc/examples/hooks/ipsec \
        $(manhtml)
@@ -240,20 +307,46 @@ gnt_scripts = \
        scripts/gnt-backup \
        scripts/gnt-cluster \
        scripts/gnt-debug \
+       scripts/gnt-group \
        scripts/gnt-instance \
        scripts/gnt-job \
        scripts/gnt-node \
        scripts/gnt-os
 
-dist_sbin_SCRIPTS = \
+PYTHON_BOOTSTRAP = \
+       daemons/ganeti-confd \
+       daemons/ganeti-masterd \
        daemons/ganeti-noded \
        daemons/ganeti-watcher \
-       daemons/ganeti-masterd \
-       daemons/ganeti-confd \
        daemons/ganeti-rapi \
-       $(gnt_scripts)
+       scripts/gnt-backup \
+       scripts/gnt-cluster \
+       scripts/gnt-debug \
+       scripts/gnt-group \
+       scripts/gnt-instance \
+       scripts/gnt-job \
+       scripts/gnt-node \
+       scripts/gnt-os
+
+qa_scripts = \
+       qa/ganeti-qa.py \
+       qa/qa_cluster.py \
+       qa/qa_config.py \
+       qa/qa_daemon.py \
+       qa/qa_env.py \
+       qa/qa_error.py \
+       qa/qa_instance.py \
+       qa/qa_node.py \
+       qa/qa_os.py \
+       qa/qa_rapi.py \
+       qa/qa_tags.py \
+       qa/qa_utils.py
+
+dist_sbin_SCRIPTS = \
+       tools/ganeti-listrunner
 
 nodist_sbin_SCRIPTS = \
+       $(PYTHON_BOOTSTRAP) \
        daemons/ganeti-cleaner
 
 dist_tools_SCRIPTS = \
@@ -274,16 +367,20 @@ pkglib_python_scripts = \
 pkglib_SCRIPTS = \
        daemons/daemon-util \
        daemons/ensure-dirs \
+       tools/kvm-ifup \
        $(pkglib_python_scripts)
 
 EXTRA_DIST = \
        NEWS \
+       UPGRADE \
+       epydoc.conf.in \
        pylintrc \
        autotools/build-bash-completion \
        autotools/check-python-code \
        autotools/check-man \
+       autotools/check-news \
        autotools/check-tar \
-       autotools/docbook-wrapper \
+       autotools/check-version \
        autotools/gen-coverage \
        autotools/testrunner \
        $(RUN_IN_TEMPDIR) \
@@ -292,12 +389,14 @@ EXTRA_DIST = \
        daemons/ganeti-cleaner.in \
        $(pkglib_python_scripts) \
        devel/upload.in \
+       tools/kvm-ifup.in \
        $(docdot) \
        $(docpng) \
        $(docrst) \
        doc/conf.py \
        doc/html \
        doc/examples/ganeti.initd.in \
+       doc/examples/ganeti-kvm-poweroff.initd.in \
        doc/examples/ganeti.cron.in \
        doc/examples/gnt-config-backup.in \
        doc/examples/dumb-allocator \
@@ -312,27 +411,17 @@ EXTRA_DIST = \
        test/mocks.py \
        $(dist_TESTS) \
        $(TEST_FILES) \
-       man/footer.sgml \
-       $(mansgml) \
+       man/footer.rst \
+       $(manrst) \
        $(maninput) \
-       qa/ganeti-qa.py \
        qa/qa-sample.json \
-       qa/qa_cluster.py \
-       qa/qa_config.py \
-       qa/qa_daemon.py \
-       qa/qa_env.py \
-       qa/qa_error.py \
-       qa/qa_instance.py \
-       qa/qa_node.py \
-       qa/qa_os.py \
-       qa/qa_rapi.py \
-       qa/qa_tags.py \
-       qa/qa_utils.py
+       $(qa_scripts)
 
 man_MANS = \
        man/ganeti.7 \
        man/ganeti-cleaner.8 \
        man/ganeti-confd.8 \
+       man/ganeti-listrunner.8 \
        man/ganeti-masterd.8 \
        man/ganeti-noded.8 \
        man/ganeti-os-interface.7 \
@@ -341,16 +430,18 @@ man_MANS = \
        man/gnt-backup.8 \
        man/gnt-cluster.8 \
        man/gnt-debug.8 \
+       man/gnt-group.8 \
        man/gnt-instance.8 \
        man/gnt-job.8 \
        man/gnt-node.8 \
        man/gnt-os.8
 
-mansgml = $(patsubst %.7,%.sgml,$(patsubst %.8,%.sgml,$(man_MANS)))
-manhtml = $(patsubst %.sgml,%.html,$(mansgml))
+manrst = $(patsubst %.7,%.rst,$(patsubst %.8,%.rst,$(man_MANS)))
+manhtml = $(patsubst %.rst,%.html,$(manrst))
 maninput = \
        $(patsubst %.7,%.7.in,$(patsubst %.8,%.8.in,$(man_MANS))) \
-       $(patsubst %.html,%.html.in,$(manhtml))
+       $(patsubst %.html,%.html.in,$(manhtml)) \
+       man/footer.man man/footer.html
 
 TEST_FILES = \
        test/data/bdev-drbd-8.0.txt \
@@ -370,6 +461,7 @@ python_tests = \
        test/ganeti.backend_unittest.py \
        test/ganeti.bdev_unittest.py \
        test/ganeti.cli_unittest.py \
+       test/ganeti.client.gnt_instance_unittest.py \
        test/ganeti.daemon_unittest.py \
        test/ganeti.cmdlib_unittest.py \
        test/ganeti.compat_unittest.py \
@@ -378,8 +470,14 @@ python_tests = \
        test/ganeti.constants_unittest.py \
        test/ganeti.errors_unittest.py \
        test/ganeti.hooks_unittest.py \
+       test/ganeti.ht_unittest.py \
        test/ganeti.http_unittest.py \
+       test/ganeti.hypervisor_unittest.py \
+       test/ganeti.hypervisor.hv_chroot_unittest.py \
+       test/ganeti.hypervisor.hv_fake_unittest.py \
        test/ganeti.hypervisor.hv_kvm_unittest.py \
+       test/ganeti.hypervisor.hv_lxc_unittest.py \
+       test/ganeti.hypervisor.hv_xen_unittest.py \
        test/ganeti.impexpd_unittest.py \
        test/ganeti.jqueue_unittest.py \
        test/ganeti.locking_unittest.py \
@@ -389,15 +487,29 @@ python_tests = \
        test/ganeti.netutils_unittest.py \
        test/ganeti.objects_unittest.py \
        test/ganeti.opcodes_unittest.py \
+       test/ganeti.qlang_unittest.py \
+       test/ganeti.query_unittest.py \
+       test/ganeti.rapi.baserlib_unittest.py \
        test/ganeti.rapi.client_unittest.py \
        test/ganeti.rapi.resources_unittest.py \
        test/ganeti.rapi.rlib2_unittest.py \
        test/ganeti.rpc_unittest.py \
+       test/ganeti.runtime_unittest.py \
        test/ganeti.serializer_unittest.py \
        test/ganeti.ssh_unittest.py \
        test/ganeti.uidpool_unittest.py \
+       test/ganeti.utils.algo_unittest.py \
+       test/ganeti.utils.filelock_unittest.py \
+       test/ganeti.utils.hash_unittest.py \
+       test/ganeti.utils.io_unittest.py \
+       test/ganeti.utils.mlock_unittest.py \
+       test/ganeti.utils.nodesetup_unittest.py \
+       test/ganeti.utils.process_unittest.py \
+       test/ganeti.utils.retry_unittest.py \
+       test/ganeti.utils.text_unittest.py \
+       test/ganeti.utils.wrapper_unittest.py \
+       test/ganeti.utils.x509_unittest.py \
        test/ganeti.utils_unittest.py \
-       test/ganeti.utils_mlockall_unittest.py \
        test/ganeti.workerpool_unittest.py \
        test/cfgupgrade_unittest.py \
        test/docs_unittest.py \
@@ -428,16 +540,21 @@ all_python_code = \
        $(pkglib_python_scripts) \
        $(python_tests) \
        $(pkgpython_PYTHON) \
+       $(client_PYTHON) \
        $(hypervisor_PYTHON) \
        $(rapi_PYTHON) \
+       $(server_PYTHON) \
        $(http_PYTHON) \
        $(confd_PYTHON) \
        $(masterd_PYTHON) \
        $(impexpd_PYTHON) \
-       $(noinst_PYTHON)
+       $(utils_PYTHON) \
+       $(watcher_PYTHON) \
+       $(noinst_PYTHON) \
+       $(qa_scripts)
 
 srclink_files = \
-       man/footer.sgml \
+       man/footer.rst \
        test/check-cert-expired_unittest.bash \
        test/daemon-util_unittest.bash \
        test/ganeti-cleaner_unittest.bash \
@@ -454,47 +571,61 @@ lint_python_code = \
        $(dist_sbin_SCRIPTS) \
        $(dist_tools_SCRIPTS) \
        $(pkglib_python_scripts) \
-       $(BUILD_BASH_COMPLETION)
+       $(BUILD_BASH_COMPLETION) \
+       $(PYTHON_BOOTSTRAP)
 
 test/daemon-util_unittest.bash: daemons/daemon-util
 
 test/ganeti-cleaner_unittest.bash: daemons/ganeti-cleaner
 
+tools/kvm-ifup: tools/kvm-ifup.in $(REPLACE_VARS_SED)
+       sed -f $(REPLACE_VARS_SED) < $< > $@
+       chmod +x $@
+
 devel/upload: devel/upload.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
        chmod u+x $@
 
-daemons/%: daemons/%.in \
-               $(REPLACE_VARS_SED)
+daemons/%: daemons/%.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
        chmod +x $@
 
-doc/examples/%: doc/examples/%.in \
-               $(REPLACE_VARS_SED)
+doc/examples/%: doc/examples/%.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
 
-doc/examples/hooks/%: doc/examples/hooks/%.in \
-               $(REPLACE_VARS_SED)
+doc/examples/hooks/%: doc/examples/hooks/%.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
 
 doc/examples/bash_completion: $(BUILD_BASH_COMPLETION) $(RUN_IN_TEMPDIR) \
-       lib/cli.py $(gnt_scripts) tools/burnin
+       lib/cli.py $(gnt_scripts) $(client_PYTHON) tools/burnin
        PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(BUILD_BASH_COMPLETION) > $@
 
 doc/%.png: doc/%.dot
        @test -n "$(DOT)" || { echo 'dot' not found during configure; exit 1; }
        $(DOT) -Tpng -o $@ $<
 
-man/%.7.in man/%.8.in: man/%.sgml man/footer.sgml $(DOCBOOK_WRAPPER)
-       @test -n "$(DOCBOOK2MAN)" || \
-         { echo 'docbook2man' not found during configure; exit 1; }
-       $(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $(notdir $(@:.in=)) $@
+man/footer.man: man/footer.rst
+       @test -n "$(PANDOC)" || \
+         { echo 'pandoc' not found during configure; exit 1; }
+       $(PANDOC) -f rst -t man -o $@ $<
+
+man/footer.html: man/footer.rst
+       @test -n "$(PANDOC)" || \
+         { echo 'pandoc' not found during configure; exit 1; }
+       $(PANDOC) -f rst -t html -o $@ $<
+
+man/%.7.in man/%.8.in: man/%.rst man/footer.man
+       @test -n "$(PANDOC)" || \
+         { echo 'pandoc' not found during configure; exit 1; }
+       $(PANDOC) -s -f rst -t man -A man/footer.man $< | \
+         sed -e 's/\\@/@/g' > $@
        if test -n "$(MAN_HAS_WARNINGS)"; then $(CHECK_MAN) $@; fi
 
-man/%.html.in: man/%.sgml man/footer.sgml $(DOCBOOK_WRAPPER)
-       @test -n "$(DOCBOOK2HTML)" || \
-         { echo 'docbook2html' not found during configure; exit 1; }
-       $(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $(notdir $(@:.in=)) $@
+man/%.html.in: man/%.rst man/footer.html
+       @test -n "$(PANDOC)" || \
+         { echo 'pandoc' not found during configure; exit 1; }
+       $(PANDOC) -s -f rst -t html -A man/footer.html $< | \
+         sed -e 's/\\@/@/g' > $@
 
 man/%.7: man/%.7.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
@@ -505,6 +636,9 @@ man/%.8: man/%.8.in $(REPLACE_VARS_SED)
 man/%.html: man/%.html.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
 
+epydoc.conf: epydoc.conf.in
+       sed -e 's#@MODULES@#$(lint_python_code)#g' < $< > $@
+
 vcs-version:
        if test -d .git; then \
          git describe > $@; \
@@ -521,7 +655,7 @@ regen-vcs-version:
          $(MAKE) vcs-version; \
        fi
 
-lib/_autoconf.py: Makefile stamp-directories vcs-version
+lib/_autoconf.py: Makefile vcs-version | lib/.dir
        set -e; \
        VCSVER=`cat $(abs_top_srcdir)/vcs-version`; \
        { echo '# This file is automatically generated, do not edit!'; \
@@ -559,6 +693,7 @@ lib/_autoconf.py: Makefile stamp-directories vcs-version
          echo "KVM_PATH = '$(KVM_PATH)'"; \
          echo "SOCAT_PATH = '$(SOCAT)'"; \
          echo "SOCAT_USE_ESCAPE = $(SOCAT_USE_ESCAPE)"; \
+         echo "SOCAT_USE_COMPRESS = $(SOCAT_USE_COMPRESS)"; \
          echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)"; \
          echo "TOOLSDIR = '$(toolsdir)'"; \
          echo "GNT_SCRIPTS = [$(foreach i,$(notdir $(gnt_scripts)),'$(i)',)]"; \
@@ -566,9 +701,16 @@ lib/_autoconf.py: Makefile stamp-directories vcs-version
          echo "DRBD_BARRIERS = $(DRBD_BARRIERS)"; \
          echo "SYSLOG_USAGE = '$(SYSLOG_USAGE)'"; \
          echo "DAEMONS_GROUP = '$(DAEMONS_GROUP)'"; \
+         echo "ADMIN_GROUP = '$(ADMIN_GROUP)'"; \
          echo "MASTERD_USER = '$(MASTERD_USER)'"; \
+         echo "MASTERD_GROUP = '$(MASTERD_GROUP)'"; \
          echo "RAPI_USER = '$(RAPI_USER)'"; \
+         echo "RAPI_GROUP = '$(RAPI_GROUP)'"; \
+         echo "CONFD_USER = '$(CONFD_USER)'"; \
+         echo "CONFD_GROUP = '$(CONFD_GROUP)'"; \
+         echo "NODED_USER = '$(NODED_USER)'"; \
          echo "VCS_VERSION = '$$VCSVER'"; \
+         echo "DISK_SEPARATOR = '$(DISK_SEPARATOR)'"; \
        } > $@
 
 $(REPLACE_VARS_SED): Makefile
@@ -582,6 +724,8 @@ $(REPLACE_VARS_SED): Makefile
          echo 's#@CUSTOM_XEN_BOOTLOADER@#$(XEN_BOOTLOADER)#g'; \
          echo 's#@CUSTOM_XEN_KERNEL@#$(XEN_KERNEL)#g'; \
          echo 's#@CUSTOM_XEN_INITRD@#$(XEN_INITRD)#g'; \
+         echo 's#@CUSTOM_IALLOCATOR_SEARCH_PATH@#$(IALLOCATOR_SEARCH_PATH)#g'; \
+         echo 's#@CUSTOM_EXPORT_DIR@#$(EXPORT_DIR)#g'; \
          echo 's#@RPL_FILE_STORAGE_DIR@#$(FILE_STORAGE_DIR)#g'; \
          echo 's#@RPL_SSH_INITD_SCRIPT@#$(SSH_INITD_SCRIPT)#g'; \
          echo 's#@PKGLIBDIR@#$(pkglibdir)#g'; \
@@ -596,9 +740,39 @@ $(REPLACE_VARS_SED): Makefile
          echo 's#@GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \
        } > $@
 
+# Using deferred evaluation
+daemons/ganeti-%: MODULE = ganeti.server.$(patsubst ganeti-%,%,$(notdir $@))
+daemons/ganeti-watcher: MODULE = ganeti.watcher
+scripts/%: MODULE = ganeti.client.$(subst -,_,$(notdir $@))
+
+$(PYTHON_BOOTSTRAP): Makefile | $(all_dirfiles)
+       test -n "$(MODULE)" || { echo Missing module; exit 1; }
+       set -e; \
+       { echo '#!/usr/bin/python'; \
+         echo '# This file is automatically generated, do not edit!'; \
+         echo "# Edit $(MODULE) instead."; \
+         echo; \
+         echo '"""Bootstrap script for L{$(MODULE)}"""'; \
+         echo; \
+         echo '# pylint: disable-msg=C0103'; \
+         echo '# C0103: Invalid name'; \
+         echo; \
+         echo 'import sys'; \
+         echo 'import $(MODULE) as main'; \
+         echo; \
+         echo '# Temporarily alias commands until bash completion'; \
+         echo '# generator is changed'; \
+         echo 'if hasattr(main, "commands"):'; \
+               echo '  commands = main.commands # pylint: disable-msg=E1101'; \
+         echo; \
+         echo 'if __name__ == "__main__":'; \
+         echo '  sys.exit(main.Main())'; \
+       } > $@
+       chmod u+x $@
+
 # We need to create symlinks because "make distcheck" will not install Python
 # files when building.
-stamp-srclinks: Makefile stamp-directories
+stamp-srclinks: Makefile | $(all_dirfiles)
        set -e; \
        for i in $(srclink_files); do \
                if test ! -f $$i -a -f $(abs_top_srcdir)/$$i; then \
@@ -636,11 +810,16 @@ check-dirs: $(BUILT_SOURCES)
 
 check-local: check-dirs
        $(CHECK_PYTHON_CODE) $(check_python_code)
+       $(CHECK_VERSION) $(VERSION) $(top_srcdir)/NEWS
+       $(CHECK_NEWS) < $(top_srcdir)/NEWS
 
 .PHONY: lint
-lint: ganeti $(BUILT_SOURCES)
+lint: $(BUILT_SOURCES)
        @test -n "$(PYLINT)" || { echo 'pylint' not found during configure; exit 1; }
        $(PYLINT) $(LINT_OPTS) $(lint_python_code)
+       cd $(top_srcdir)/qa && \
+         PYTHONPATH=$(abs_top_srcdir) $(PYLINT) $(LINT_OPTS) \
+         --rcfile  ../pylintrc $(patsubst qa/%.py,%,$(qa_scripts))
 
 # a dist hook rule for updating the vcs-version file; this is
 # hardcoded due to where it needs to build the file...
@@ -663,6 +842,15 @@ distcheck-hook:
                echo "Found backup files in final archive." 1>&2; \
                exit 1; \
        fi
+# Empty files or directories should not be distributed. They can cause
+# unnecessary warnings for packagers. Directories used by automake during
+# distcheck must be excluded.
+       if find $(top_distdir) -empty -and -not \( \
+                       -path $(top_distdir)/_build -or \
+                       -path $(top_distdir)/_inst \) | grep .; then \
+               echo "Found empty files or directories in final archive." 1>&2; \
+               exit 1; \
+       fi
        if test -n "$(BUILD_RELEASE)" && \
           grep -n -H -E '^\*.*unreleased' $(top_distdir)/NEWS; then \
                echo "Found unreleased version in NEWS." >&2; \
@@ -686,13 +874,13 @@ install-exec-local:
          "$(DESTDIR)${localstatedir}/log/ganeti" \
          "$(DESTDIR)${localstatedir}/run/ganeti"
 
-stamp-directories: Makefile
-       @mkdir_p@ $(DIRS)
-       touch $@
+# To avoid conflicts between directory names and other targets, a file inside
+# the directory is used to ensure its existence.
+%.dir:
+       @mkdir_p@ $* && touch $@
 
 .PHONY: apidoc
 apidoc: epydoc.conf $(RUN_IN_TEMPDIR) $(BUILT_SOURCES)
-       test -e doc/api || mkdir doc/api
        $(RUN_IN_TEMPDIR) epydoc -v \
                --conf $(CURDIR)/epydoc.conf \
                --output $(CURDIR)/doc/api
@@ -708,7 +896,6 @@ TAGS: $(BUILT_SOURCES)
 .PHONY: coverage
 coverage: $(BUILT_SOURCES) $(python_tests)
        set -e; \
-       mkdir -p doc/coverage; \
        COVERAGE_FILE=$(CURDIR)/doc/coverage/data \
        TEXT_COVERAGE=$(CURDIR)/doc/coverage/report.txt \
        HTML_COVERAGE=$(CURDIR)/doc/coverage \