configure: Add option to enable remote commands
[ganeti-local] / Makefile.am
index bd0e4dc..88f1369 100644 (file)
@@ -31,6 +31,7 @@ DOCPP = $(top_srcdir)/autotools/docpp
 REPLACE_VARS_SED = autotools/replace_vars.sed
 CONVERT_CONSTANTS = $(top_srcdir)/autotools/convert-constants
 BUILD_RPC = $(top_srcdir)/autotools/build-rpc
+SHELL_ENV_INIT = autotools/shell-env-init
 
 # Note: these are automake-specific variables, and must be named after
 # the directory + 'dir' suffix
@@ -58,20 +59,32 @@ HTOOLS_DIRS = \
        htools/Ganeti \
        htools/Ganeti/Confd \
        htools/Ganeti/HTools \
-       htools/Ganeti/HTools/Program
+       htools/Ganeti/HTools/Backend \
+       htools/Ganeti/HTools/Program \
+       htools/Ganeti/Query \
+       htest \
+       htest/Test \
+       htest/Test/Ganeti \
+       htest/Test/Ganeti/Confd \
+       htest/Test/Ganeti/HTools \
+       htest/Test/Ganeti/HTools/Backend \
+       htest/Test/Ganeti/Query
 
 DIRS = \
+       $(HTOOLS_DIRS) \
        autotools \
        daemons \
        devel \
        doc \
        doc/examples \
-       doc/examples/hooks \
        doc/examples/gnt-debug \
-       $(HTOOLS_DIRS) \
+       doc/examples/hooks \
+       htest/data \
+       htest/data/rapi \
+       htest/shelltests \
        lib \
-       lib/client \
        lib/build \
+       lib/client \
        lib/confd \
        lib/http \
        lib/hypervisor \
@@ -86,8 +99,6 @@ DIRS = \
        qa \
        test \
        test/data \
-       test/data/htools \
-       test/data/htools/rapi \
        test/data/ovfdata \
        test/data/ovfdata/other \
        tools
@@ -95,15 +106,17 @@ DIRS = \
 BUILDTIME_DIR_AUTOCREATE = \
        scripts \
        $(APIDOC_DIR) \
-       $(APIDOC_PY_DIR) \
        $(APIDOC_HS_DIR) \
        $(APIDOC_HS_DIR)/Ganeti \
        $(APIDOC_HS_DIR)/Ganeti/Confd \
        $(APIDOC_HS_DIR)/Ganeti/HTools \
+       $(APIDOC_HS_DIR)/Ganeti/HTools/Backend \
        $(APIDOC_HS_DIR)/Ganeti/HTools/Program \
+       $(APIDOC_HS_DIR)/Ganeti/Query \
+       $(APIDOC_PY_DIR) \
        $(COVERAGE_DIR) \
-       $(COVERAGE_PY_DIR) \
        $(COVERAGE_HS_DIR) \
+       $(COVERAGE_PY_DIR) \
        .hpc
 
 BUILDTIME_DIRS = \
@@ -141,21 +154,24 @@ CLEANFILES = \
        $(PYTHON_BOOTSTRAP) \
        epydoc.conf \
        $(REPLACE_VARS_SED) \
+       $(SHELL_ENV_INIT) \
        daemons/daemon-util \
        daemons/ganeti-cleaner \
-       devel/upload \
        $(BUILT_EXAMPLES) \
        doc/examples/bash_completion \
+       doc/examples/bash_completion-debug \
        lib/_generated_rpc.py \
        $(man_MANS) \
        $(manhtml) \
        tools/kvm-ifup \
+       tools/vcluster-setup \
        stamp-directories \
        stamp-srclinks \
        $(nodist_pkgpython_PYTHON) \
        $(HS_ALL_PROGS) $(HS_BUILT_SRCS) \
        $(HS_BUILT_TEST_HELPERS) \
-       .hpc/*.mix htools/*.tix \
+       htools/ganeti-confd \
+       .hpc/*.mix htools/*.tix htest/*.tix \
        doc/hs-lint.html
 
 GENERATED_FILES = \
@@ -163,6 +179,14 @@ GENERATED_FILES = \
        $(BUILT_PYTHON_SOURCES) \
        $(PYTHON_BOOTSTRAP)
 
+HTOOLS_GENERATED_FILES =
+if WANT_HTOOLS
+HTOOLS_GENERATED_FILES += $(HS_PROGS)
+if ENABLE_CONFD
+HTOOLS_GENERATED_FILES += htools/hconfd htools/ganeti-confd
+endif
+endif
+
 built_base_sources = \
        stamp-directories \
        stamp-srclinks
@@ -184,6 +208,8 @@ BUILT_EXAMPLES = \
        doc/examples/ganeti-kvm-poweroff.initd \
        doc/examples/ganeti.cron \
        doc/examples/ganeti.initd \
+       doc/examples/ganeti-master-role.ocf \
+       doc/examples/ganeti-node-role.ocf \
        doc/examples/gnt-config-backup \
        doc/examples/hooks/ipsec
 
@@ -192,8 +218,8 @@ nodist_pkgpython_PYTHON = \
 
 noinst_PYTHON = \
        lib/build/__init__.py \
-       lib/build/sphinx_ext.py \
-       lib/build/shell_example_lexer.py
+       lib/build/shell_example_lexer.py \
+       lib/build/sphinx_ext.py
 
 pkgpython_PYTHON = \
        lib/__init__.py \
@@ -216,8 +242,10 @@ pkgpython_PYTHON = \
        lib/mcpu.py \
        lib/netutils.py \
        lib/objects.py \
+       lib/objectutils.py \
        lib/opcodes.py \
        lib/ovf.py \
+       lib/pathutils.py \
        lib/qlang.py \
        lib/query.py \
        lib/rpc.py \
@@ -228,6 +256,7 @@ pkgpython_PYTHON = \
        lib/ssh.py \
        lib/storage.py \
        lib/uidpool.py \
+       lib/vcluster.py \
        lib/workerpool.py
 
 client_PYTHON = \
@@ -267,12 +296,11 @@ http_PYTHON = \
 
 confd_PYTHON = \
        lib/confd/__init__.py \
-       lib/confd/client.py \
-       lib/confd/querylib.py \
-       lib/confd/server.py
+       lib/confd/client.py
 
 masterd_PYTHON = \
        lib/masterd/__init__.py \
+       lib/masterd/iallocator.py \
        lib/masterd/instance.py
 
 impexpd_PYTHON = \
@@ -285,14 +313,14 @@ watcher_PYTHON = \
 
 server_PYTHON = \
        lib/server/__init__.py \
-       lib/server/confd.py \
        lib/server/masterd.py \
        lib/server/noded.py \
        lib/server/rapi.py
 
 pytools_PYTHON = \
        lib/tools/__init__.py \
-       lib/tools/ensure_dirs.py
+       lib/tools/ensure_dirs.py \
+       lib/tools/prepare_node_join.py
 
 utils_PYTHON = \
        lib/utils/__init__.py \
@@ -311,32 +339,39 @@ utils_PYTHON = \
 
 docrst = \
        doc/admin.rst \
+       doc/cluster-merge.rst \
        doc/design-2.0.rst \
        doc/design-2.1.rst \
        doc/design-2.2.rst \
        doc/design-2.3.rst \
-       doc/design-htools-2.3.rst \
        doc/design-2.4.rst \
        doc/design-2.5.rst \
-       doc/design-draft.rst \
-       doc/design-oob.rst \
+       doc/design-2.6.rst \
+       doc/design-2.7.rst \
+       doc/design-autorepair.rst \
+       doc/design-bulk-create.rst \
+       doc/design-chained-jobs.rst \
        doc/design-cpu-pinning.rst \
-       doc/design-query2.rst \
-       doc/design-x509-ca.rst \
+       doc/design-draft.rst \
+       doc/design-htools-2.3.rst \
        doc/design-http-server.rst \
        doc/design-impexp2.rst \
        doc/design-lu-generated-jobs.rst \
+       doc/design-linuxha.rst \
        doc/design-multi-reloc.rst \
        doc/design-network.rst \
-       doc/design-chained-jobs.rst \
+       doc/design-oob.rst \
        doc/design-ovf-support.rst \
+       doc/design-partitioned.rst \
+       doc/design-query-splitting.rst \
+       doc/design-query2.rst \
+       doc/design-remote-commands.rst \
        doc/design-resource-model.rst \
-       doc/cluster-merge.rst \
        doc/design-shared-storage.rst \
-       doc/design-node-state-cache.rst \
+       doc/design-ssh-setup.rst \
+       doc/design-monitoring-agent.rst \
        doc/design-virtual-clusters.rst \
-       doc/design-bulk-create.rst \
-       doc/design-query-splitting.rst \
+       doc/design-x509-ca.rst \
        doc/devnotes.rst \
        doc/glossary.rst \
        doc/hooks.rst \
@@ -351,49 +386,69 @@ docrst = \
        doc/rapi.rst \
        doc/security.rst \
        doc/upgrade.rst \
+       doc/virtual-cluster.rst \
        doc/walkthrough.rst
 
 HS_PROGS = htools/htools
 HS_BIN_ROLES = hbal hscan hspace hinfo hcheck
+HS_HTOOLS_PROGS = $(HS_BIN_ROLES) hail
+
+HS_ALL_PROGS = \
+       $(HS_PROGS) \
+       htest/hpc-htools \
+       htest/test \
+       htools/hconfd \
+       htools/rpc-test
 
-HS_ALL_PROGS = $(HS_PROGS) htools/test htools/hpc-htools htools/hconfd
 HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS))
-HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=test/%) test/hail
+HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=htest/%) htest/hail
+
+HFLAGS = \
+       -O -Wall -Werror -ihtools \
+       -fwarn-monomorphism-restriction \
+       -fwarn-tabs \
+       $(GHC_BYVERSION_FLAGS)
 
-HFLAGS = -O -Wall -Werror -fwarn-monomorphism-restriction -fwarn-tabs -ihtools
 # extra flags that can be overriden on the command line (e.g. -Wwarn, etc.)
 HEXTRA =
-# internal extra flags (used for htools/test mainly)
+# internal extra flags (used for htest/test mainly)
 HEXTRA_INT =
 # exclude options for coverage reports
 HPCEXCL = --exclude Main \
        --exclude Ganeti.Constants \
-       --exclude Ganeti.THH \
        --exclude Ganeti.HTools.QC \
-       --exclude Ganeti.HTools.QCHelper \
-       --exclude Ganeti.HTools.Version
+       --exclude Ganeti.THH \
+       --exclude Ganeti.Version \
+       --exclude Test.Ganeti.TestCommon \
+       --exclude Test.Ganeti.TestHTools \
+       --exclude Test.Ganeti.TestHelper \
+       --exclude Test.Ganeti.TestImports \
+       $(patsubst htools.%,--exclude Test.%,$(subst /,.,$(patsubst %.hs,%, $(HS_LIB_SRCS))))
 
 HS_LIB_SRCS = \
+       htools/Ganeti/BasicTypes.hs \
+       htools/Ganeti/Common.hs \
+       htools/Ganeti/Compat.hs \
+       htools/Ganeti/Confd/Server.hs \
+       htools/Ganeti/Confd/Types.hs \
+       htools/Ganeti/Confd/Utils.hs \
+       htools/Ganeti/Config.hs \
+       htools/Ganeti/Daemon.hs \
+       htools/Ganeti/Errors.hs \
+       htools/Ganeti/HTools/Backend/IAlloc.hs \
+       htools/Ganeti/HTools/Backend/Luxi.hs \
+       htools/Ganeti/HTools/Backend/Rapi.hs \
+       htools/Ganeti/HTools/Backend/Simu.hs \
+       htools/Ganeti/HTools/Backend/Text.hs \
        htools/Ganeti/HTools/CLI.hs \
        htools/Ganeti/HTools/Cluster.hs \
-       htools/Ganeti/HTools/Compat.hs \
        htools/Ganeti/HTools/Container.hs \
        htools/Ganeti/HTools/ExtLoader.hs \
        htools/Ganeti/HTools/Group.hs \
-       htools/Ganeti/HTools/IAlloc.hs \
        htools/Ganeti/HTools/Instance.hs \
-       htools/Ganeti/HTools/JSON.hs \
        htools/Ganeti/HTools/Loader.hs \
-       htools/Ganeti/HTools/Luxi.hs \
        htools/Ganeti/HTools/Node.hs \
        htools/Ganeti/HTools/PeerMap.hs \
-       htools/Ganeti/HTools/QC.hs \
-       htools/Ganeti/HTools/QCHelper.hs \
-       htools/Ganeti/HTools/Rapi.hs \
-       htools/Ganeti/HTools/Simu.hs \
-       htools/Ganeti/HTools/Text.hs \
-       htools/Ganeti/HTools/Types.hs \
-       htools/Ganeti/HTools/Utils.hs \
        htools/Ganeti/HTools/Program.hs \
        htools/Ganeti/HTools/Program/Hail.hs \
        htools/Ganeti/HTools/Program/Hbal.hs \
@@ -401,25 +456,68 @@ HS_LIB_SRCS = \
        htools/Ganeti/HTools/Program/Hinfo.hs \
        htools/Ganeti/HTools/Program/Hscan.hs \
        htools/Ganeti/HTools/Program/Hspace.hs \
-       htools/Ganeti/BasicTypes.hs \
-       htools/Ganeti/Confd.hs \
-       htools/Ganeti/Confd/Server.hs \
-       htools/Ganeti/Config.hs \
-       htools/Ganeti/Daemon.hs \
+       htools/Ganeti/HTools/Types.hs \
        htools/Ganeti/Hash.hs \
+       htools/Ganeti/JSON.hs \
        htools/Ganeti/Jobs.hs \
        htools/Ganeti/Logging.hs \
        htools/Ganeti/Luxi.hs \
        htools/Ganeti/Objects.hs \
        htools/Ganeti/OpCodes.hs \
+       htools/Ganeti/Path.hs \
+       htools/Ganeti/Query/Common.hs \
+       htools/Ganeti/Query/Filter.hs \
+       htools/Ganeti/Query/Group.hs \
+       htools/Ganeti/Query/Language.hs \
+       htools/Ganeti/Query/Node.hs \
+       htools/Ganeti/Query/Query.hs \
+       htools/Ganeti/Query/Server.hs \
+       htools/Ganeti/Query/Types.hs \
        htools/Ganeti/Rpc.hs \
-       htools/Ganeti/Queryd.hs \
        htools/Ganeti/Runtime.hs \
        htools/Ganeti/Ssconf.hs \
        htools/Ganeti/THH.hs \
-       htools/Ganeti/Query2.hs
-
-HS_BUILT_SRCS = htools/Ganeti/HTools/Version.hs htools/Ganeti/Constants.hs
+       htools/Ganeti/Utils.hs
+
+HS_TEST_SRCS = \
+       htest/Test/Ganeti/Attoparsec.hs \
+       htest/Test/Ganeti/BasicTypes.hs \
+       htest/Test/Ganeti/Common.hs \
+       htest/Test/Ganeti/Confd/Utils.hs \
+       htest/Test/Ganeti/Daemon.hs \
+       htest/Test/Ganeti/Errors.hs \
+       htest/Test/Ganeti/HTools/Backend/Simu.hs \
+       htest/Test/Ganeti/HTools/Backend/Text.hs \
+       htest/Test/Ganeti/HTools/CLI.hs \
+       htest/Test/Ganeti/HTools/Cluster.hs \
+       htest/Test/Ganeti/HTools/Container.hs \
+       htest/Test/Ganeti/HTools/Instance.hs \
+       htest/Test/Ganeti/HTools/Loader.hs \
+       htest/Test/Ganeti/HTools/Node.hs \
+       htest/Test/Ganeti/HTools/PeerMap.hs \
+       htest/Test/Ganeti/HTools/Types.hs \
+       htest/Test/Ganeti/JSON.hs \
+       htest/Test/Ganeti/Jobs.hs \
+       htest/Test/Ganeti/Luxi.hs \
+       htest/Test/Ganeti/Objects.hs \
+       htest/Test/Ganeti/OpCodes.hs \
+       htest/Test/Ganeti/Query/Filter.hs \
+       htest/Test/Ganeti/Query/Language.hs \
+       htest/Test/Ganeti/Query/Query.hs \
+       htest/Test/Ganeti/Rpc.hs \
+       htest/Test/Ganeti/Ssconf.hs \
+       htest/Test/Ganeti/THH.hs \
+       htest/Test/Ganeti/TestCommon.hs \
+       htest/Test/Ganeti/TestHTools.hs \
+       htest/Test/Ganeti/TestHelper.hs \
+       htest/Test/Ganeti/Utils.hs
+
+HS_LIBTEST_SRCS = $(HS_LIB_SRCS) $(HS_TEST_SRCS)
+
+HS_BUILT_SRCS = \
+       htest/Test/Ganeti/TestImports.hs \
+       htools/Ganeti/Constants.hs \
+       htools/Ganeti/Version.hs
 HS_BUILT_SRCS_IN = $(patsubst %,%.in,$(HS_BUILT_SRCS))
 
 $(RUN_IN_TEMPDIR): | stamp-directories
@@ -468,10 +566,10 @@ docpng = $(patsubst %.dot,%.png,$(docdot))
 # Things to build but not to install (add it to EXTRA_DIST if it should be
 # distributed)
 noinst_DATA = \
-       devel/upload \
        doc/html \
        $(BUILT_EXAMPLES) \
        doc/examples/bash_completion \
+       doc/examples/bash_completion-debug \
        $(manhtml)
 
 gnt_scripts = \
@@ -487,17 +585,14 @@ gnt_scripts = \
 PYTHON_BOOTSTRAP_SBIN = \
        daemons/ganeti-masterd \
        daemons/ganeti-noded \
-       daemons/ganeti-watcher \
        daemons/ganeti-rapi \
+       daemons/ganeti-watcher \
        $(gnt_scripts)
 
-if PY_CONFD
-PYTHON_BOOTSTRAP_SBIN += daemons/ganeti-confd
-endif
-
 PYTHON_BOOTSTRAP = \
        $(PYTHON_BOOTSTRAP_SBIN) \
-       tools/ensure-dirs
+       tools/ensure-dirs \
+       tools/prepare-node-join
 
 qa_scripts = \
        qa/__init__.py \
@@ -528,37 +623,30 @@ install-exec-hook:
                $(LN_S) -f htools \
                           $(DESTDIR)$(bindir)/$$role ; \
        done
-if HS_CONFD
-       mv $(DESTDIR)$(sbindir)/hconfd $(DESTDIR)$(sbindir)/ganeti-confd
-endif
 endif
 
-$(HS_ALL_PROGS): %: %.hs $(HS_LIB_SRCS) $(HS_BUILT_SRCS) Makefile
-       @if [ -z "$(HTOOLS)" ]; then \
-         echo "Error: htools compilation disabled at configure time" 1>&2 ;\
-         exit 1; \
-       fi
-       @BINARY=$(@:htools/%=%); \
-       if [ "$BINARY" = "test" ] && [ -z "$(GHC_PKG_QUICKCHECK)" ]; then \
-         echo "Error: cannot run unittests without the QuickCheck library (see devnotes.rst)" 1>&2; \
+$(HS_ALL_PROGS): %: %.hs $(HS_LIBTEST_SRCS) $(HS_BUILT_SRCS) Makefile
+       @if [ "$(notdir $@)" = "test" ] && [ "$(HTOOLS_NODEV)" ]; then \
+         echo "Error: cannot run unittests without the development" \
+              " libraries (see devnotes.rst)" 1>&2; \
          exit 1; \
        fi
-       rm -f $(@:htools/%=%).tix
-       BINARY=$(@:htools/%=%); $(GHC) --make \
+       @rm -f $(notdir $@).tix
+       $(GHC) --make \
          $(HFLAGS) \
-         $(HTOOLS_NOCURL) $(HTOOLS_PARALLEL3) \
-         -osuf $$BINARY.o -hisuf $$BINARY.hi \
+         $(HTOOLS_NOCURL) $(HTOOLS_PARALLEL3) $(HTOOLS_REGEX_PCRE) \
+         -osuf $(notdir $@).o -hisuf $(notdir $@).hi \
          $(HEXTRA) $(HEXTRA_INT) $@
        @touch "$@"
 
-# for the htools/test binary, we need to enable profiling/coverage
-htools/test: HEXTRA_INT=-fhpc
+# for the htest/test binary, we need to enable profiling/coverage
+htest/test: HEXTRA_INT=-fhpc -ihtest
 
 # we compile the hpc-htools binary with the program coverage
-htools/hpc-htools: HEXTRA_INT=-fhpc
+htest/hpc-htools: HEXTRA_INT=-fhpc
 
 # test dependency
-htools/offline-tests.sh: htools/hpc-htools
+htest/offline-tests.sh: htest/hpc-htools
 
 # rules for building profiling-enabled versions of the haskell
 # programs: hs-prof does the full two-step build, whereas
@@ -581,8 +669,11 @@ nodist_sbin_SCRIPTS = \
        $(PYTHON_BOOTSTRAP_SBIN) \
        daemons/ganeti-cleaner
 
-if HS_CONFD
-nodist_sbin_SCRIPTS += htools/hconfd
+if ENABLE_CONFD
+htools/ganeti-confd: htools/hconfd
+       cp -f $< $@
+
+nodist_sbin_SCRIPTS += htools/ganeti-confd
 endif
 
 python_scripts = \
@@ -596,21 +687,24 @@ python_scripts = \
        tools/lvmstrap \
        tools/move-instance \
        tools/ovfconverter \
-       tools/setup-ssh \
        tools/sanitize-config
 
 dist_tools_SCRIPTS = \
        $(python_scripts) \
        tools/kvm-console-wrapper \
-       tools/xm-console-wrapper \
-       tools/master-ip-setup
+       tools/master-ip-setup \
+       tools/xen-console-wrapper
+
+nodist_tools_SCRIPTS = \
+       tools/vcluster-setup
 
 pkglib_python_scripts = \
        daemons/import-export \
        tools/check-cert-expired
 
 nodist_pkglib_python_scripts = \
-       tools/ensure-dirs
+       tools/ensure-dirs \
+       tools/prepare-node-join
 
 myexeclib_SCRIPTS = \
        daemons/daemon-util \
@@ -628,11 +722,11 @@ EXTRA_DIST = \
        autotools/build-bash-completion \
        autotools/build-rpc \
        autotools/check-header \
-       autotools/check-python-code \
        autotools/check-imports \
        autotools/check-man-dashes \
        autotools/check-man-warnings \
        autotools/check-news \
+       autotools/check-python-code \
        autotools/check-tar \
        autotools/check-version \
        autotools/convert-constants \
@@ -644,8 +738,9 @@ EXTRA_DIST = \
        daemons/daemon-util.in \
        daemons/ganeti-cleaner.in \
        $(pkglib_python_scripts) \
-       devel/upload.in \
+       devel/upload \
        tools/kvm-ifup.in \
+       tools/vcluster-setup.in \
        $(docdot) \
        $(docpng) \
        $(docrst) \
@@ -668,14 +763,14 @@ EXTRA_DIST = \
        $(maninput) \
        qa/qa-sample.json \
        $(qa_scripts) \
-       $(HS_LIB_SRCS) $(HS_BUILT_SRCS_IN) \
+       $(HS_LIBTEST_SRCS) $(HS_BUILT_SRCS_IN) \
        $(HS_PROG_SRCS) \
        htools/lint-hints.hs \
-       htools/cli-tests-defs.sh \
-       htools/offline-test.sh
+       htest/cli-tests-defs.sh \
+       htest/offline-test.sh \
+       .ghci
 
 man_MANS = \
-       man/ganeti.7 \
        man/ganeti-cleaner.8 \
        man/ganeti-confd.8 \
        man/ganeti-listrunner.8 \
@@ -684,6 +779,7 @@ man_MANS = \
        man/ganeti-os-interface.7 \
        man/ganeti-rapi.8 \
        man/ganeti-watcher.8 \
+       man/ganeti.7 \
        man/gnt-backup.8 \
        man/gnt-cluster.8 \
        man/gnt-debug.8 \
@@ -709,12 +805,39 @@ maninput = \
        man/footer.man man/footer.html $(mangen)
 
 TEST_FILES = \
+       htest/data/common-suffix.data \
+       htest/data/hail-alloc-drbd.json \
+       htest/data/hail-change-group.json \
+       htest/data/hail-invalid-reloc.json \
+       htest/data/hail-node-evac.json \
+       htest/data/hail-reloc-drbd.json \
+       htest/data/hbal-excl-tags.data \
+       htest/data/hbal-split-insts.data \
+       htest/data/invalid-node.data \
+       htest/data/missing-resources.data \
+       htest/data/rapi/groups.json \
+       htest/data/rapi/info.json \
+       htest/data/rapi/instances.json \
+       htest/data/rapi/nodes.json \
+       htest/shelltests/htools-balancing.test \
+       htest/shelltests/htools-basic.test \
+       htest/shelltests/htools-dynutil.test \
+       htest/shelltests/htools-excl.test \
+       htest/shelltests/htools-hail.test \
+       htest/shelltests/htools-hspace.test \
+       htest/shelltests/htools-invalid.test \
+       htest/shelltests/htools-multi-group.test \
+       htest/shelltests/htools-no-backend.test \
+       htest/shelltests/htools-rapi.test \
+       htest/shelltests/htools-single-group.test \
+       htest/shelltests/htools-text-backend.test \
        test/data/bdev-drbd-8.0.txt \
        test/data/bdev-drbd-8.3.txt \
        test/data/bdev-drbd-disk.txt \
        test/data/bdev-drbd-net-ip4.txt \
        test/data/bdev-drbd-net-ip6.txt \
        test/data/cert1.pem \
+       test/data/cert2.pem \
        test/data/ip-addr-show-dummy0.txt \
        test/data/ip-addr-show-lo-ipv4.txt \
        test/data/ip-addr-show-lo-ipv6.txt \
@@ -722,29 +845,10 @@ TEST_FILES = \
        test/data/ip-addr-show-lo-oneline-ipv6.txt \
        test/data/ip-addr-show-lo-oneline.txt \
        test/data/ip-addr-show-lo.txt \
-       test/data/proc_drbd8.txt \
-       test/data/proc_drbd80-emptyline.txt \
-       test/data/proc_drbd83.txt \
-       test/data/proc_drbd83_sync.txt \
-       test/data/proc_drbd83_sync_krnl2.6.39.txt \
-       test/data/kvm_1.0_help.txt \
-       test/data/kvm_0.15.90_help.txt \
        test/data/kvm_0.12.5_help.txt \
+       test/data/kvm_0.15.90_help.txt \
        test/data/kvm_0.9.1_help.txt \
-       test/data/sys_drbd_usermode_helper.txt \
-       test/data/htools/hail-alloc-drbd.json \
-       test/data/htools/hail-change-group.json \
-       test/data/htools/hail-invalid-reloc.json \
-       test/data/htools/hail-node-evac.json \
-       test/data/htools/hail-reloc-drbd.json \
-       test/data/htools/hbal-split-insts.data \
-       test/data/htools/common-suffix.data \
-       test/data/htools/invalid-node.data \
-       test/data/htools/missing-resources.data \
-       test/data/htools/rapi/groups.json \
-       test/data/htools/rapi/info.json \
-       test/data/htools/rapi/instances.json \
-       test/data/htools/rapi/nodes.json \
+       test/data/kvm_1.0_help.txt \
        test/data/ovfdata/compr_disk.vmdk.gz \
        test/data/ovfdata/config.ini \
        test/data/ovfdata/corrupted_resources.ovf \
@@ -758,72 +862,71 @@ TEST_FILES = \
        test/data/ovfdata/no_disk_in_ref.ovf \
        test/data/ovfdata/no_os.ini \
        test/data/ovfdata/no_ovf.ova \
+       test/data/ovfdata/other/rawdisk.raw \
        test/data/ovfdata/ova.ova \
-       test/data/ovfdata/second_disk.vmdk \
        test/data/ovfdata/rawdisk.raw \
+       test/data/ovfdata/second_disk.vmdk \
        test/data/ovfdata/unsafe_path.ini \
        test/data/ovfdata/virtualbox.ovf \
-       test/data/ovfdata/wrong_extension.ovd \
        test/data/ovfdata/wrong_config.ini \
+       test/data/ovfdata/wrong_extension.ovd \
        test/data/ovfdata/wrong_manifest.mf \
        test/data/ovfdata/wrong_manifest.ovf \
        test/data/ovfdata/wrong_ova.ova \
        test/data/ovfdata/wrong_xml.ovf \
-       test/data/ovfdata/other/rawdisk.raw \
+       test/data/proc_drbd8.txt \
+       test/data/proc_drbd80-emptyline.txt \
+       test/data/proc_drbd83.txt \
+       test/data/proc_drbd83_sync.txt \
+       test/data/proc_drbd83_sync_krnl2.6.39.txt \
+       test/data/sys_drbd_usermode_helper.txt \
        test/data/vgreduce-removemissing-2.02.02.txt \
        test/data/vgreduce-removemissing-2.02.66-fail.txt \
        test/data/vgreduce-removemissing-2.02.66-ok.txt \
        test/data/vgs-missing-pvs-2.02.02.txt \
        test/data/vgs-missing-pvs-2.02.66.txt \
-       test/import-export_unittest-helper \
-       test/gnt-cli.test \
        test/ganeti-cli.test \
-       test/htools-balancing.test \
-       test/htools-basic.test \
-       test/htools-dynutil.test \
-       test/htools-excl.test \
-       test/htools-hail.test \
-       test/htools-hspace.test \
-       test/htools-invalid.test \
-       test/htools-multi-group.test \
-       test/htools-no-backend.test \
-       test/htools-rapi.test \
-       test/htools-single-group.test \
-       test/htools-text-backend.test
+       test/gnt-cli.test \
+       test/import-export_unittest-helper
 
 python_tests = \
        doc/examples/rapi_testutils.py \
+       test/cfgupgrade_unittest.py \
+       test/docs_unittest.py \
        test/ganeti.asyncnotifier_unittest.py \
        test/ganeti.backend_unittest.py \
        test/ganeti.bdev_unittest.py \
        test/ganeti.cli_unittest.py \
        test/ganeti.client.gnt_cluster_unittest.py \
        test/ganeti.client.gnt_instance_unittest.py \
-       test/ganeti.daemon_unittest.py \
+       test/ganeti.client.gnt_job_unittest.py \
        test/ganeti.cmdlib_unittest.py \
        test/ganeti.compat_unittest.py \
        test/ganeti.confd.client_unittest.py \
        test/ganeti.config_unittest.py \
        test/ganeti.constants_unittest.py \
+       test/ganeti.daemon_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.hypervisor_unittest.py \
        test/ganeti.impexpd_unittest.py \
        test/ganeti.jqueue_unittest.py \
        test/ganeti.jstore_unittest.py \
        test/ganeti.locking_unittest.py \
        test/ganeti.luxi_unittest.py \
+       test/ganeti.masterd.iallocator_unittest.py \
        test/ganeti.masterd.instance_unittest.py \
        test/ganeti.mcpu_unittest.py \
        test/ganeti.netutils_unittest.py \
        test/ganeti.objects_unittest.py \
+       test/ganeti.objectutils_unittest.py \
        test/ganeti.opcodes_unittest.py \
        test/ganeti.ovf_unittest.py \
        test/ganeti.qlang_unittest.py \
@@ -836,13 +939,16 @@ python_tests = \
        test/ganeti.rpc_unittest.py \
        test/ganeti.runtime_unittest.py \
        test/ganeti.serializer_unittest.py \
+       test/ganeti.server.rapi_unittest.py \
        test/ganeti.ssh_unittest.py \
        test/ganeti.storage_unittest.py \
        test/ganeti.tools.ensure_dirs_unittest.py \
+       test/ganeti.tools.prepare_node_join_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-runasroot.py \
        test/ganeti.utils.io_unittest.py \
        test/ganeti.utils.log_unittest.py \
        test/ganeti.utils.mlock_unittest.py \
@@ -853,17 +959,13 @@ python_tests = \
        test/ganeti.utils.wrapper_unittest.py \
        test/ganeti.utils.x509_unittest.py \
        test/ganeti.utils_unittest.py \
+       test/ganeti.vcluster_unittest.py \
        test/ganeti.workerpool_unittest.py \
-       test/qa.qa_config_unittest.py \
-       test/cfgupgrade_unittest.py \
-       test/docs_unittest.py \
        test/pycurl_reset_unittest.py \
+       test/qa.qa_config_unittest.py \
        test/tempfile_fork_unittest.py
-if HAS_FAKEROOT
-python_tests += test/ganeti.utils.io_unittest-runasroot.py
-endif
 
-haskell_tests = htools/test
+haskell_tests = htest/test
 
 dist_TESTS = \
        test/check-cert-expired_unittest.bash \
@@ -871,6 +973,7 @@ dist_TESTS = \
        test/ganeti-cleaner_unittest.bash \
        test/import-export_unittest.bash \
        test/cli-test.bash \
+       test/bash_completion.bash \
        $(python_tests)
 
 nodist_TESTS =
@@ -878,8 +981,8 @@ check_SCRIPTS =
 
 if WANT_HTOOLSTESTS
 nodist_TESTS += $(haskell_tests)
-dist_TESTS += htools/offline-test.sh
-check_SCRIPTS += htools/hpc-htools $(HS_BUILT_TEST_HELPERS)
+dist_TESTS += htest/offline-test.sh
+check_SCRIPTS += htest/hpc-htools $(HS_BUILT_TEST_HELPERS)
 endif
 
 TESTS = $(dist_TESTS) $(nodist_TESTS)
@@ -923,10 +1026,11 @@ srclink_files = \
        test/ganeti-cleaner_unittest.bash \
        test/import-export_unittest.bash \
        test/cli-test.bash \
-       htools/offline-test.sh \
-       htools/cli-tests-defs.sh \
+       test/bash_completion.bash \
+       htest/offline-test.sh \
+       htest/cli-tests-defs.sh \
        $(all_python_code) \
-       $(HS_LIB_SRCS) $(HS_PROG_SRCS)
+       $(HS_LIBTEST_SRCS) $(HS_PROG_SRCS)
 
 check_python_code = \
        $(BUILD_BASH_COMPLETION) \
@@ -967,13 +1071,15 @@ test/daemon-util_unittest.bash: daemons/daemon-util
 
 test/ganeti-cleaner_unittest.bash: daemons/ganeti-cleaner
 
+test/bash_completion.bash: doc/examples/bash_completion-debug
+
 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)
+tools/vcluster-setup: tools/vcluster-setup.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
-       chmod u+x $@
+       chmod +x $@
 
 daemons/%:: daemons/%.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
@@ -982,10 +1088,16 @@ daemons/%:: daemons/%.in $(REPLACE_VARS_SED)
 doc/examples/%:: doc/examples/%.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
 
-doc/examples/bash_completion: $(BUILD_BASH_COMPLETION) $(RUN_IN_TEMPDIR) \
+doc/examples/bash_completion: BC_ARGS = --compact
+doc/examples/bash_completion-debug: BC_ARGS =
+
+doc/examples/bash_completion doc/examples/bash_completion-debug: \
+       $(BUILD_BASH_COMPLETION) $(RUN_IN_TEMPDIR) \
        lib/cli.py $(gnt_scripts) $(client_PYTHON) tools/burnin \
-       $(GENERATED_FILES)
-       PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(BUILD_BASH_COMPLETION) > $@
+       daemons/ganeti-cleaner \
+       $(GENERATED_FILES) $(HTOOLS_GENERATED_FILES)
+       PYTHONPATH=. $(RUN_IN_TEMPDIR) \
+         $(CURDIR)/$(BUILD_BASH_COMPLETION) $(BC_ARGS) > $@
 
 doc/%.png: doc/%.dot
        @test -n "$(DOT)" || { echo 'dot' not found during configure; exit 1; }
@@ -1052,14 +1164,17 @@ clean-vcs-version:
 
 .PHONY: regen-vcs-version
 regen-vcs-version:
-       set -e; \
+       @set -e; \
        cd $(srcdir); \
        if test -d .git; then \
-         $(MAKE) $(AM_MAKEFLAGS) clean-vcs-version; \
-         $(MAKE) $(AM_MAKEFLAGS) vcs-version; \
+         T=`mktemp` ; trap 'rm -f $$T' EXIT; \
+         git describe > $$T; \
+         if ! cmp --quiet $$T vcs-version; then \
+           mv $$T vcs-version; \
+         fi; \
        fi
 
-htools/Ganeti/HTools/Version.hs: htools/Ganeti/HTools/Version.hs.in \
+htools/Ganeti/Version.hs: htools/Ganeti/Version.hs.in \
        vcs-version $(built_base_sources)
        set -e; \
        VCSVER=`cat $(abs_top_srcdir)/vcs-version`; \
@@ -1072,6 +1187,16 @@ htools/Ganeti/Constants.hs: htools/Ganeti/Constants.hs.in \
        set -e; \
        { cat $< ; PYTHONPATH=. $(CONVERT_CONSTANTS); } > $@
 
+htest/Test/Ganeti/TestImports.hs: htest/Test/Ganeti/TestImports.hs.in \
+       $(built_base_sources)
+       set -e; \
+       { cat $< ; \
+         echo ; \
+         for name in $(filter-out Ganeti.THH,$(subst /,.,$(patsubst %.hs,%,$(patsubst htools/%,%,$(HS_LIB_SRCS))))) ; do \
+           echo "import $$name ()" ; \
+         done ; \
+       } > $@
+
 lib/_autoconf.py: Makefile | stamp-directories
        set -e; \
        { echo '# This file is automatically generated, do not edit!'; \
@@ -1098,6 +1223,8 @@ lib/_autoconf.py: Makefile | stamp-directories
          echo "LOCALSTATEDIR = '$(localstatedir)'"; \
          echo "SYSCONFDIR = '$(sysconfdir)'"; \
          echo "SSH_CONFIG_DIR = '$(SSH_CONFIG_DIR)'"; \
+         echo "SSH_LOGIN_USER = '$(SSH_LOGIN_USER)'"; \
+         echo "SSH_CONSOLE_USER = '$(SSH_CONSOLE_USER)'"; \
          echo "EXPORT_DIR = '$(EXPORT_DIR)'"; \
          echo "OS_SEARCH_PATH = [$(OS_SEARCH_PATH)]"; \
          echo "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \
@@ -1117,6 +1244,7 @@ lib/_autoconf.py: Makefile | stamp-directories
          echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)"; \
          echo "TOOLSDIR = '$(toolsdir)'"; \
          echo "GNT_SCRIPTS = [$(foreach i,$(notdir $(gnt_scripts)),'$(i)',)]"; \
+         echo "HTOOLS_PROGS = [$(foreach i,$(HS_HTOOLS_PROGS),'$(i)',)]"; \
          echo "PKGLIBDIR = '$(pkglibdir)'"; \
          echo "DRBD_BARRIERS = '$(DRBD_BARRIERS)'"; \
          echo "DRBD_NO_META_FLUSH = $(DRBD_NO_META_FLUSH)"; \
@@ -1133,15 +1261,11 @@ lib/_autoconf.py: Makefile | stamp-directories
          echo "NODED_GROUP = '$(NODED_GROUP)'"; \
          echo "DISK_SEPARATOR = '$(DISK_SEPARATOR)'"; \
          echo "QEMUIMG_PATH = '$(QEMUIMG_PATH)'"; \
-         if [ "$(HTOOLS)" ]; then \
-           echo "HTOOLS = True"; \
-         else \
-           echo "HTOOLS = False"; \
-         fi; \
+         echo "HTOOLS = True"; \
          echo "ENABLE_CONFD = $(ENABLE_CONFD)"; \
-         echo "PY_CONFD = $(PY_CONFD)"; \
-         echo "HS_CONFD = $(HS_CONFD)"; \
          echo "XEN_CMD = '$(XEN_CMD)'"; \
+         echo "ENABLE_SPLIT_QUERY = $(ENABLE_SPLIT_QUERY)"; \
+         echo "ENABLE_REMOTE_COMMANDS = $(ENABLE_REMOTE_COMMANDS)"; \
        } > $@
 
 lib/_vcsversion.py: Makefile vcs-version | stamp-directories
@@ -1168,13 +1292,27 @@ lib/_vcsversion.py: Makefile vcs-version | stamp-directories
 lib/_generated_rpc.py: lib/rpc_defs.py $(BUILD_RPC)
        PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(BUILD_RPC) lib/rpc_defs.py > $@
 
-$(REPLACE_VARS_SED): Makefile stamp-directories
+$(SHELL_ENV_INIT): Makefile stamp-directories
+       set -e; \
+       { echo '# Allow overriding for tests'; \
+         echo 'readonly LOCALSTATEDIR=$${LOCALSTATEDIR:-$${GANETI_ROOTDIR:-}$(localstatedir)}'; \
+         echo 'readonly SYSCONFDIR=$${SYSCONFDIR:-$${GANETI_ROOTDIR:-}$(sysconfdir)}'; \
+         echo; \
+         echo 'readonly PKGLIBDIR=$(pkglibdir)'; \
+         echo 'readonly LOG_DIR="$$LOCALSTATEDIR/log/ganeti"'; \
+         echo 'readonly RUN_DIR="$$LOCALSTATEDIR/run/ganeti"'; \
+         echo 'readonly DATA_DIR="$$LOCALSTATEDIR/lib/ganeti"'; \
+         echo 'readonly CONF_DIR="$$SYSCONFDIR/ganeti"'; \
+       } > $@
+
+$(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories
        set -e; \
        { echo 's#@PREFIX@#$(prefix)#g'; \
          echo 's#@SYSCONFDIR@#$(sysconfdir)#g'; \
          echo 's#@LOCALSTATEDIR@#$(localstatedir)#g'; \
          echo 's#@BINDIR@#$(bindir)#g'; \
          echo 's#@SBINDIR@#$(sbindir)#g'; \
+         echo 's#@LIBDIR@#$(libdir)#g'; \
          echo 's#@GANETI_VERSION@#$(PACKAGE_VERSION)#g'; \
          echo 's#@CUSTOM_XEN_BOOTLOADER@#$(XEN_BOOTLOADER)#g'; \
          echo 's#@CUSTOM_XEN_KERNEL@#$(XEN_KERNEL)#g'; \
@@ -1195,6 +1333,12 @@ $(REPLACE_VARS_SED): Makefile stamp-directories
          echo 's#@GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \
          echo 's#@CUSTOM_ENABLE_CONFD@#$(ENABLE_CONFD)#g'; \
          echo 's#@MODULES@#$(strip $(lint_python_code))#g'; \
+         echo 's#@ENABLE_SPLIT_QUERY@#$(ENABLE_SPLIT_QUERY)#g'; \
+         echo; \
+         echo '/^@SHELL_ENV_INIT@$$/ {'; \
+         echo '  r $(SHELL_ENV_INIT)'; \
+         echo '  d'; \
+         echo '}'; \
        } > $@
 
 # Using deferred evaluation
@@ -1202,7 +1346,8 @@ daemons/ganeti-%: MODULE = ganeti.server.$(patsubst ganeti-%,%,$(notdir $@))
 daemons/ganeti-watcher: MODULE = ganeti.watcher
 scripts/%: MODULE = ganeti.client.$(subst -,_,$(notdir $@))
 tools/ensure-dirs: MODULE = ganeti.tools.ensure_dirs
-$(HS_BUILT_TEST_HELPERS): TESTROLE = $(patsubst test/%,%,$@)
+tools/prepare-node-join: MODULE = ganeti.tools.prepare_node_join
+$(HS_BUILT_TEST_HELPERS): TESTROLE = $(patsubst htest/%,%,$@)
 
 $(PYTHON_BOOTSTRAP): Makefile | stamp-directories
        test -n "$(MODULE)" || { echo Missing module; exit 1; }
@@ -1238,7 +1383,7 @@ $(HS_BUILT_TEST_HELPERS): Makefile
          echo '# This file is automatically generated, do not edit!'; \
          echo "# Edit Makefile.am instead."; \
          echo; \
-         echo "HTOOLS=$(TESTROLE) exec ./htools/hpc-htools \"\$$@\""; \
+         echo "HTOOLS=$(TESTROLE) exec ./htest/hpc-htools \"\$$@\""; \
        } > $@
        chmod u+x $@
 
@@ -1292,24 +1437,29 @@ check-local: check-dirs $(GENERATED_FILES)
        $(CHECK_VERSION) $(VERSION) $(top_srcdir)/NEWS
        $(CHECK_NEWS) < $(top_srcdir)/NEWS
        PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(CHECK_IMPORTS) . $(standalone_python_modules)
-       expver=$(VERSION_MAJOR).$(VERSION_MINOR); \
+       @expver=$(VERSION_MAJOR).$(VERSION_MINOR); \
        if test "`head -n 1 $(top_srcdir)/README`" != "Ganeti $$expver"; then \
                echo "Incorrect version in README, expected $$expver"; \
                exit 1; \
        fi; \
-       for file in doc/iallocator.rst doc/hooks.rst; do \
+       for file in doc/iallocator.rst doc/hooks.rst doc/virtual-cluster.rst \
+                       doc/security.rst; do \
                if test "`sed -ne '4 p' $(top_srcdir)/$$file`" != \
                        "Documents Ganeti version $$expver"; then \
                        echo "Incorrect version in $$file, expected $$expver"; \
                        exit 1; \
                fi; \
-       done
+       done; \
+       if ! test -f $(top_srcdir)/doc/design-$$expver.rst; then \
+               echo "File $(top_srcdir)/doc/design-$$expver.rst not found"; \
+               exit 1; \
+       fi
 
 .PHONY: hs-check
-hs-check: htools/test htools/hpc-htools $(HS_BUILT_TEST_HELPERS)
+hs-check: htest/test htest/hpc-htools $(HS_BUILT_TEST_HELPERS)
        @rm -f test.tix
-       ./htools/test
-       HBINARY="./htools/hpc-htools" ./htools/offline-test.sh
+       ./htest/test
+       HBINARY="./htest/hpc-htools" ./htest/offline-test.sh
 
 # E111: indentation is not a multiple of four
 # E121: continuation line indentation is not a multiple of four
@@ -1358,6 +1508,7 @@ pep8: $(GENERATED_FILES)
        $(PEP8) --ignore='$(PEP8_IGNORE)' --exclude='$(PEP8_EXCLUDE)' \
                --repeat $(pep8_python_code)
 
+# FIXME: remove ignore "Use void" when GHC 6.x is deprecated
 .PHONY: hlint
 hlint: $(HS_BUILT_SRCS) htools/lint-hints.hs
        @test -n "$(HLINT)" || { echo 'hlint' not found during configure; exit 1; }
@@ -1367,8 +1518,10 @@ hlint: $(HS_BUILT_SRCS) htools/lint-hints.hs
          --ignore "Use comparing" \
          --ignore "Use on" \
          --ignore "Reduce duplication" \
+         --ignore "Use &&&" \
+         --ignore "Use void" \
          --hint htools/lint-hints \
-         $(filter-out htools/Ganeti/THH.hs,$(HS_LIB_SRCS))
+         $(filter-out htools/Ganeti/THH.hs,$(HS_LIBTEST_SRCS) $(HS_PROG_SRCS))
 
 # a dist hook rule for updating the vcs-version file; this is
 # hardcoded due to where it needs to build the file...
@@ -1456,8 +1609,10 @@ hs-apidoc: $(HS_BUILT_SRCS)
        @test -n "$(HADDOCK)" || \
            { echo 'haddock' not found during configure; exit 1; }
        rm -rf $(APIDOC_HS_DIR)/*
+       @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/HTools/Backend
        @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/HTools/Program
        @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/Confd
+       @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/Query
        $(HSCOLOUR) -print-css > $(APIDOC_HS_DIR)/Ganeti/hscolour.css
        $(LN_S) ../hscolour.css $(APIDOC_HS_DIR)/Ganeti/HTools/hscolour.css
        $(LN_S) ../hscolour.css $(APIDOC_HS_DIR)/Ganeti/Confd/hscolour.css
@@ -1470,13 +1625,16 @@ hs-apidoc: $(HS_BUILT_SRCS)
        if [ "$(HTOOLS_PARALLEL3)" ]; \
        then OPTGHC="$$OPTGHC --optghc=$(HTOOLS_PARALLEL3)"; \
        fi; \
-       RELSRCS="$(HS_LIB_SRCS:htools/%=%)  $(HS_BUILT_SRCS:htools/%=%)"; \
+       if [ "$(HTOOLS_REGEX_PCRE)" ]; \
+       then OPTGHC="$$OPTGHC --optghc=$(HTOOLS_REGEX_PCRE)"; \
+       fi; \
+       RELSRCS="$(HS_LIB_SRCS:htools/%=%) $(patsubst htools/%,%,$(filter htools/%,$(HS_BUILT_SRCS)))"; \
        for file in $$RELSRCS; do \
                hfile=`echo $$file|sed 's/\\.hs$$//'`.html; \
                $(HSCOLOUR) -css -anchor $$file > ../$(APIDOC_HS_DIR)/$$hfile ; \
        done ; \
        $(HADDOCK) --odir ../$(APIDOC_HS_DIR) --html --ignore-all-exports -w \
-               -t ganeti-htools -p haddock-prologue \
+               -t ganeti -p haddock-prologue \
                --source-module="%{MODULE/.//}.html" \
                --source-entity="%{MODULE/.//}.html#%{NAME}" \
                $$OPTGHC \
@@ -1485,7 +1643,10 @@ hs-apidoc: $(HS_BUILT_SRCS)
 .PHONY: TAGS
 TAGS: $(GENERATED_FILES)
        rm -f TAGS
-       $(GHC) -e ":etags" -v0 $(HFLAGS) $(HS_LIB_SRCS)
+       $(GHC) -e ":etags" -v0 \
+         $(filter-out -O -Werror,$(HFLAGS)) \
+         $(HTOOLS_NOCURL) $(HTOOLS_PARALLEL3) $(HTOOLS_REGEX_PCRE) \
+         $(HS_LIBTEST_SRCS)
        find . -path './lib/*.py' -o -path './scripts/gnt-*' -o \
          -path './daemons/ganeti-*' -o -path './tools/*' -o \
          -path './qa/*.py' | \
@@ -1500,7 +1661,10 @@ endif
 
 .PHONY: py-coverage
 py-coverage: $(GENERATED_FILES) $(python_tests)
+       @test -n "$(PYCOVERAGE)" || \
+           { echo 'python-coverage' not found during configure; exit 1; }
        set -e; \
+       COVERAGE=$(PYCOVERAGE) \
        COVERAGE_FILE=$(CURDIR)/$(COVERAGE_PY_DIR)/data \
        TEXT_COVERAGE=$(CURDIR)/$(COVERAGE_PY_DIR)/report.txt \
        HTML_COVERAGE=$(CURDIR)/$(COVERAGE_PY_DIR) \
@@ -1508,7 +1672,7 @@ py-coverage: $(GENERATED_FILES) $(python_tests)
        $(python_tests)
 
 .PHONY: hs-coverage
-hs-coverage: $(haskell_tests) htools/hpc-htools
+hs-coverage: $(haskell_tests) htest/hpc-htools
        rm -f *.tix
        $(MAKE) $(AM_MAKEFLAGS) hs-check
        @mkdir_p@ $(COVERAGE_HS_DIR)
@@ -1544,6 +1708,11 @@ gitignore-check:
          exit 1; \
        fi
 
+# Target that builds all binaries (including those that are not
+# rebuilt except when running the tests)
+.PHONY: really-all
+really-all: all $(check_SCRIPTS) $(haskell_tests)
+
 # we don't need the ancient implicit rules:
 %: %,v
 %: RCS/%,v