X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/3add7574dbba0f557769f6dbed81deda12d2b9f4..31b836b8b1d17c70023ef5b8307a5df1b9a0d7db:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4161c18..cc9d2d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,6 +14,9 @@ empty :=
 space := $(empty) $(empty)
 comma := ,
 
+# Helper function to strip src/ and test/hs/ from a list
+strip_hsroot = $(patsubst src/%,%,$(patsubst test/hs/%,%,$(1)))
+
 # Use bash in order to be able to use pipefail
 SHELL=/bin/bash
 
@@ -23,6 +26,7 @@ RUN_IN_TEMPDIR = $(top_srcdir)/autotools/run-in-tempdir
 CHECK_PYTHON_CODE = $(top_srcdir)/autotools/check-python-code
 CHECK_HEADER = $(top_srcdir)/autotools/check-header
 CHECK_MAN_DASHES = $(top_srcdir)/autotools/check-man-dashes
+CHECK_MAN_REFERENCES = $(top_srcdir)/autotools/check-man-references
 CHECK_MAN_WARNINGS = $(top_srcdir)/autotools/check-man-warnings
 CHECK_VERSION = $(top_srcdir)/autotools/check-version
 CHECK_NEWS = $(top_srcdir)/autotools/check-news
@@ -36,6 +40,7 @@ SHELL_ENV_INIT = autotools/shell-env-init
 # Note: these are automake-specific variables, and must be named after
 # the directory + 'dir' suffix
 clientdir = $(pkgpythondir)/client
+cmdlibdir = $(pkgpythondir)/cmdlib
 hypervisordir = $(pkgpythondir)/hypervisor
 httpdir = $(pkgpythondir)/http
 masterddir = $(pkgpythondir)/masterd
@@ -54,42 +59,54 @@ myexeclibdir = $(pkglibdir)
 # Delete output file if an error occurred while building it
 .DELETE_ON_ERROR:
 
-HTOOLS_DIRS = \
+HS_DIRS = \
 	src \
 	src/Ganeti \
 	src/Ganeti/Block \
 	src/Ganeti/Block/Drbd \
 	src/Ganeti/Confd \
+	src/Ganeti/Curl \
 	src/Ganeti/DataCollectors \
 	src/Ganeti/HTools \
 	src/Ganeti/HTools/Backend \
 	src/Ganeti/HTools/Program \
+	src/Ganeti/Hypervisor \
+	src/Ganeti/Hypervisor/Xen \
+	src/Ganeti/Monitoring \
 	src/Ganeti/Query \
-	htest \
-	htest/Test \
-	htest/Test/Ganeti \
-	htest/Test/Ganeti/Block \
-	htest/Test/Ganeti/Block/Drbd \
-	htest/Test/Ganeti/Confd \
-	htest/Test/Ganeti/HTools \
-	htest/Test/Ganeti/HTools/Backend \
-	htest/Test/Ganeti/Query
+	test/hs \
+	test/hs/Test \
+	test/hs/Test/Ganeti \
+	test/hs/Test/Ganeti/Block \
+	test/hs/Test/Ganeti/Block/Drbd \
+	test/hs/Test/Ganeti/Confd \
+	test/hs/Test/Ganeti/HTools \
+	test/hs/Test/Ganeti/HTools/Backend \
+	test/hs/Test/Ganeti/Hypervisor \
+	test/hs/Test/Ganeti/Hypervisor/Xen \
+	test/hs/Test/Ganeti/Query
+
+# Haskell directories without the roots (src, test/hs)
+HS_DIRS_NOROOT = $(filter-out src,$(filter-out test/hs,$(HS_DIRS)))
 
 DIRS = \
-	$(HTOOLS_DIRS) \
+	$(HS_DIRS) \
 	autotools \
 	daemons \
 	devel \
+	devel/data \
 	doc \
+	doc/css \
 	doc/examples \
 	doc/examples/gnt-debug \
 	doc/examples/hooks \
-	htest/data \
-	htest/data/rapi \
-	htest/shelltests \
+	test/data/htools \
+	test/data/htools/rapi \
+	test/hs/shelltests \
 	lib \
 	lib/build \
 	lib/client \
+	lib/cmdlib \
 	lib/confd \
 	lib/http \
 	lib/hypervisor \
@@ -104,21 +121,15 @@ DIRS = \
 	qa \
 	test \
 	test/data \
+	test/data/bdev-rbd \
 	test/data/ovfdata \
 	test/data/ovfdata/other \
+	test/py \
 	tools
 
 ALL_APIDOC_HS_DIRS = \
 	$(APIDOC_HS_DIR) \
-	$(APIDOC_HS_DIR)/Ganeti \
-	$(APIDOC_HS_DIR)/Ganeti/Block \
-	$(APIDOC_HS_DIR)/Ganeti/Block/Drbd \
-	$(APIDOC_HS_DIR)/Ganeti/Confd \
-	$(APIDOC_HS_DIR)/Ganeti/DataCollectors \
-	$(APIDOC_HS_DIR)/Ganeti/HTools \
-	$(APIDOC_HS_DIR)/Ganeti/HTools/Backend \
-	$(APIDOC_HS_DIR)/Ganeti/HTools/Program \
-	$(APIDOC_HS_DIR)/Ganeti/Query
+	$(patsubst %,$(APIDOC_HS_DIR)/%,$(call strip_hsroot,$(HS_DIRS_NOROOT)))
 
 BUILDTIME_DIR_AUTOCREATE = \
 	scripts \
@@ -132,12 +143,14 @@ BUILDTIME_DIR_AUTOCREATE = \
 
 BUILDTIME_DIRS = \
 	$(BUILDTIME_DIR_AUTOCREATE) \
-	doc/html
+	doc/html \
+	doc/man-html
 
 DIRCHECK_EXCLUDE = \
 	$(BUILDTIME_DIRS) \
 	ganeti-[0-9]*.[0-9]*.[0-9]* \
 	doc/html/_* \
+	doc/man-html/_* \
 	autom4te.cache
 
 # some helper vars
@@ -149,7 +162,6 @@ APIDOC_PY_DIR = $(APIDOC_DIR)/py
 APIDOC_HS_DIR = $(APIDOC_DIR)/hs
 
 MAINTAINERCLEANFILES = \
-	$(docpng) \
 	$(maninput) \
 	doc/install-quick.rst \
 	doc/news.rst \
@@ -161,14 +173,18 @@ maintainer-clean-local:
 
 CLEANFILES = \
 	$(addsuffix /*.py[co],$(DIRS)) \
-	$(addsuffix /*.hi,$(HTOOLS_DIRS)) \
-	$(addsuffix /*.o,$(HTOOLS_DIRS)) \
+	$(addsuffix /*.hi,$(HS_DIRS)) \
+	$(addsuffix /*.o,$(HS_DIRS)) \
 	$(PYTHON_BOOTSTRAP) \
 	epydoc.conf \
 	$(REPLACE_VARS_SED) \
 	$(SHELL_ENV_INIT) \
 	daemons/daemon-util \
 	daemons/ganeti-cleaner \
+	devel/squeeze-amd64.tar.gz \
+	devel/squeeze-amd64.conf \
+	$(mandocrst) \
+	doc/manpages-enabled.rst \
 	$(BUILT_EXAMPLES) \
 	doc/examples/bash_completion \
 	doc/examples/bash_completion-debug \
@@ -176,6 +192,7 @@ CLEANFILES = \
 	$(man_MANS) \
 	$(manhtml) \
 	tools/kvm-ifup \
+	tools/users-setup \
 	tools/vcluster-setup \
 	stamp-directories \
 	stamp-srclinks \
@@ -183,7 +200,8 @@ CLEANFILES = \
 	$(HS_ALL_PROGS) $(HS_BUILT_SRCS) \
 	$(HS_BUILT_TEST_HELPERS) \
 	src/ganeti-confd \
-	.hpc/*.mix src/*.tix htest/*.tix \
+	src/ganeti-mond \
+	.hpc/*.mix src/*.tix test/hs/*.tix \
 	doc/hs-lint.html
 
 GENERATED_FILES = \
@@ -191,11 +209,15 @@ GENERATED_FILES = \
 	$(BUILT_PYTHON_SOURCES) \
 	$(PYTHON_BOOTSTRAP)
 
-HTOOLS_GENERATED_FILES =
+HS_GENERATED_FILES =
 if WANT_HTOOLS
-HTOOLS_GENERATED_FILES += $(HS_PROGS)
+HS_GENERATED_FILES += $(HS_PROGS)
 if ENABLE_CONFD
-HTOOLS_GENERATED_FILES += src/hconfd src/ganeti-confd
+HS_GENERATED_FILES += src/hconfd src/ganeti-confd
+endif
+
+if ENABLE_MOND
+HS_GENERATED_FILES += src/ganeti-mond
 endif
 endif
 
@@ -240,12 +262,12 @@ pkgpython_PYTHON = \
 	lib/bdev.py \
 	lib/bootstrap.py \
 	lib/cli.py \
-	lib/cmdlib.py \
 	lib/compat.py \
 	lib/config.py \
 	lib/constants.py \
 	lib/daemon.py \
 	lib/errors.py \
+	lib/hooksmaster.py \
 	lib/ht.py \
 	lib/jqueue.py \
 	lib/jstore.py \
@@ -254,8 +276,8 @@ pkgpython_PYTHON = \
 	lib/mcpu.py \
 	lib/netutils.py \
 	lib/objects.py \
-	lib/objectutils.py \
 	lib/opcodes.py \
+	lib/outils.py \
 	lib/ovf.py \
 	lib/pathutils.py \
 	lib/qlang.py \
@@ -285,6 +307,17 @@ client_PYTHON = \
 	lib/client/gnt_os.py \
 	lib/client/gnt_storage.py
 
+cmdlib_PYTHON = \
+	lib/cmdlib/__init__.py \
+	lib/cmdlib/common.py \
+	lib/cmdlib/base.py \
+	lib/cmdlib/cluster.py \
+	lib/cmdlib/group.py \
+	lib/cmdlib/node.py \
+	lib/cmdlib/tags.py \
+	lib/cmdlib/network.py \
+	lib/cmdlib/test.py
+
 hypervisor_PYTHON = \
 	lib/hypervisor/__init__.py \
 	lib/hypervisor/hv_base.py \
@@ -334,6 +367,7 @@ server_PYTHON = \
 
 pytools_PYTHON = \
 	lib/tools/__init__.py \
+	lib/tools/burnin.py \
 	lib/tools/ensure_dirs.py \
 	lib/tools/node_cleanup.py \
 	lib/tools/node_daemon_setup.py \
@@ -355,7 +389,9 @@ utils_PYTHON = \
 	lib/utils/wrapper.py \
 	lib/utils/x509.py
 
-docrst = \
+docinput = \
+	doc/conf.py \
+	doc/css/style.css \
 	doc/admin.rst \
 	doc/cluster-merge.rst \
 	doc/design-2.0.rst \
@@ -370,6 +406,7 @@ docrst = \
 	doc/design-bulk-create.rst \
 	doc/design-chained-jobs.rst \
 	doc/design-cpu-pinning.rst \
+	doc/design-device-uuid-name.rst \
 	doc/design-draft.rst \
 	doc/design-htools-2.3.rst \
 	doc/design-http-server.rst \
@@ -385,12 +422,15 @@ docrst = \
 	doc/design-partitioned.rst \
 	doc/design-query-splitting.rst \
 	doc/design-query2.rst \
-	doc/design-remote-commands.rst \
+	doc/design-reason-trail.rst \
 	doc/design-resource-model.rst \
+	doc/design-restricted-commands.rst \
 	doc/design-shared-storage.rst \
 	doc/design-monitoring-agent.rst \
 	doc/design-virtual-clusters.rst \
 	doc/design-x509-ca.rst \
+	doc/design-hroller.rst \
+	doc/design-storagetypes.rst \
 	doc/devnotes.rst \
 	doc/glossary.rst \
 	doc/hooks.rst \
@@ -399,6 +439,7 @@ docrst = \
 	doc/install-quick.rst \
 	doc/install.rst \
 	doc/locking.rst \
+	doc/manpages-disabled.rst \
 	doc/move-instance.rst \
 	doc/news.rst \
 	doc/ovfconverter.rst \
@@ -408,20 +449,40 @@ docrst = \
 	doc/virtual-cluster.rst \
 	doc/walkthrough.rst
 
-HS_PROGS = src/htools src/mon-collector
-HS_BIN_ROLES = hbal hscan hspace hinfo hcheck hroller
+# Generates file names such as "doc/man-gnt-instance.rst"
+mandocrst = $(addprefix doc/man-,$(notdir $(manrst)))
+
+# Haskell programs to be installed in $PREFIX/bin
+HS_BIN_PROGS=src/htools
+
+# Haskell programs to be installed in the MYEXECLIB dir
+if ENABLE_MOND
+HS_MYEXECLIB_PROGS=src/mon-collector
+else
+HS_MYEXECLIB_PROGS=
+endif
+
+# Haskell programs to be compiled by "make really-all"
+HS_COMPILE_PROGS= \
+	src/ganeti-mond \
+	src/hconfd \
+	src/rpc-test
+
+# All Haskell non-test programs to be compiled but not automatically installed
+HS_PROGS = $(HS_BIN_PROGS) $(HS_MYEXECLIB_PROGS)
+
+HS_BIN_ROLES = harep hbal hscan hspace hinfo hcheck hroller
 HS_HTOOLS_PROGS = $(HS_BIN_ROLES) hail
 
 HS_ALL_PROGS = \
 	$(HS_PROGS) \
-	htest/hpc-htools \
-	htest/hpc-mon-collector \
-	htest/test \
-	src/hconfd \
-	src/rpc-test
+	test/hs/hpc-htools \
+	test/hs/hpc-mon-collector \
+	test/hs/htest \
+	$(HS_COMPILE_PROGS)
 
 HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS))
-HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=htest/%) htest/hail
+HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=test/hs/%) test/hs/hail
 
 HFLAGS = \
 	-O -Wall -Werror -isrc \
@@ -431,7 +492,7 @@ HFLAGS = \
 
 # extra flags that can be overriden on the command line (e.g. -Wwarn, etc.)
 HEXTRA =
-# internal extra flags (used for htest/test mainly)
+# internal extra flags (used for test/hs/htest mainly)
 HEXTRA_INT =
 # exclude options for coverage reports
 HPCEXCL = --exclude Main \
@@ -457,10 +518,12 @@ HS_LIB_SRCS = \
 	src/Ganeti/Confd/Types.hs \
 	src/Ganeti/Confd/Utils.hs \
 	src/Ganeti/Config.hs \
+	src/Ganeti/Curl/Multi.hs \
 	src/Ganeti/Daemon.hs \
 	src/Ganeti/DataCollectors/CLI.hs \
 	src/Ganeti/DataCollectors/Drbd.hs \
 	src/Ganeti/DataCollectors/Program.hs \
+	src/Ganeti/DataCollectors/Types.hs \
 	src/Ganeti/Errors.hs \
 	src/Ganeti/HTools/Backend/IAlloc.hs \
 	src/Ganeti/HTools/Backend/Luxi.hs \
@@ -477,31 +540,37 @@ HS_LIB_SRCS = \
 	src/Ganeti/HTools/Loader.hs \
 	src/Ganeti/HTools/Node.hs \
 	src/Ganeti/HTools/PeerMap.hs \
-	src/Ganeti/HTools/Program.hs \
 	src/Ganeti/HTools/Program/Hail.hs \
+	src/Ganeti/HTools/Program/Harep.hs \
 	src/Ganeti/HTools/Program/Hbal.hs \
 	src/Ganeti/HTools/Program/Hcheck.hs \
 	src/Ganeti/HTools/Program/Hinfo.hs \
 	src/Ganeti/HTools/Program/Hscan.hs \
 	src/Ganeti/HTools/Program/Hspace.hs \
 	src/Ganeti/HTools/Program/Hroller.hs \
+	src/Ganeti/HTools/Program/Main.hs \
 	src/Ganeti/HTools/Types.hs \
+	src/Ganeti/Hypervisor/Xen/XmParser.hs \
+	src/Ganeti/Hypervisor/Xen/Types.hs \
 	src/Ganeti/Hash.hs \
 	src/Ganeti/JQueue.hs \
 	src/Ganeti/JSON.hs \
 	src/Ganeti/Jobs.hs \
 	src/Ganeti/Logging.hs \
 	src/Ganeti/Luxi.hs \
+	src/Ganeti/Monitoring/Server.hs \
 	src/Ganeti/Network.hs \
 	src/Ganeti/Objects.hs \
 	src/Ganeti/OpCodes.hs \
 	src/Ganeti/OpParams.hs \
 	src/Ganeti/Path.hs \
 	src/Ganeti/Query/Common.hs \
+	src/Ganeti/Query/Export.hs \
 	src/Ganeti/Query/Filter.hs \
 	src/Ganeti/Query/Group.hs \
 	src/Ganeti/Query/Job.hs \
 	src/Ganeti/Query/Language.hs \
+	src/Ganeti/Query/Network.hs \
 	src/Ganeti/Query/Node.hs \
 	src/Ganeti/Query/Query.hs \
 	src/Ganeti/Query/Server.hs \
@@ -514,77 +583,108 @@ HS_LIB_SRCS = \
 	src/Ganeti/Utils.hs
 
 HS_TEST_SRCS = \
-	htest/Test/Ganeti/Attoparsec.hs \
-	htest/Test/Ganeti/BasicTypes.hs \
-	htest/Test/Ganeti/Block/Drbd/Parser.hs \
-	htest/Test/Ganeti/Block/Drbd/Types.hs \
-	htest/Test/Ganeti/Common.hs \
-	htest/Test/Ganeti/Confd/Types.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/Graph.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/JQueue.hs \
-	htest/Test/Ganeti/Luxi.hs \
-	htest/Test/Ganeti/Network.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/Types.hs \
-	htest/Test/Ganeti/Utils.hs
+	test/hs/Test/Ganeti/Attoparsec.hs \
+	test/hs/Test/Ganeti/BasicTypes.hs \
+	test/hs/Test/Ganeti/Block/Drbd/Parser.hs \
+	test/hs/Test/Ganeti/Block/Drbd/Types.hs \
+	test/hs/Test/Ganeti/Common.hs \
+	test/hs/Test/Ganeti/Confd/Types.hs \
+	test/hs/Test/Ganeti/Confd/Utils.hs \
+	test/hs/Test/Ganeti/Daemon.hs \
+	test/hs/Test/Ganeti/Errors.hs \
+	test/hs/Test/Ganeti/HTools/Backend/Simu.hs \
+	test/hs/Test/Ganeti/HTools/Backend/Text.hs \
+	test/hs/Test/Ganeti/HTools/CLI.hs \
+	test/hs/Test/Ganeti/HTools/Cluster.hs \
+	test/hs/Test/Ganeti/HTools/Container.hs \
+	test/hs/Test/Ganeti/HTools/Graph.hs \
+	test/hs/Test/Ganeti/HTools/Instance.hs \
+	test/hs/Test/Ganeti/HTools/Loader.hs \
+	test/hs/Test/Ganeti/HTools/Node.hs \
+	test/hs/Test/Ganeti/HTools/PeerMap.hs \
+	test/hs/Test/Ganeti/HTools/Types.hs \
+	test/hs/Test/Ganeti/Hypervisor/Xen/XmParser.hs \
+	test/hs/Test/Ganeti/JSON.hs \
+	test/hs/Test/Ganeti/Jobs.hs \
+	test/hs/Test/Ganeti/JQueue.hs \
+	test/hs/Test/Ganeti/Luxi.hs \
+	test/hs/Test/Ganeti/Network.hs \
+	test/hs/Test/Ganeti/Objects.hs \
+	test/hs/Test/Ganeti/OpCodes.hs \
+	test/hs/Test/Ganeti/Query/Filter.hs \
+	test/hs/Test/Ganeti/Query/Language.hs \
+	test/hs/Test/Ganeti/Query/Network.hs \
+	test/hs/Test/Ganeti/Query/Query.hs \
+	test/hs/Test/Ganeti/Rpc.hs \
+	test/hs/Test/Ganeti/Runtime.hs \
+	test/hs/Test/Ganeti/Ssconf.hs \
+	test/hs/Test/Ganeti/THH.hs \
+	test/hs/Test/Ganeti/TestCommon.hs \
+	test/hs/Test/Ganeti/TestHTools.hs \
+	test/hs/Test/Ganeti/TestHelper.hs \
+	test/hs/Test/Ganeti/Types.hs \
+	test/hs/Test/Ganeti/Utils.hs
 
 HS_LIBTEST_SRCS = $(HS_LIB_SRCS) $(HS_TEST_SRCS)
 
 HS_BUILT_SRCS = \
-	htest/Test/Ganeti/TestImports.hs \
+	test/hs/Test/Ganeti/TestImports.hs \
 	src/Ganeti/Constants.hs \
+	src/Ganeti/Curl/Internal.hs \
 	src/Ganeti/Version.hs
-HS_BUILT_SRCS_IN = $(patsubst %,%.in,$(HS_BUILT_SRCS))
+HS_BUILT_SRCS_IN = \
+	$(patsubst %,%.in,$(filter-out src/Ganeti/Curl/Internal.hs,$(HS_BUILT_SRCS))) \
+	src/Ganeti/Curl/Internal.hsc
+
+HS_LIBTESTBUILT_SRCS = $(HS_LIBTEST_SRCS) $(HS_BUILT_SRCS)
 
 $(RUN_IN_TEMPDIR): | stamp-directories
 
+doc/html/index.html: ENABLE_MANPAGES =
+doc/man-html/index.html: ENABLE_MANPAGES = 1
+doc/man-html/index.html: doc/manpages-enabled.rst $(mandocrst)
+
 # Note: we use here an order-only prerequisite, as the contents of
 # _autoconf.py are not actually influencing the html build output: it
 # has to exist in order for the sphinx module to be loaded
 # successfully, but we certainly don't want the docs to be rebuilt if
 # it changes
-doc/html/index.html: $(docrst) $(docpng) doc/conf.py configure.ac \
-	$(RUN_IN_TEMPDIR) lib/build/sphinx_ext.py \
+doc/html/index.html doc/man-html/index.html: $(docinput) doc/conf.py \
+	configure.ac $(RUN_IN_TEMPDIR) lib/build/sphinx_ext.py \
 	lib/build/shell_example_lexer.py lib/opcodes.py lib/ht.py \
+	doc/css/style.css lib/rapi/connector.py lib/rapi/rlib2.py \
 	| $(BUILT_PYTHON_SOURCES)
 	@test -n "$(SPHINX)" || \
 	    { echo 'sphinx-build' not found during configure; exit 1; }
-	@mkdir_p@ $(dir $@)
-	PYTHONPATH=. $(RUN_IN_TEMPDIR) $(SPHINX) -q -W -b html \
+if !MANPAGES_IN_DOC
+	if test -n '$(ENABLE_MANPAGES)'; then \
+	  echo 'Man pages in documentation were disabled at configure time' >&2; \
+	  exit 1; \
+	fi
+endif
+## Sphinx provides little control over what content should be included. Some
+## mechanisms exist, but they all have drawbacks or actual issues. Since we
+## build two different versions of the documentation--once without man pages and
+## once, if enabled, with them--some control is necessary. xmpp-wrapper provides
+## us with this, but requires running in a temporary directory. It moves the
+## correct files into place depending on environment variables.
+	dir=$(dir $@) && \
+	@mkdir_p@ $$dir && \
+	PYTHONPATH=. ENABLE_MANPAGES=$(ENABLE_MANPAGES) COPY_DOC=1 \
+	$(RUN_IN_TEMPDIR) autotools/sphinx-wrapper $(SPHINX) -q -W -b html \
 	    -d . \
 	    -D version="$(VERSION_MAJOR).$(VERSION_MINOR)" \
 	    -D release="$(PACKAGE_VERSION)" \
-	    $(abs_top_srcdir)/doc $(CURDIR)/doc/html
-	rm -f doc/html/.buildinfo doc/html/objects.inv
+	    -D graphviz_dot="$(DOT)" \
+	    -D enable_manpages="$(ENABLE_MANPAGES)" \
+	    doc $(CURDIR)/$$dir && \
+	rm -f $$dir/.buildinfo $$dir/objects.inv
 	touch $@
 
 doc/html: doc/html/index.html
 
+doc/man-html: doc/man-html/index.html
+
 doc/install-quick.rst: INSTALL
 doc/news.rst: NEWS
 doc/upgrade.rst: UPGRADE
@@ -597,12 +697,33 @@ doc/install-quick.rst doc/news.rst doc/upgrade.rst:
 	  cat $<; \
 	} > $@
 
-docdot = \
-	doc/arch-2.0.dot \
-	doc/design-2.1-lock-acquire.dot \
-	doc/design-2.1-lock-release.dot
+doc/manpages-enabled.rst: Makefile | $(built_base_sources)
+	{ echo '.. This file is automatically generated, do not edit!'; \
+	  echo ''; \
+	  echo 'Man pages'; \
+	  echo '========='; \
+	  echo; \
+	  echo '.. toctree::'; \
+	  echo '   :maxdepth: 1'; \
+	  echo; \
+	  for i in $(notdir $(mandocrst)); do \
+	    echo "   $$i"; \
+	  done | LC_ALL=C sort; \
+	} > $@
 
-docpng = $(patsubst %.dot,%.png,$(docdot))
+doc/man-%.rst: man/%.gen Makefile $(REPLACE_VARS_SED) | $(built_base_sources)
+if MANPAGES_IN_DOC
+	{ echo '.. This file is automatically updated at build time from $<.'; \
+	  echo '.. Do not edit.'; \
+	  echo; \
+	  echo "$*"; \
+	  echo '=========================================='; \
+	  tail -n +3 $< | sed -f $(REPLACE_VARS_SED); \
+	} > $@
+else
+	echo 'Man pages in documentation were disabled at configure time' >&2; \
+	exit 1;
+endif
 
 # Things to build but not to install (add it to EXTRA_DIST if it should be
 # distributed)
@@ -613,6 +734,10 @@ noinst_DATA = \
 	doc/examples/bash_completion-debug \
 	$(manhtml)
 
+if MANPAGES_IN_DOC
+noinst_DATA += doc/man-html
+endif
+
 gnt_scripts = \
 	scripts/gnt-backup \
 	scripts/gnt-cluster \
@@ -634,6 +759,7 @@ PYTHON_BOOTSTRAP_SBIN = \
 
 PYTHON_BOOTSTRAP = \
 	$(PYTHON_BOOTSTRAP_SBIN) \
+	tools/burnin \
 	tools/ensure-dirs \
 	tools/node-cleanup \
 	tools/node-daemon-setup \
@@ -658,7 +784,7 @@ qa_scripts = \
 
 bin_SCRIPTS =
 if WANT_HTOOLS
-bin_SCRIPTS += $(filter-out src/hail,$(HS_PROGS))
+bin_SCRIPTS += $(HS_BIN_PROGS)
 install-exec-hook:
 	@mkdir_p@ $(DESTDIR)$(iallocatorsdir)
 # FIXME: this is a hardcoded logic, instead of auto-resolving
@@ -669,8 +795,8 @@ install-exec-hook:
 	done
 endif
 
-$(HS_ALL_PROGS): %: %.hs $(HS_LIBTEST_SRCS) $(HS_BUILT_SRCS) Makefile
-	@if [ "$(notdir $@)" = "test" ] && [ "$(HTOOLS_NODEV)" ]; then \
+$(HS_ALL_PROGS): %: %.hs $(HS_LIBTESTBUILT_SRCS) Makefile
+	@if [ "$(notdir $@)" = "test" ] && [ "$(HS_NODEV)" ]; then \
 	  echo "Error: cannot run unittests without the development" \
 	       " libraries (see devnotes.rst)" 1>&2; \
 	  exit 1; \
@@ -678,22 +804,22 @@ $(HS_ALL_PROGS): %: %.hs $(HS_LIBTEST_SRCS) $(HS_BUILT_SRCS) Makefile
 	@rm -f $(notdir $@).tix
 	$(GHC) --make \
 	  $(HFLAGS) \
-	  $(HTOOLS_NOCURL) $(HTOOLS_PARALLEL3) $(HTOOLS_REGEX_PCRE) \
+	  $(HS_PARALLEL3) $(HS_REGEX_PCRE) \
 	  -osuf $(notdir $@).o -hisuf $(notdir $@).hi \
 	  $(HEXTRA) $(HEXTRA_INT) $@
 	@touch "$@"
 
-# for the htest/test binary, we need to enable profiling/coverage
-htest/test: HEXTRA_INT=-fhpc -ihtest
+# for the test/hs/htest binary, we need to enable profiling/coverage
+test/hs/htest: HEXTRA_INT=-fhpc -itest/hs
 
 # we compile the hpc-htools binary with the program coverage
-htest/hpc-htools: HEXTRA_INT=-fhpc
+test/hs/hpc-htools: HEXTRA_INT=-fhpc
 
 # we compile the hpc-mon-collector binary with the program coverage
-htest/hpc-mon-collector: HEXTRA_INT=-fhpc
+test/hs/hpc-mon-collector: HEXTRA_INT=-fhpc
 
 # test dependency
-htest/offline-tests.sh: htest/hpc-htools htest/hpc-mon-collector
+test/hs/offline-tests.sh: test/hs/hpc-htools test/hs/hpc-mon-collector
 
 # rules for building profiling-enabled versions of the haskell
 # programs: hs-prof does the full two-step build, whereas
@@ -731,8 +857,11 @@ src/ganeti-confd: src/hconfd
 nodist_sbin_SCRIPTS += src/ganeti-confd
 endif
 
+if ENABLE_MOND
+nodist_sbin_SCRIPTS += src/ganeti-mond
+endif
+
 python_scripts = \
-	tools/burnin \
 	tools/cfgshell \
 	tools/cfgupgrade \
 	tools/cfgupgrade12 \
@@ -746,6 +875,7 @@ python_scripts = \
 
 dist_tools_SCRIPTS = \
 	$(python_scripts) \
+	tools/burnin \
 	tools/kvm-console-wrapper \
 	tools/master-ip-setup \
 	tools/xen-console-wrapper
@@ -755,6 +885,7 @@ nodist_tools_python_scripts = \
 
 nodist_tools_SCRIPTS = \
 	$(nodist_tools_python_scripts) \
+	tools/users-setup \
 	tools/vcluster-setup
 
 pkglib_python_scripts = \
@@ -770,7 +901,7 @@ myexeclib_SCRIPTS = \
 	daemons/daemon-util \
 	tools/kvm-ifup \
 	$(pkglib_python_scripts) \
-	src/mon-collector
+	$(HS_MYEXECLIB_PROGS)
 
 nodist_myexeclib_SCRIPTS = \
 	$(nodist_pkglib_python_scripts)
@@ -785,6 +916,7 @@ EXTRA_DIST = \
 	autotools/check-header \
 	autotools/check-imports \
 	autotools/check-man-dashes \
+	autotools/check-man-references \
 	autotools/check-man-warnings \
 	autotools/check-news \
 	autotools/check-python-code \
@@ -792,7 +924,8 @@ EXTRA_DIST = \
 	autotools/check-version \
 	autotools/convert-constants \
 	autotools/docpp \
-	autotools/gen-coverage \
+	autotools/gen-py-coverage \
+	autotools/sphinx-wrapper \
 	autotools/testrunner \
 	autotools/wrong-hardcoded-paths \
 	$(RUN_IN_TEMPDIR) \
@@ -800,12 +933,11 @@ EXTRA_DIST = \
 	daemons/ganeti-cleaner.in \
 	$(pkglib_python_scripts) \
 	devel/upload \
+	devel/webserver \
 	tools/kvm-ifup.in \
+	tools/users-setup.in \
 	tools/vcluster-setup.in \
-	$(docdot) \
-	$(docpng) \
-	$(docrst) \
-	doc/conf.py \
+	$(docinput) \
 	doc/html \
 	$(BUILT_EXAMPLES:%=%.in) \
 	doc/examples/ganeti.default \
@@ -814,9 +946,9 @@ EXTRA_DIST = \
 	doc/examples/gnt-debug/README \
 	doc/examples/gnt-debug/delay0.json \
 	doc/examples/gnt-debug/delay50.json \
-	test/lockperf.py \
-	test/testutils.py \
-	test/mocks.py \
+	test/py/lockperf.py \
+	test/py/testutils.py \
+	test/py/mocks.py \
 	$(dist_TESTS) \
 	$(TEST_FILES) \
 	man/footer.rst \
@@ -827,8 +959,8 @@ EXTRA_DIST = \
 	$(HS_LIBTEST_SRCS) $(HS_BUILT_SRCS_IN) \
 	$(HS_PROG_SRCS) \
 	src/lint-hints.hs \
-	htest/cli-tests-defs.sh \
-	htest/offline-test.sh \
+	test/hs/cli-tests-defs.sh \
+	test/hs/offline-test.sh \
 	.ghci
 
 man_MANS = \
@@ -836,6 +968,7 @@ man_MANS = \
 	man/ganeti-confd.8 \
 	man/ganeti-listrunner.8 \
 	man/ganeti-masterd.8 \
+	man/ganeti-mond.8 \
 	man/ganeti-noded.8 \
 	man/ganeti-os-interface.7 \
 	man/ganeti-extstorage-interface.7 \
@@ -862,52 +995,77 @@ man_MANS = \
 	man/htools.1 \
 	man/mon-collector.7
 
-manrst = $(patsubst %.1,%.rst,$(patsubst %.7,%.rst,$(patsubst %.8,%.rst,$(man_MANS))))
+# Remove extensions from all filenames in man_MANS
+mannoext = $(patsubst %.1,%,$(patsubst %.7,%,$(patsubst %.8,%,$(man_MANS))))
+
+manrst = $(patsubst %,%.rst,$(mannoext))
 manhtml = $(patsubst %.rst,%.html,$(manrst))
 mangen = $(patsubst %.rst,%.gen,$(manrst))
 maninput = \
 	$(patsubst %.1,%.1.in,$(patsubst %.7,%.7.in,$(patsubst %.8,%.8.in,$(man_MANS)))) \
 	$(patsubst %.html,%.html.in,$(manhtml)) \
-	man/footer.man man/footer.html $(mangen)
+	$(mangen)
 
 TEST_FILES = \
-	htest/data/clean-nonzero-score.data \
-	htest/data/common-suffix.data \
-	htest/data/empty-cluster.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/n1-failure.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 \
-	htest/shelltests/htools-mon-collector.test \
+	test/data/htools/clean-nonzero-score.data \
+	test/data/htools/common-suffix.data \
+	test/data/htools/empty-cluster.data \
+	test/data/htools/hail-alloc-drbd.json \
+	test/data/htools/hail-alloc-invalid-twodisks.json \
+	test/data/htools/hail-alloc-twodisks.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-excl-tags.data \
+	test/data/htools/hbal-split-insts.data \
+	test/data/htools/hspace-tiered-dualspec.data \
+	test/data/htools/hspace-tiered.data \
+	test/data/htools/invalid-node.data \
+	test/data/htools/missing-resources.data \
+	test/data/htools/multiple-master.data \
+	test/data/htools/n1-failure.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/htools/unique-reboot-order.data \
+	test/hs/shelltests/htools-balancing.test \
+	test/hs/shelltests/htools-basic.test \
+	test/hs/shelltests/htools-dynutil.test \
+	test/hs/shelltests/htools-excl.test \
+	test/hs/shelltests/htools-hail.test \
+	test/hs/shelltests/htools-hroller.test \
+	test/hs/shelltests/htools-hspace.test \
+	test/hs/shelltests/htools-invalid.test \
+	test/hs/shelltests/htools-multi-group.test \
+	test/hs/shelltests/htools-no-backend.test \
+	test/hs/shelltests/htools-rapi.test \
+	test/hs/shelltests/htools-single-group.test \
+	test/hs/shelltests/htools-text-backend.test \
+	test/hs/shelltests/htools-mon-collector.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/bdev-rbd/json_output_empty.txt \
+	test/data/bdev-rbd/json_output_extra_matches.txt \
+	test/data/bdev-rbd/json_output_no_matches.txt \
+	test/data/bdev-rbd/json_output_ok.txt \
+	test/data/bdev-rbd/plain_output_new_extra_matches.txt \
+	test/data/bdev-rbd/plain_output_new_no_matches.txt \
+	test/data/bdev-rbd/plain_output_new_ok.txt \
+	test/data/bdev-rbd/plain_output_old_empty.txt \
+	test/data/bdev-rbd/plain_output_old_extra_matches.txt \
+	test/data/bdev-rbd/plain_output_old_no_matches.txt \
+	test/data/bdev-rbd/plain_output_old_ok.txt \
+	test/data/bdev-rbd/output_invalid.txt \
 	test/data/cert1.pem \
 	test/data/cert2.pem \
+	test/data/cluster_config_2.7.json \
+	test/data/cluster_config_downgraded_2.7.json \
+	test/data/instance-minor-pairing.txt \
 	test/data/ip-addr-show-dummy0.txt \
 	test/data/ip-addr-show-lo-ipv4.txt \
 	test/data/ip-addr-show-lo-ipv6.txt \
@@ -918,7 +1076,9 @@ TEST_FILES = \
 	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/kvm_0.9.1_help_boot_test.txt \
 	test/data/kvm_1.0_help.txt \
+	test/data/kvm_1.1.2_help.txt \
 	test/data/ovfdata/compr_disk.vmdk.gz \
 	test/data/ovfdata/config.ini \
 	test/data/ovfdata/corrupted_resources.ovf \
@@ -950,115 +1110,123 @@ TEST_FILES = \
 	test/data/proc_drbd83_sync.txt \
 	test/data/proc_drbd83_sync_want.txt \
 	test/data/proc_drbd83_sync_krnl2.6.39.txt \
+	test/data/qa-minimal-nodes-instances-only.json \
 	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/ganeti-cli.test \
-	test/gnt-cli.test \
-	test/import-export_unittest-helper
+	test/data/xen-xm-info-4.0.1.txt \
+	test/data/xen-xm-list-4.0.1-dom0-only.txt \
+	test/data/xen-xm-list-4.0.1-four-instances.txt \
+	test/data/xen-xm-list-long-4.0.1.txt \
+	test/data/xen-xm-uptime-4.0.1.txt \
+	test/py/ganeti-cli.test \
+	test/py/gnt-cli.test \
+	test/py/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-runasroot.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.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.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 \
-	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.rapi.testutils_unittest.py \
-	test/ganeti.rpc_unittest.py \
-	test/ganeti.runtime_unittest.py \
-	test/ganeti.serializer_unittest.py \
-	test/ganeti.server.rapi_unittest.py \
-	test/ganeti.ssconf_unittest.py \
-	test/ganeti.ssh_unittest.py \
-	test/ganeti.storage_unittest.py \
-	test/ganeti.tools.ensure_dirs_unittest.py \
-	test/ganeti.tools.node_daemon_setup_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 \
-	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.vcluster_unittest.py \
-	test/ganeti.workerpool_unittest.py \
-	test/pycurl_reset_unittest.py \
-	test/qa.qa_config_unittest.py \
-	test/tempfile_fork_unittest.py
-
-haskell_tests = htest/test
+	test/py/cfgupgrade_unittest.py \
+	test/py/docs_unittest.py \
+	test/py/ganeti.asyncnotifier_unittest.py \
+	test/py/ganeti.backend_unittest-runasroot.py \
+	test/py/ganeti.backend_unittest.py \
+	test/py/ganeti.bdev_unittest.py \
+	test/py/ganeti.cli_unittest.py \
+	test/py/ganeti.client.gnt_cluster_unittest.py \
+	test/py/ganeti.client.gnt_instance_unittest.py \
+	test/py/ganeti.client.gnt_job_unittest.py \
+	test/py/ganeti.cmdlib_unittest.py \
+	test/py/ganeti.compat_unittest.py \
+	test/py/ganeti.confd.client_unittest.py \
+	test/py/ganeti.config_unittest.py \
+	test/py/ganeti.constants_unittest.py \
+	test/py/ganeti.daemon_unittest.py \
+	test/py/ganeti.errors_unittest.py \
+	test/py/ganeti.hooks_unittest.py \
+	test/py/ganeti.ht_unittest.py \
+	test/py/ganeti.http_unittest.py \
+	test/py/ganeti.hypervisor.hv_chroot_unittest.py \
+	test/py/ganeti.hypervisor.hv_fake_unittest.py \
+	test/py/ganeti.hypervisor.hv_kvm_unittest.py \
+	test/py/ganeti.hypervisor.hv_lxc_unittest.py \
+	test/py/ganeti.hypervisor.hv_xen_unittest.py \
+	test/py/ganeti.hypervisor_unittest.py \
+	test/py/ganeti.impexpd_unittest.py \
+	test/py/ganeti.jqueue_unittest.py \
+	test/py/ganeti.jstore_unittest.py \
+	test/py/ganeti.locking_unittest.py \
+	test/py/ganeti.luxi_unittest.py \
+	test/py/ganeti.masterd.iallocator_unittest.py \
+	test/py/ganeti.masterd.instance_unittest.py \
+	test/py/ganeti.mcpu_unittest.py \
+	test/py/ganeti.netutils_unittest.py \
+	test/py/ganeti.objects_unittest.py \
+	test/py/ganeti.opcodes_unittest.py \
+	test/py/ganeti.outils_unittest.py \
+	test/py/ganeti.ovf_unittest.py \
+	test/py/ganeti.qlang_unittest.py \
+	test/py/ganeti.query_unittest.py \
+	test/py/ganeti.rapi.baserlib_unittest.py \
+	test/py/ganeti.rapi.client_unittest.py \
+	test/py/ganeti.rapi.resources_unittest.py \
+	test/py/ganeti.rapi.rlib2_unittest.py \
+	test/py/ganeti.rapi.testutils_unittest.py \
+	test/py/ganeti.rpc_unittest.py \
+	test/py/ganeti.runtime_unittest.py \
+	test/py/ganeti.serializer_unittest.py \
+	test/py/ganeti.server.rapi_unittest.py \
+	test/py/ganeti.ssconf_unittest.py \
+	test/py/ganeti.ssh_unittest.py \
+	test/py/ganeti.storage_unittest.py \
+	test/py/ganeti.tools.burnin_unittest.py \
+	test/py/ganeti.tools.ensure_dirs_unittest.py \
+	test/py/ganeti.tools.node_daemon_setup_unittest.py \
+	test/py/ganeti.tools.prepare_node_join_unittest.py \
+	test/py/ganeti.uidpool_unittest.py \
+	test/py/ganeti.utils.algo_unittest.py \
+	test/py/ganeti.utils.filelock_unittest.py \
+	test/py/ganeti.utils.hash_unittest.py \
+	test/py/ganeti.utils.io_unittest-runasroot.py \
+	test/py/ganeti.utils.io_unittest.py \
+	test/py/ganeti.utils.log_unittest.py \
+	test/py/ganeti.utils.lvm_unittest.py \
+	test/py/ganeti.utils.mlock_unittest.py \
+	test/py/ganeti.utils.nodesetup_unittest.py \
+	test/py/ganeti.utils.process_unittest.py \
+	test/py/ganeti.utils.retry_unittest.py \
+	test/py/ganeti.utils.text_unittest.py \
+	test/py/ganeti.utils.wrapper_unittest.py \
+	test/py/ganeti.utils.x509_unittest.py \
+	test/py/ganeti.utils_unittest.py \
+	test/py/ganeti.vcluster_unittest.py \
+	test/py/ganeti.workerpool_unittest.py \
+	test/py/pycurl_reset_unittest.py \
+	test/py/qa.qa_config_unittest.py \
+	test/py/tempfile_fork_unittest.py
+
+haskell_tests = test/hs/htest
 
 dist_TESTS = \
-	test/check-cert-expired_unittest.bash \
-	test/daemon-util_unittest.bash \
-	test/ganeti-cleaner_unittest.bash \
-	test/import-export_unittest.bash \
-	test/cli-test.bash \
-	test/bash_completion.bash \
+	test/py/check-cert-expired_unittest.bash \
+	test/py/daemon-util_unittest.bash \
+	test/py/ganeti-cleaner_unittest.bash \
+	test/py/import-export_unittest.bash \
+	test/py/cli-test.bash \
+	test/py/bash_completion.bash \
 	$(python_tests)
 
 nodist_TESTS =
 check_SCRIPTS =
 
-if WANT_HTOOLSTESTS
+if WANT_HSTESTS
 nodist_TESTS += $(haskell_tests)
-dist_TESTS += htest/offline-test.sh
+dist_TESTS += test/hs/offline-test.sh
 check_SCRIPTS += \
-	htest/hpc-htools \
-	htest/hpc-mon-collector \
+	test/hs/hpc-htools \
+	test/hs/hpc-mon-collector \
 	$(HS_BUILT_TEST_HELPERS)
 endif
 
@@ -1084,6 +1252,7 @@ all_python_code = \
 	$(python_tests) \
 	$(pkgpython_PYTHON) \
 	$(client_PYTHON) \
+	$(cmdlib_PYTHON) \
 	$(hypervisor_PYTHON) \
 	$(rapi_PYTHON) \
 	$(server_PYTHON) \
@@ -1099,16 +1268,17 @@ all_python_code = \
 
 srclink_files = \
 	man/footer.rst \
-	test/check-cert-expired_unittest.bash \
-	test/daemon-util_unittest.bash \
-	test/ganeti-cleaner_unittest.bash \
-	test/import-export_unittest.bash \
-	test/cli-test.bash \
-	test/bash_completion.bash \
-	htest/offline-test.sh \
-	htest/cli-tests-defs.sh \
+	test/py/check-cert-expired_unittest.bash \
+	test/py/daemon-util_unittest.bash \
+	test/py/ganeti-cleaner_unittest.bash \
+	test/py/import-export_unittest.bash \
+	test/py/cli-test.bash \
+	test/py/bash_completion.bash \
+	test/hs/offline-test.sh \
+	test/hs/cli-tests-defs.sh \
 	$(all_python_code) \
-	$(HS_LIBTEST_SRCS) $(HS_PROG_SRCS)
+	$(HS_LIBTEST_SRCS) $(HS_PROG_SRCS) \
+	$(docinput)
 
 check_python_code = \
 	$(BUILD_BASH_COMPLETION) \
@@ -1145,16 +1315,20 @@ pep8_python_code = \
 	$(PYTHON_BOOTSTRAP) \
 	qa
 
-test/daemon-util_unittest.bash: daemons/daemon-util
+test/py/daemon-util_unittest.bash: daemons/daemon-util
 
-test/ganeti-cleaner_unittest.bash: daemons/ganeti-cleaner
+test/py/ganeti-cleaner_unittest.bash: daemons/ganeti-cleaner
 
-test/bash_completion.bash: doc/examples/bash_completion-debug
+test/py/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 $@
 
+tools/users-setup: tools/users-setup.in $(REPLACE_VARS_SED)
+	sed -f $(REPLACE_VARS_SED) < $< > $@
+	chmod +x $@
+
 tools/vcluster-setup: tools/vcluster-setup.in $(REPLACE_VARS_SED)
 	sed -f $(REPLACE_VARS_SED) < $< > $@
 	chmod +x $@
@@ -1173,54 +1347,40 @@ doc/examples/bash_completion doc/examples/bash_completion-debug: \
 	$(BUILD_BASH_COMPLETION) $(RUN_IN_TEMPDIR) \
 	lib/cli.py $(gnt_scripts) $(client_PYTHON) tools/burnin \
 	daemons/ganeti-cleaner \
-	$(GENERATED_FILES) $(HTOOLS_GENERATED_FILES)
+	$(GENERATED_FILES) $(HS_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; }
-	$(DOT) -Tpng -o $@ $<
-
-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/%.gen: man/%.rst lib/query.py lib/build/sphinx_ext.py \
 	lib/build/shell_example_lexer.py \
 	| $(RUN_IN_TEMPDIR) $(BUILT_PYTHON_SOURCES)
 	@echo "Checking $< for hardcoded paths..."
 	@if grep -nEf autotools/wrong-hardcoded-paths $<; then \
-	  echo "Man page $< has harcoded paths (see above)!" 1>&2 ; \
+	  echo "Man page $< has hardcoded paths (see above)!" 1>&2 ; \
 	  exit 1; \
 	fi
 	set -e ; \
 	trap 'echo auto-removing $@; rm $@' EXIT; \
 	PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(DOCPP) < $< > $@ ;\
+	$(CHECK_MAN_REFERENCES) $@; \
 	trap - EXIT
 
-man/%.7.in man/%.8.in man/%.1.in: man/%.gen man/footer.man
+man/%.7.in man/%.8.in man/%.1.in: man/%.gen man/footer.rst
 	@test -n "$(PANDOC)" || \
 	  { echo 'pandoc' not found during configure; exit 1; }
-	set -o pipefail ; \
+	set -o pipefail -e; \
 	trap 'echo auto-removing $@; rm $@' EXIT; \
-	$(PANDOC) -s -f rst -t man -A man/footer.man $< | \
+	$(PANDOC) -s -f rst -t man $< man/footer.rst | \
 	  sed -e 's/\\@/@/g' > $@; \
 	if test -n "$(MAN_HAS_WARNINGS)"; then $(CHECK_MAN_WARNINGS) $@; fi; \
 	$(CHECK_MAN_DASHES) $@; \
 	trap - EXIT
 
-
-man/%.html.in: man/%.gen man/footer.html
+man/%.html.in: man/%.gen man/footer.rst
 	@test -n "$(PANDOC)" || \
 	  { echo 'pandoc' not found during configure; exit 1; }
 	set -o pipefail ; \
-	$(PANDOC) -s -f rst -t html -A man/footer.html $< | \
+	$(PANDOC) --toc -s -f rst -t html $< man/footer.rst | \
 	  sed -e 's/\\@/@/g' > $@
 
 man/%: man/%.in  $(REPLACE_VARS_SED)
@@ -1260,7 +1420,7 @@ src/Ganeti/Version.hs: src/Ganeti/Version.hs.in \
 
 src/Ganeti/Constants.hs: src/Ganeti/Constants.hs.in \
 	lib/constants.py lib/_autoconf.py lib/luxi.py lib/errors.py \
-	lib/jstore.py $(RUN_IN_TEMPDIR)\
+	lib/jstore.py $(RUN_IN_TEMPDIR) \
 	$(CONVERT_CONSTANTS) $(built_base_sources) \
 	| lib/_vcsversion.py
 	set -e; \
@@ -1268,7 +1428,10 @@ src/Ganeti/Constants.hs: src/Ganeti/Constants.hs.in \
 	  PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(CONVERT_CONSTANTS); \
 	} > $@
 
-htest/Test/Ganeti/TestImports.hs: htest/Test/Ganeti/TestImports.hs.in \
+src/Ganeti/Curl/Internal.hs: src/Ganeti/Curl/Internal.hsc | stamp-directories
+	hsc2hs -o $@ $<
+
+test/hs/Test/Ganeti/TestImports.hs: test/hs/Test/Ganeti/TestImports.hs.in \
 	$(built_base_sources)
 	set -e; \
 	{ cat $< ; \
@@ -1310,6 +1473,7 @@ lib/_autoconf.py: Makefile | stamp-directories
 	  echo "OS_SEARCH_PATH = [$(OS_SEARCH_PATH)]"; \
 	  echo "ES_SEARCH_PATH = [$(ES_SEARCH_PATH)]"; \
 	  echo "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \
+	  echo "XEN_CONFIG_DIR = '$(XEN_CONFIG_DIR)'"; \
 	  echo "XEN_KERNEL = '$(XEN_KERNEL)'"; \
 	  echo "XEN_INITRD = '$(XEN_INITRD)'"; \
 	  echo "KVM_KERNEL = '$(KVM_KERNEL)'"; \
@@ -1341,6 +1505,8 @@ lib/_autoconf.py: Makefile | stamp-directories
 	  echo "CONFD_GROUP = '$(CONFD_GROUP)'"; \
 	  echo "NODED_USER = '$(NODED_USER)'"; \
 	  echo "NODED_GROUP = '$(NODED_GROUP)'"; \
+	  echo "MOND_USER = '$(MOND_USER)'"; \
+	  echo "MOND_GROUP = '$(MOND_GROUP)'"; \
 	  echo "DISK_SEPARATOR = '$(DISK_SEPARATOR)'"; \
 	  echo "QEMUIMG_PATH = '$(QEMUIMG_PATH)'"; \
 	  echo "HTOOLS = True"; \
@@ -1348,7 +1514,14 @@ lib/_autoconf.py: Makefile | stamp-directories
 	  echo "XEN_CMD = '$(XEN_CMD)'"; \
 	  echo "ENABLE_SPLIT_QUERY = $(ENABLE_SPLIT_QUERY)"; \
 	  echo "ENABLE_RESTRICTED_COMMANDS = $(ENABLE_RESTRICTED_COMMANDS)"; \
-	  echo "ENABLE_MONITORING = $(ENABLE_MONITORING)"; \
+	  echo "ENABLE_MOND = $(ENABLE_MOND)"; \
+## Write dictionary with man page name as the key and the section number as the
+## value
+	  echo "MAN_PAGES = {"; \
+	  for i in $(notdir $(man_MANS)); do \
+	    echo "$$i" | sed -re 's/^(.*)\.([0-9]+)$$/  "\1": \2,/g'; \
+	  done; \
+	  echo "}"; \
 	} > $@
 
 lib/_vcsversion.py: Makefile vcs-version | stamp-directories
@@ -1388,35 +1561,41 @@ $(SHELL_ENV_INIT): Makefile stamp-directories
 	  echo 'readonly CONF_DIR="$$SYSCONFDIR/ganeti"'; \
 	} > $@
 
+## Writes sed script to replace placeholders with build-time values. The
+## additional quotes after the first @ sign are necessary to stop configure
+## from replacing those values as well.
 $(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'; \
-	  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'; \
-	  echo 's#@GNTMASTERUSER@#$(MASTERD_USER)#g'; \
-	  echo 's#@GNTRAPIUSER@#$(RAPI_USER)#g'; \
-	  echo 's#@GNTCONFDUSER@#$(CONFD_USER)#g'; \
-	  echo 's#@GNTNODEDUSER@#$(NODED_USER)#g'; \
-	  echo 's#@GNTRAPIGROUP@#$(RAPI_GROUP)#g'; \
-	  echo 's#@GNTADMINGROUP@#$(ADMIN_GROUP)#g'; \
-	  echo 's#@GNTCONFDGROUP@#$(CONFD_GROUP)#g'; \
-	  echo 's#@GNTMASTERDGROUP@#$(MASTERD_GROUP)#g'; \
-	  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 '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'; \
+	  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'; \
+	  echo 's#@''GNTMASTERUSER@#$(MASTERD_USER)#g'; \
+	  echo 's#@''GNTRAPIUSER@#$(RAPI_USER)#g'; \
+	  echo 's#@''GNTCONFDUSER@#$(CONFD_USER)#g'; \
+	  echo 's#@''GNTNODEDUSER@#$(NODED_USER)#g'; \
+	  echo 's#@''GNTMONDUSER@#$(MOND_USER)#g'; \
+	  echo 's#@''GNTRAPIGROUP@#$(RAPI_GROUP)#g'; \
+	  echo 's#@''GNTADMINGROUP@#$(ADMIN_GROUP)#g'; \
+	  echo 's#@''GNTCONFDGROUP@#$(CONFD_GROUP)#g'; \
+	  echo 's#@''GNTMASTERDGROUP@#$(MASTERD_GROUP)#g'; \
+	  echo 's#@''GNTMONDGROUP@#$(MOND_GROUP)#g'; \
+	  echo 's#@''GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \
+	  echo 's#@''CUSTOM_ENABLE_CONFD@#$(ENABLE_CONFD)#g'; \
+	  echo 's#@''CUSTOM_ENABLE_MOND@#$(ENABLE_MOND)#g'; \
+	  echo 's#@''MODULES@#$(strip $(lint_python_code))#g'; \
+	  echo 's#@''XEN_CONFIG_DIR@#$(XEN_CONFIG_DIR)#g'; \
 	  echo; \
 	  echo '/^@SHELL_ENV_INIT@$$/ {'; \
 	  echo '  r $(SHELL_ENV_INIT)'; \
@@ -1428,11 +1607,12 @@ $(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories
 daemons/ganeti-%: MODULE = ganeti.server.$(patsubst ganeti-%,%,$(notdir $@))
 daemons/ganeti-watcher: MODULE = ganeti.watcher
 scripts/%: MODULE = ganeti.client.$(subst -,_,$(notdir $@))
+tools/burnin: MODULE = ganeti.tools.burnin
 tools/ensure-dirs: MODULE = ganeti.tools.ensure_dirs
 tools/node-daemon-setup: MODULE = ganeti.tools.node_daemon_setup
 tools/prepare-node-join: MODULE = ganeti.tools.prepare_node_join
 tools/node-cleanup: MODULE = ganeti.tools.node_cleanup
-$(HS_BUILT_TEST_HELPERS): TESTROLE = $(patsubst htest/%,%,$@)
+$(HS_BUILT_TEST_HELPERS): TESTROLE = $(patsubst test/hs/%,%,$@)
 
 $(PYTHON_BOOTSTRAP): Makefile | stamp-directories
 	test -n "$(MODULE)" || { echo Missing module; exit 1; }
@@ -1468,7 +1648,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 ./htest/hpc-htools \"\$$@\""; \
+	  echo "HTOOLS=$(TESTROLE) exec ./test/hs/hpc-htools \"\$$@\""; \
 	} > $@
 	chmod u+x $@
 
@@ -1517,7 +1697,7 @@ check-local: check-dirs $(GENERATED_FILES)
 	$(CHECK_PYTHON_CODE) $(check_python_code)
 	PYTHONPATH=. $(CHECK_HEADER) $(check_python_code)
 	$(CHECK_VERSION) $(VERSION) $(top_srcdir)/NEWS
-	$(CHECK_NEWS) < $(top_srcdir)/NEWS
+	RELEASE=$(PACKAGE_VERSION) $(CHECK_NEWS) < $(top_srcdir)/NEWS
 	PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(CHECK_IMPORTS) . $(standalone_python_modules)
 	@expver=$(VERSION_MAJOR).$(VERSION_MINOR); \
 	error= ; \
@@ -1550,11 +1730,18 @@ check-local: check-dirs $(GENERATED_FILES)
 	done; \
 	test -z "$$error"
 
+.PHONY: hs-tests
+hs-tests: test/hs/htest | $(BUILT_PYTHON_SOURCES)
+	@rm -f htest.tix
+	./test/hs/htest
+
+.PHONY: hs-shell
+hs-shell: test/hs/hpc-htools test/hs/hpc-mon-collector $(HS_BUILT_TEST_HELPERS)
+	@rm -f hpc-htools.tix hpc-mon-collector.tix
+	HBINARY="./test/hs/hpc-htools" ./test/hs/offline-test.sh
+
 .PHONY: hs-check
-hs-check: htest/test htest/hpc-htools htest/hpc-mon-collector $(HS_BUILT_TEST_HELPERS)
-	@rm -f *.tix
-	./htest/test
-	HBINARY="./htest/hpc-htools" ./htest/offline-test.sh
+hs-check: hs-tests hs-shell
 
 # E111: indentation is not a multiple of four
 # E121: continuation line indentation is not a multiple of four
@@ -1604,10 +1791,11 @@ pep8: $(GENERATED_FILES)
 	  --repeat $(pep8_python_code)
 
 # FIXME: remove ignore "Use void" when GHC 6.x is deprecated
-HLINT_EXCLUDES = src/Ganeti/THH.hs htest/hpc-htools.hs
+HLINT_EXCLUDES = src/Ganeti/THH.hs test/hs/hpc-htools.hs
 .PHONY: hlint
 hlint: $(HS_BUILT_SRCS) src/lint-hints.hs
 	@test -n "$(HLINT)" || { echo 'hlint' not found during configure; exit 1; }
+	@rm -f doc/hs-lint.html
 	if tty -s; then C="-c"; else C=""; fi; \
 	$(HLINT) --utf8 --report=doc/hs-lint.html --cross $$C \
 	  --ignore "Use first" \
@@ -1616,6 +1804,9 @@ hlint: $(HS_BUILT_SRCS) src/lint-hints.hs
 	  --ignore "Reduce duplication" \
 	  --hint src/lint-hints \
 	  $(filter-out $(HLINT_EXCLUDES),$(HS_LIBTEST_SRCS) $(HS_PROG_SRCS))
+	@if [ ! -f doc/hs-lint.html ]; then \
+	  echo "All good" > doc/hs-lint.html; \
+	fi
 
 # a dist hook rule for updating the vcs-version file; this is
 # hardcoded due to where it needs to build the file...
@@ -1647,14 +1838,12 @@ distcheck-hook:
 	  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; \
-	   exit 1; \
+	if test -e $(top_distdir)/doc/man-html; then \
+	  echo "Found documentation including man pages in final archive" >&2; \
+	  exit 1; \
 	fi
 
-# When building a release, stricter checks should be used
-distcheck-release dist-release: export BUILD_RELEASE = 1
+# Backwards compatible distcheck-release target
 distcheck-release: distcheck
 
 distrebuildcheck: dist
@@ -1684,7 +1873,7 @@ install-exec-local:
 	  "$(DESTDIR)${localstatedir}/run/ganeti"
 
 .PHONY: apidoc
-if WANT_HTOOLSAPIDOC
+if WANT_HSAPIDOC
 apidoc: py-apidoc hs-apidoc
 else
 apidoc: py-apidoc
@@ -1698,7 +1887,9 @@ py-apidoc: epydoc.conf $(RUN_IN_TEMPDIR) $(GENERATED_FILES)
 	  --output $(CURDIR)/$(APIDOC_PY_DIR)
 
 .PHONY: hs-apidoc
-hs-apidoc: $(HS_BUILT_SRCS)
+hs-apidoc: $(APIDOC_HS_DIR)/index.html
+
+$(APIDOC_HS_DIR)/index.html: $(HS_LIBTESTBUILT_SRCS) Makefile
 	@test -n "$(HSCOLOUR)" || \
 	    { echo 'HsColour' not found during configure; exit 1; }
 	@test -n "$(HADDOCK)" || \
@@ -1706,40 +1897,36 @@ hs-apidoc: $(HS_BUILT_SRCS)
 	rm -rf $(APIDOC_HS_DIR)/*
 	for i in $(ALL_APIDOC_HS_DIRS); do \
 	  @mkdir_p@ $$i; \
+	  $(HSCOLOUR) -print-css > $$i/hscolour.css; \
 	done
-	$(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
 	set -e ; \
-	cd src; \
-	if [ "$(HTOOLS_NOCURL)" ]; \
-	then OPTGHC="--optghc=$(HTOOLS_NOCURL)"; \
-	else OPTGHC=""; \
+	export LC_ALL=en_US.UTF-8; \
+	OPTGHC="--optghc=-isrc --optghc=-itest/hs"; \
+	if [ "$(HS_PARALLEL3)" ]; \
+	then OPTGHC="$$OPTGHC --optghc=$(HS_PARALLEL3)"; \
 	fi; \
-	if [ "$(HTOOLS_PARALLEL3)" ]; \
-	then OPTGHC="$$OPTGHC --optghc=$(HTOOLS_PARALLEL3)"; \
+	if [ "$(HS_REGEX_PCRE)" ]; \
+	then OPTGHC="$$OPTGHC --optghc=$(HS_REGEX_PCRE)"; \
 	fi; \
-	if [ "$(HTOOLS_REGEX_PCRE)" ]; \
-	then OPTGHC="$$OPTGHC --optghc=$(HTOOLS_REGEX_PCRE)"; \
-	fi; \
-	RELSRCS="$(HS_LIB_SRCS:src/%=%) $(patsubst src/%,%,$(filter src/%,$(HS_BUILT_SRCS)))"; \
-	for file in $$RELSRCS; do \
-	  hfile=`echo $$file|sed 's/\\.hs$$//'`.html; \
-	  $(HSCOLOUR) -css -anchor $$file > ../$(APIDOC_HS_DIR)/$$hfile ; \
+	for file in $(HS_LIBTESTBUILT_SRCS); do \
+	  f_nosrc=$${file##src/}; \
+	  f_notst=$${f_nosrc##test/hs/}; \
+	  f_html=$${f_notst%%.hs}.html; \
+	  $(HSCOLOUR) -css -anchor $$file > $(APIDOC_HS_DIR)/$$f_html ; \
 	done ; \
-	$(HADDOCK) --odir ../$(APIDOC_HS_DIR) --html --ignore-all-exports -w \
-	  -t ganeti -p haddock-prologue \
+	$(HADDOCK) --odir $(APIDOC_HS_DIR) --html --ignore-all-exports -w \
+	  -t ganeti -p src/haddock-prologue \
 	  --source-module="%{MODULE/.//}.html" \
 	  --source-entity="%{MODULE/.//}.html#%{NAME}" \
 	  $$OPTGHC \
-	  $(filter-out Ganeti/HTools/ExtLoader.hs,$(HS_LIB_SRCS:src/%=%))
+	  $(HS_LIBTESTBUILT_SRCS)
 
 .PHONY: TAGS
 TAGS: $(GENERATED_FILES)
 	rm -f TAGS
 	$(GHC) -e ":etags" -v0 \
 	  $(filter-out -O -Werror,$(HFLAGS)) \
-	  $(HTOOLS_NOCURL) $(HTOOLS_PARALLEL3) $(HTOOLS_REGEX_PCRE) \
+	  $(HS_PARALLEL3) $(HS_REGEX_PCRE) \
 	  $(HS_LIBTEST_SRCS)
 	find . -path './lib/*.py' -o -path './scripts/gnt-*' -o \
 	  -path './daemons/ganeti-*' -o -path './tools/*' -o \
@@ -1762,18 +1949,19 @@ py-coverage: $(GENERATED_FILES) $(python_tests)
 	COVERAGE_FILE=$(CURDIR)/$(COVERAGE_PY_DIR)/data \
 	TEXT_COVERAGE=$(CURDIR)/$(COVERAGE_PY_DIR)/report.txt \
 	HTML_COVERAGE=$(CURDIR)/$(COVERAGE_PY_DIR) \
-	$(PLAIN_TESTS_ENVIRONMENT) $(abs_top_srcdir)/autotools/gen-coverage \
+	$(PLAIN_TESTS_ENVIRONMENT) \
+	$(abs_top_srcdir)/autotools/gen-py-coverage \
 	$(python_tests)
 
 .PHONY: hs-coverage
-hs-coverage: $(haskell_tests) htest/hpc-htools htest/hpc-mon-collector
+hs-coverage: $(haskell_tests) test/hs/hpc-htools test/hs/hpc-mon-collector
 	rm -f *.tix
 	$(MAKE) $(AM_MAKEFLAGS) hs-check
 	@mkdir_p@ $(COVERAGE_HS_DIR)
 	hpc sum --union $(HPCEXCL) \
-	  test.tix hpc-htools.tix hpc-mon-collector.tix > coverage-htools.tix
-	hpc markup --destdir=$(COVERAGE_HS_DIR) coverage-htools.tix
-	hpc report coverage-htools.tix
+	  htest.tix hpc-htools.tix hpc-mon-collector.tix > coverage-hs.tix
+	hpc markup --destdir=$(COVERAGE_HS_DIR) coverage-hs.tix
+	hpc report coverage-hs.tix
 	$(LN_S) -f hpc_index.html $(COVERAGE_HS_DIR)/index.html
 
 # Special "kind-of-QA" target for htools, needs special setup (all
@@ -1802,6 +1990,10 @@ gitignore-check:
 	  exit 1; \
 	fi
 
+# target to rebuild all man pages (both groff and html output)
+.PHONY: man
+man: $(man_MANS) $(manhtml)
+
 # Target that builds all binaries (including those that are not
 # rebuilt except when running the tests)
 .PHONY: really-all