Locking related fixes for networks
[ganeti-local] / Makefile.am
index d477a44..24f6f22 100644 (file)
@@ -57,15 +57,21 @@ myexeclibdir = $(pkglibdir)
 HTOOLS_DIRS = \
        htools \
        htools/Ganeti \
+       htools/Ganeti/Block \
+       htools/Ganeti/Block/Drbd \
        htools/Ganeti/Confd \
        htools/Ganeti/HTools \
+       htools/Ganeti/HTools/Backend \
        htools/Ganeti/HTools/Program \
        htools/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
 
 DIRS = \
@@ -101,15 +107,21 @@ DIRS = \
        test/data/ovfdata/other \
        tools
 
-BUILDTIME_DIR_AUTOCREATE = \
-       scripts \
-       $(APIDOC_DIR) \
+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/HTools \
+       $(APIDOC_HS_DIR)/Ganeti/HTools/Backend \
        $(APIDOC_HS_DIR)/Ganeti/HTools/Program \
-       $(APIDOC_HS_DIR)/Ganeti/Query \
+       $(APIDOC_HS_DIR)/Ganeti/Query
+
+BUILDTIME_DIR_AUTOCREATE = \
+       scripts \
+       $(APIDOC_DIR) \
+       $(ALL_APIDOC_HS_DIRS) \
        $(APIDOC_PY_DIR) \
        $(COVERAGE_DIR) \
        $(COVERAGE_HS_DIR) \
@@ -123,7 +135,8 @@ BUILDTIME_DIRS = \
 DIRCHECK_EXCLUDE = \
        $(BUILDTIME_DIRS) \
        ganeti-[0-9]*.[0-9]*.[0-9]* \
-       doc/html/_*
+       doc/html/_* \
+       autom4te.cache
 
 # some helper vars
 COVERAGE_DIR = doc/coverage
@@ -154,7 +167,6 @@ CLEANFILES = \
        $(SHELL_ENV_INIT) \
        daemons/daemon-util \
        daemons/ganeti-cleaner \
-       devel/upload \
        $(BUILT_EXAMPLES) \
        doc/examples/bash_completion \
        doc/examples/bash_completion-debug \
@@ -206,6 +218,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
 
@@ -253,6 +267,7 @@ pkgpython_PYTHON = \
        lib/storage.py \
        lib/uidpool.py \
        lib/vcluster.py \
+       lib/network.py \
        lib/workerpool.py
 
 client_PYTHON = \
@@ -264,6 +279,7 @@ client_PYTHON = \
        lib/client/gnt_instance.py \
        lib/client/gnt_job.py \
        lib/client/gnt_node.py \
+       lib/client/gnt_network.py \
        lib/client/gnt_os.py
 
 hypervisor_PYTHON = \
@@ -356,16 +372,16 @@ docrst = \
        doc/design-linuxha.rst \
        doc/design-multi-reloc.rst \
        doc/design-network.rst \
-       doc/design-node-state-cache.rst \
+       doc/design-node-add.rst \
        doc/design-oob.rst \
        doc/design-ovf-support.rst \
+       doc/design-opportunistic-locking.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/design-shared-storage.rst \
-       doc/design-ssh-setup.rst \
        doc/design-monitoring-agent.rst \
        doc/design-virtual-clusters.rst \
        doc/design-x509-ca.rst \
@@ -400,7 +416,12 @@ HS_ALL_PROGS = \
 HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS))
 HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=htest/%) htest/hail
 
-HFLAGS = -O -Wall -Werror -fwarn-monomorphism-restriction -fwarn-tabs -ihtools
+HFLAGS = \
+       -O -Wall -Werror -ihtools \
+       -fwarn-monomorphism-restriction \
+       -fwarn-tabs \
+       $(GHC_BYVERSION_FLAGS)
+
 # extra flags that can be overriden on the command line (e.g. -Wwarn, etc.)
 HEXTRA =
 # internal extra flags (used for htest/test mainly)
@@ -411,6 +432,7 @@ HPCEXCL = --exclude Main \
        --exclude Ganeti.HTools.QC \
        --exclude Ganeti.THH \
        --exclude Ganeti.Version \
+       --exclude Test.Ganeti.Attoparsec \
        --exclude Test.Ganeti.TestCommon \
        --exclude Test.Ganeti.TestHTools \
        --exclude Test.Ganeti.TestHelper \
@@ -418,24 +440,30 @@ HPCEXCL = --exclude Main \
        $(patsubst htools.%,--exclude Test.%,$(subst /,.,$(patsubst %.hs,%, $(HS_LIB_SRCS))))
 
 HS_LIB_SRCS = \
+       htools/Ganeti/Block/Drbd/Types.hs \
+       htools/Ganeti/Block/Drbd/Parser.hs \
        htools/Ganeti/BasicTypes.hs \
        htools/Ganeti/Common.hs \
        htools/Ganeti/Compat.hs \
-       htools/Ganeti/Confd.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/Container.hs \
        htools/Ganeti/HTools/ExtLoader.hs \
+       htools/Ganeti/HTools/Graph.hs \
        htools/Ganeti/HTools/Group.hs \
-       htools/Ganeti/HTools/IAlloc.hs \
        htools/Ganeti/HTools/Instance.hs \
        htools/Ganeti/HTools/Loader.hs \
-       htools/Ganeti/HTools/Luxi.hs \
        htools/Ganeti/HTools/Node.hs \
        htools/Ganeti/HTools/PeerMap.hs \
        htools/Ganeti/HTools/Program.hs \
@@ -445,9 +473,6 @@ HS_LIB_SRCS = \
        htools/Ganeti/HTools/Program/Hinfo.hs \
        htools/Ganeti/HTools/Program/Hscan.hs \
        htools/Ganeti/HTools/Program/Hspace.hs \
-       htools/Ganeti/HTools/Rapi.hs \
-       htools/Ganeti/HTools/Simu.hs \
-       htools/Ganeti/HTools/Text.hs \
        htools/Ganeti/HTools/Types.hs \
        htools/Ganeti/Hash.hs \
        htools/Ganeti/JSON.hs \
@@ -456,6 +481,7 @@ HS_LIB_SRCS = \
        htools/Ganeti/Luxi.hs \
        htools/Ganeti/Objects.hs \
        htools/Ganeti/OpCodes.hs \
+       htools/Ganeti/OpParams.hs \
        htools/Ganeti/Path.hs \
        htools/Ganeti/Query/Common.hs \
        htools/Ganeti/Query/Filter.hs \
@@ -469,23 +495,28 @@ HS_LIB_SRCS = \
        htools/Ganeti/Runtime.hs \
        htools/Ganeti/Ssconf.hs \
        htools/Ganeti/THH.hs \
+       htools/Ganeti/Types.hs \
        htools/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/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/Simu.hs \
-       htest/Test/Ganeti/HTools/Text.hs \
        htest/Test/Ganeti/HTools/Types.hs \
        htest/Test/Ganeti/JSON.hs \
        htest/Test/Ganeti/Jobs.hs \
@@ -497,9 +528,11 @@ HS_TEST_SRCS = \
        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
 
 HS_LIBTEST_SRCS = $(HS_LIB_SRCS) $(HS_TEST_SRCS)
@@ -556,7 +589,6 @@ 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 \
@@ -570,6 +602,7 @@ gnt_scripts = \
        scripts/gnt-group \
        scripts/gnt-instance \
        scripts/gnt-job \
+       scripts/gnt-network \
        scripts/gnt-node \
        scripts/gnt-os
 
@@ -609,10 +642,9 @@ install-exec-hook:
        @mkdir_p@ $(DESTDIR)$(iallocatorsdir)
 # FIXME: this is a hardcoded logic, instead of auto-resolving
        $(LN_S) -f ../../../bin/htools \
-                  $(DESTDIR)$(iallocatorsdir)/hail
+         $(DESTDIR)$(iallocatorsdir)/hail
        for role in $(HS_BIN_ROLES); do \
-               $(LN_S) -f htools \
-                          $(DESTDIR)$(bindir)/$$role ; \
+         $(LN_S) -f htools $(DESTDIR)$(bindir)/$$role ; \
        done
 endif
 
@@ -646,12 +678,12 @@ htest/offline-tests.sh: htest/hpc-htools
 .PHONY: hs-prof hs-prof-quick
 hs-prof:
        $(MAKE) $(AM_MAKEFLAGS) clean
-       $(MAKE) $(AM_MAKEFLAGS) $(HS_ALL_PROGS) HEXTRA="-osuf .o"
+       $(MAKE) $(AM_MAKEFLAGS) $(HS_ALL_PROGS) HEXTRA="-osuf o"
        rm -f $(HS_ALL_PROGS)
        $(MAKE) $(AM_MAKEFLAGS) hs-prof-quick
 
 hs-prof-quick:
-       $(MAKE) $(AM_MAKEFLAGS) $(HS_ALL_PROGS) HEXTRA="-osuf .prof_o -prof -auto-all"
+       $(MAKE) $(AM_MAKEFLAGS) $(HS_ALL_PROGS) HEXTRA="-osuf prof_o -prof -auto-all"
 
 dist_sbin_SCRIPTS = \
        tools/ganeti-listrunner
@@ -678,14 +710,13 @@ python_scripts = \
        tools/lvmstrap \
        tools/move-instance \
        tools/ovfconverter \
-       tools/sanitize-config \
-       tools/setup-ssh
+       tools/sanitize-config
 
 dist_tools_SCRIPTS = \
        $(python_scripts) \
        tools/kvm-console-wrapper \
        tools/master-ip-setup \
-       tools/xm-console-wrapper
+       tools/xen-console-wrapper
 
 nodist_tools_SCRIPTS = \
        tools/vcluster-setup
@@ -730,7 +761,7 @@ 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) \
@@ -776,6 +807,7 @@ man_MANS = \
        man/gnt-cluster.8 \
        man/gnt-debug.8 \
        man/gnt-group.8 \
+       man/gnt-network.8 \
        man/gnt-instance.8 \
        man/gnt-job.8 \
        man/gnt-node.8 \
@@ -870,6 +902,7 @@ TEST_FILES = \
        test/data/proc_drbd80-emptyline.txt \
        test/data/proc_drbd83.txt \
        test/data/proc_drbd83_sync.txt \
+       test/data/proc_drbd83_sync_want.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 \
@@ -886,6 +919,7 @@ python_tests = \
        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 \
@@ -931,6 +965,8 @@ 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.ssconf_unittest.py \
        test/ganeti.ssh_unittest.py \
        test/ganeti.storage_unittest.py \
        test/ganeti.tools.ensure_dirs_unittest.py \
@@ -1068,10 +1104,6 @@ tools/kvm-ifup: tools/kvm-ifup.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
        chmod +x $@
 
-devel/upload: devel/upload.in $(REPLACE_VARS_SED)
-       sed -f $(REPLACE_VARS_SED) < $< > $@
-       chmod u+x $@
-
 tools/vcluster-setup: tools/vcluster-setup.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
        chmod +x $@
@@ -1159,11 +1191,14 @@ 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/Version.hs: htools/Ganeti/Version.hs.in \
@@ -1257,6 +1292,7 @@ lib/_autoconf.py: Makefile | stamp-directories
          echo "ENABLE_CONFD = $(ENABLE_CONFD)"; \
          echo "XEN_CMD = '$(XEN_CMD)'"; \
          echo "ENABLE_SPLIT_QUERY = $(ENABLE_SPLIT_QUERY)"; \
+         echo "ENABLE_RESTRICTED_COMMANDS = $(ENABLE_RESTRICTED_COMMANDS)"; \
        } > $@
 
 lib/_vcsversion.py: Makefile vcs-version | stamp-directories
@@ -1388,9 +1424,9 @@ stamp-directories: Makefile
 stamp-srclinks: Makefile | stamp-directories
        set -e; \
        for i in $(srclink_files); do \
-               if test ! -f $$i -a -f $(abs_top_srcdir)/$$i; then \
-                       $(LN_S) $(abs_top_srcdir)/$$i $$i; \
-               fi; \
+         if test ! -f $$i -a -f $(abs_top_srcdir)/$$i; then \
+           $(LN_S) $(abs_top_srcdir)/$$i $$i; \
+         fi; \
        done
        touch $@
 
@@ -1401,24 +1437,21 @@ ganeti:
 .PHONY: check-dirs
 check-dirs: $(GENERATED_FILES)
        @set -e; \
-       find . -type d \( \( -name . \) -o \( \
-               -name .git -o \
-               -name autom4te.cache \
-               \) -prune -o -print \) | { \
-               error=; \
-               while read dir; do \
-                       case "$$dir" in \
-                               $(strip $(patsubst %,(./%) ;;,$(DIRCHECK_EXCLUDE) $(DIRS))) \
-                               *) error=1; echo "Directory $$dir not listed in Makefile" >&2 ;; \
-                       esac; \
-               done; \
-               for dir in $(DIRS); do \
-                       if ! test -d "$$dir"; then \
-                               echo "Directory $$dir listed in DIRS does not exist" >&2; \
-                               error=1; \
-                       fi \
-               done; \
-               if test -n "$$error"; then exit 1; else exit 0; fi; \
+       find . -type d \( -name . -o -name .git -prune -o -print \) | { \
+         error=; \
+         while read dir; do \
+           case "$$dir" in \
+             $(strip $(patsubst %,(./%) ;;,$(DIRCHECK_EXCLUDE) $(DIRS))) \
+             *) error=1; echo "Directory $$dir not listed in Makefile" >&2 ;; \
+           esac; \
+         done; \
+         for dir in $(DIRS); do \
+           if ! test -d "$$dir"; then \
+             echo "Directory $$dir listed in DIRS does not exist" >&2; \
+             error=1; \
+           fi \
+         done; \
+         test -z "$$error"; \
        }
 
 .PHONY: check-local
@@ -1430,21 +1463,29 @@ check-local: check-dirs $(GENERATED_FILES)
        PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(CHECK_IMPORTS) . $(standalone_python_modules)
        @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; \
+         echo "Incorrect version in README, expected $$expver"; \
+         exit 1; \
        fi; \
        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; \
+           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; \
        if ! test -f $(top_srcdir)/doc/design-$$expver.rst; then \
-               echo "File $(top_srcdir)/doc/design-$$expver.rst not found"; \
-               exit 1; \
-       fi
+         echo "File $(top_srcdir)/doc/design-$$expver.rst not found"; \
+         exit 1; \
+       fi; \
+       error= ; \
+       for file in configure.ac $(HS_LIBTEST_SRCS) $(HS_PROG_SRCS); do \
+         if test $$(wc --max-line-length < $(top_srcdir)/$$file) -gt 80; then \
+           echo "Longest line in $$file is longer than 80 characters" >&2; \
+           error=1; \
+         fi; \
+       done; \
+       test -z "$$error"
 
 .PHONY: hs-check
 hs-check: htest/test htest/hpc-htools $(HS_BUILT_TEST_HELPERS)
@@ -1497,14 +1538,15 @@ pylint-qa: $(GENERATED_FILES)
 pep8: $(GENERATED_FILES)
        @test -n "$(PEP8)" || { echo 'pep8' not found during configure; exit 1; }
        $(PEP8) --ignore='$(PEP8_IGNORE)' --exclude='$(PEP8_EXCLUDE)' \
-               --repeat $(pep8_python_code)
+         --repeat $(pep8_python_code)
 
 # FIXME: remove ignore "Use void" when GHC 6.x is deprecated
+HLINT_EXCLUDES = htools/Ganeti/THH.hs htest/hpc-htools.hs
 .PHONY: hlint
 hlint: $(HS_BUILT_SRCS) htools/lint-hints.hs
        @test -n "$(HLINT)" || { echo 'hlint' not found during configure; exit 1; }
        if tty -s; then C="-c"; else C=""; fi; \
-       $(HLINT) --report=doc/hs-lint.html --cross $$C \
+       $(HLINT) --utf8 --report=doc/hs-lint.html --cross $$C \
          --ignore "Use first" \
          --ignore "Use comparing" \
          --ignore "Use on" \
@@ -1512,7 +1554,7 @@ hlint: $(HS_BUILT_SRCS) htools/lint-hints.hs
          --ignore "Use &&&" \
          --ignore "Use void" \
          --hint htools/lint-hints \
-         $(filter-out htools/Ganeti/THH.hs,$(HS_LIBTEST_SRCS) $(HS_PROG_SRCS))
+         $(filter-out $(HLINT_EXCLUDES),$(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...
@@ -1524,30 +1566,30 @@ dist-hook:
 # a distcheck hook rule for catching revision control directories
 distcheck-hook:
        if find $(top_distdir) -name .svn -or -name .git | grep .; then \
-               echo "Found revision control files in final archive." 1>&2; \
-               exit 1; \
+         echo "Found revision control files in final archive." 1>&2; \
+         exit 1; \
        fi
        if find $(top_distdir) -name '*.py[co]' | grep .; then \
-               echo "Found Python byte code in final archive." 1>&2; \
-               exit 1; \
+         echo "Found Python byte code in final archive." 1>&2; \
+         exit 1; \
        fi
        if find $(top_distdir) -name '*~' | grep .; then \
-               echo "Found backup files in final archive." 1>&2; \
-               exit 1; \
+         echo "Found backup files in final archive." 1>&2; \
+         exit 1; \
        fi
 # Empty files or directories should not be distributed. They can cause
 # unnecessary warnings for packagers. Directories used by automake during
 # distcheck must be excluded.
        if find $(top_distdir) -empty -and -not \( \
-                       -path $(top_distdir)/_build -or \
-                       -path $(top_distdir)/_inst \) | grep .; then \
-               echo "Found empty files or directories in final archive." 1>&2; \
-               exit 1; \
+           -path $(top_distdir)/_build -or \
+           -path $(top_distdir)/_inst \) | grep .; then \
+         echo "Found empty files or directories in final archive." 1>&2; \
+         exit 1; \
        fi
        if test -n "$(BUILD_RELEASE)" && \
           grep -n -H -E '^\*.*unreleased' $(top_distdir)/NEWS; then \
-               echo "Found unreleased version in NEWS." >&2; \
-               exit 1; \
+          echo "Found unreleased version in NEWS." >&2; \
+          exit 1; \
        fi
 
 # When building a release, stricter checks should be used
@@ -1570,9 +1612,9 @@ distrebuildcheck: dist
 dist-release: dist
        set -e; \
        for i in $(DIST_ARCHIVES); do \
-               echo -n "Checking $$i ... "; \
-               autotools/check-tar < $$i; \
-               echo OK; \
+         echo -n "Checking $$i ... "; \
+         autotools/check-tar < $$i; \
+         echo OK; \
        done
 
 install-exec-local:
@@ -1589,9 +1631,10 @@ endif
 
 .PHONY: py-apidoc
 py-apidoc: epydoc.conf $(RUN_IN_TEMPDIR) $(GENERATED_FILES)
+       env - PATH="$$PATH" PYTHONPATH="$$PYTHONPATH" \
        $(RUN_IN_TEMPDIR) epydoc -v \
-               --conf $(CURDIR)/epydoc.conf \
-               --output $(CURDIR)/$(APIDOC_PY_DIR)
+         --conf $(CURDIR)/epydoc.conf \
+         --output $(CURDIR)/$(APIDOC_PY_DIR)
 
 .PHONY: hs-apidoc
 hs-apidoc: $(HS_BUILT_SRCS)
@@ -1600,9 +1643,9 @@ 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/Program
-       @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/Confd
-       @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/Query
+       for i in $(ALL_APIDOC_HS_DIRS); do \
+         @mkdir_p@ $$i; \
+       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
@@ -1620,15 +1663,15 @@ hs-apidoc: $(HS_BUILT_SRCS)
        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 ; \
+         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 -p haddock-prologue \
-               --source-module="%{MODULE/.//}.html" \
-               --source-entity="%{MODULE/.//}.html#%{NAME}" \
-               $$OPTGHC \
-               $(filter-out Ganeti/HTools/ExtLoader.hs,$(HS_LIB_SRCS:htools/%=%))
+         -t ganeti -p haddock-prologue \
+         --source-module="%{MODULE/.//}.html" \
+         --source-entity="%{MODULE/.//}.html#%{NAME}" \
+         $$OPTGHC \
+         $(filter-out Ganeti/HTools/ExtLoader.hs,$(HS_LIB_SRCS:htools/%=%))
 
 .PHONY: TAGS
 TAGS: $(GENERATED_FILES)
@@ -1685,7 +1728,7 @@ live-test: all
          --output=live-test.tix ; \
        @mkdir_p@ ../$(COVERAGE_HS_DIR) ; \
        hpc markup --destdir=../$(COVERAGE_HS_DIR) live-test \
-               --srcdir=.. $(HPCEXCL) ; \
+         --srcdir=.. $(HPCEXCL) ; \
        hpc report --srcdir=.. live-test $(HPCEXCL)
 
 commit-check: distcheck lint apidoc
@@ -1701,7 +1744,7 @@ gitignore-check:
 # 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)
+really-all: all $(check_SCRIPTS) $(haskell_tests) $(HS_ALL_PROGS)
 
 # we don't need the ancient implicit rules:
 %: %,v