Add summary field to OpNodeModifyStorage

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6ed02a6..fa88659 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -160,8 +160,8 @@ CLEANFILES = \
        .hpc/*.mix htools/*.tix \
        doc/hs-lint.html
 
        .hpc/*.mix htools/*.tix \
        doc/hs-lint.html
 

-# BUILT_SOURCES should only be used as a dependency on phony targets. Otherwise
-# it'll cause the target to rebuild every time.
+# BUILT_SOURCES should only be used as a dependency on phony
+# targets. Otherwise it'll cause the target to rebuild every time.

 BUILT_SOURCES = \
   $(built_base_sources) \
        $(BUILT_PYTHON_SOURCES) \
 BUILT_SOURCES = \
   $(built_base_sources) \
        $(BUILT_PYTHON_SOURCES) \

@@ -197,7 +197,8 @@ nodist_pkgpython_PYTHON = \
 
 noinst_PYTHON = \
        lib/build/__init__.py \
 
 noinst_PYTHON = \
        lib/build/__init__.py \

-       lib/build/sphinx_ext.py
+       lib/build/sphinx_ext.py \
+       lib/build/shell_example_lexer.py

 
 pkgpython_PYTHON = \
        lib/__init__.py \
 
 pkgpython_PYTHON = \
        lib/__init__.py \

@@ -354,16 +355,15 @@ docrst = \
        doc/upgrade.rst \
        doc/walkthrough.rst
 
        doc/upgrade.rst \
        doc/walkthrough.rst
 

-HS_PROGS = htools/htools htools/hconfd
+HS_PROGS = htools/htools

 HS_BIN_ROLES = hbal hscan hspace hinfo
 
 HS_BIN_ROLES = hbal hscan hspace hinfo
 

-HS_ALL_PROGS = $(HS_PROGS) htools/test htools/hpc-htools
+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_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS))
 HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=test/%) test/hail
 

-# we don't add -Werror by default
-HFLAGS = -O -Wall -fwarn-monomorphism-restriction -fwarn-tabs -ihtools
-# extra flags that can be overriden on the command line
+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)
 HEXTRA_INT =
 HEXTRA =
 # internal extra flags (used for htools/test mainly)
 HEXTRA_INT =

@@ -415,7 +415,8 @@ HS_LIB_SRCS = \
        htools/Ganeti/OpCodes.hs \
        htools/Ganeti/Runtime.hs \
        htools/Ganeti/Ssconf.hs \
        htools/Ganeti/OpCodes.hs \
        htools/Ganeti/Runtime.hs \
        htools/Ganeti/Ssconf.hs \

-       htools/Ganeti/THH.hs
+       htools/Ganeti/THH.hs \
+       htools/Ganeti/Query2.hs

 
 HS_BUILT_SRCS = htools/Ganeti/HTools/Version.hs htools/Ganeti/Constants.hs
 HS_BUILT_SRCS_IN = $(patsubst %,%.in,$(HS_BUILT_SRCS))
 
 HS_BUILT_SRCS = htools/Ganeti/HTools/Version.hs htools/Ganeti/Constants.hs
 HS_BUILT_SRCS_IN = $(patsubst %,%.in,$(HS_BUILT_SRCS))

@@ -428,7 +429,8 @@ $(RUN_IN_TEMPDIR): | $(all_dirfiles)
 # 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 \
 # 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 lib/opcodes.py lib/ht.py \
+       $(RUN_IN_TEMPDIR) lib/build/sphinx_ext.py \
+       lib/build/shell_example_lexer.py lib/opcodes.py lib/ht.py \

        | $(BUILT_PYTHON_SOURCES)
        @test -n "$(SPHINX)" || \
            { echo 'sphinx-build' not found during configure; exit 1; }
        | $(BUILT_PYTHON_SOURCES)
        @test -n "$(SPHINX)" || \
            { echo 'sphinx-build' not found during configure; exit 1; }

@@ -482,18 +484,22 @@ gnt_scripts = \
        scripts/gnt-os
 
 PYTHON_BOOTSTRAP_SBIN = \
        scripts/gnt-os
 
 PYTHON_BOOTSTRAP_SBIN = \

-       daemons/ganeti-confd \

        daemons/ganeti-masterd \
        daemons/ganeti-noded \
        daemons/ganeti-watcher \
        daemons/ganeti-rapi \
        $(gnt_scripts)
 
        daemons/ganeti-masterd \
        daemons/ganeti-noded \
        daemons/ganeti-watcher \
        daemons/ganeti-rapi \
        $(gnt_scripts)
 

+if PY_CONFD
+PYTHON_BOOTSTRAP_SBIN += daemons/ganeti-confd
+endif
+

 PYTHON_BOOTSTRAP = \
        $(PYTHON_BOOTSTRAP_SBIN) \
        tools/ensure-dirs
 
 qa_scripts = \
 PYTHON_BOOTSTRAP = \
        $(PYTHON_BOOTSTRAP_SBIN) \
        tools/ensure-dirs
 
 qa_scripts = \

+       qa/__init__.py \

        qa/ganeti-qa.py \
        qa/qa_cluster.py \
        qa/qa_config.py \
        qa/ganeti-qa.py \
        qa/qa_cluster.py \
        qa/qa_config.py \

@@ -502,6 +508,7 @@ qa_scripts = \
        qa/qa_error.py \
        qa/qa_group.py \
        qa/qa_instance.py \
        qa/qa_error.py \
        qa/qa_group.py \
        qa/qa_instance.py \

+       qa/qa_job.py \

        qa/qa_node.py \
        qa/qa_os.py \
        qa/qa_rapi.py \
        qa/qa_node.py \
        qa/qa_os.py \
        qa/qa_rapi.py \

@@ -520,6 +527,9 @@ install-exec-hook:
                $(LN_S) -f htools \
                           $(DESTDIR)$(bindir)/$$role ; \
        done
                $(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
 endif
 
 $(HS_ALL_PROGS): %: %.hs $(HS_LIB_SRCS) $(HS_BUILT_SRCS) Makefile

@@ -538,7 +548,6 @@ $(HS_ALL_PROGS): %: %.hs $(HS_LIB_SRCS) $(HS_BUILT_SRCS) Makefile
          $(HTOOLS_NOCURL) $(HTOOLS_PARALLEL3) \
          -osuf $$BINARY.o -hisuf $$BINARY.hi \
          $(HEXTRA) $(HEXTRA_INT) $@
          $(HTOOLS_NOCURL) $(HTOOLS_PARALLEL3) \
          -osuf $$BINARY.o -hisuf $$BINARY.hi \
          $(HEXTRA) $(HEXTRA_INT) $@

-

 # for the htools/test binary, we need to enable profiling/coverage
 htools/test: HEXTRA_INT=-fhpc -Wwarn -fno-warn-missing-signatures \
        -fno-warn-monomorphism-restriction -fno-warn-orphans \
 # for the htools/test binary, we need to enable profiling/coverage
 htools/test: HEXTRA_INT=-fhpc -Wwarn -fno-warn-missing-signatures \
        -fno-warn-monomorphism-restriction -fno-warn-orphans \

@@ -571,6 +580,10 @@ nodist_sbin_SCRIPTS = \
        $(PYTHON_BOOTSTRAP_SBIN) \
        daemons/ganeti-cleaner
 
        $(PYTHON_BOOTSTRAP_SBIN) \
        daemons/ganeti-cleaner
 

+if HS_CONFD
+nodist_sbin_SCRIPTS += htools/hconfd
+endif
+

 python_scripts = \
        tools/burnin \
        tools/cfgshell \
 python_scripts = \
        tools/burnin \
        tools/cfgshell \

@@ -625,6 +638,7 @@ EXTRA_DIST = \
        autotools/docpp \
        autotools/gen-coverage \
        autotools/testrunner \
        autotools/docpp \
        autotools/gen-coverage \
        autotools/testrunner \

+       autotools/wrong-hardcoded-paths \

        $(RUN_IN_TEMPDIR) \
        daemons/daemon-util.in \
        daemons/ganeti-cleaner.in \
        $(RUN_IN_TEMPDIR) \
        daemons/daemon-util.in \
        daemons/ganeti-cleaner.in \

@@ -718,6 +732,7 @@ TEST_FILES = \
        test/data/sys_drbd_usermode_helper.txt \
        test/data/htools/hail-alloc-drbd.json \
        test/data/htools/hail-change-group.json \
        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/common-suffix.data \
        test/data/htools/hail-node-evac.json \
        test/data/htools/hail-reloc-drbd.json \
        test/data/htools/common-suffix.data \

@@ -757,9 +772,24 @@ TEST_FILES = \
        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/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/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

 
 python_tests = \
 
 python_tests = \

+       doc/examples/rapi_testutils.py \

        test/ganeti.asyncnotifier_unittest.py \
        test/ganeti.backend_unittest.py \
        test/ganeti.bdev_unittest.py \
        test/ganeti.asyncnotifier_unittest.py \
        test/ganeti.backend_unittest.py \
        test/ganeti.bdev_unittest.py \

@@ -784,6 +814,7 @@ python_tests = \
        test/ganeti.hypervisor.hv_xen_unittest.py \
        test/ganeti.impexpd_unittest.py \
        test/ganeti.jqueue_unittest.py \
        test/ganeti.hypervisor.hv_xen_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.instance_unittest.py \
        test/ganeti.locking_unittest.py \
        test/ganeti.luxi_unittest.py \
        test/ganeti.masterd.instance_unittest.py \

@@ -820,6 +851,7 @@ python_tests = \
        test/ganeti.utils.x509_unittest.py \
        test/ganeti.utils_unittest.py \
        test/ganeti.workerpool_unittest.py \
        test/ganeti.utils.x509_unittest.py \
        test/ganeti.utils_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/cfgupgrade_unittest.py \
        test/docs_unittest.py \
        test/pycurl_reset_unittest.py \

@@ -835,6 +867,7 @@ dist_TESTS = \
        test/daemon-util_unittest.bash \
        test/ganeti-cleaner_unittest.bash \
        test/import-export_unittest.bash \
        test/daemon-util_unittest.bash \
        test/ganeti-cleaner_unittest.bash \
        test/import-export_unittest.bash \

+       test/cli-test.bash \

        $(python_tests)
 
 nodist_TESTS =
        $(python_tests)
 
 nodist_TESTS =

@@ -850,8 +883,10 @@ TESTS = $(dist_TESTS) $(nodist_TESTS)
 
 # Environment for all tests
 PLAIN_TESTS_ENVIRONMENT = \
 
 # Environment for all tests
 PLAIN_TESTS_ENVIRONMENT = \

-       PYTHONPATH=. TOP_SRCDIR=$(abs_top_srcdir) PYTHON=$(PYTHON) \
-       FAKEROOT=$(FAKEROOT_PATH) $(RUN_IN_TEMPDIR)
+       PYTHONPATH=. \
+       TOP_SRCDIR=$(abs_top_srcdir) TOP_BUILDDIR=$(abs_top_builddir) \
+       PYTHON=$(PYTHON) FAKEROOT=$(FAKEROOT_PATH) \
+       $(RUN_IN_TEMPDIR)

 
 # Environment for tests run by automake
 TESTS_ENVIRONMENT = \
 
 # Environment for tests run by automake
 TESTS_ENVIRONMENT = \

@@ -884,6 +919,7 @@ srclink_files = \
        test/daemon-util_unittest.bash \
        test/ganeti-cleaner_unittest.bash \
        test/import-export_unittest.bash \
        test/daemon-util_unittest.bash \
        test/ganeti-cleaner_unittest.bash \
        test/import-export_unittest.bash \

+       test/cli-test.bash \

        htools/offline-test.sh \
        htools/cli-tests-defs.sh \
        $(all_python_code) \
        htools/offline-test.sh \
        htools/cli-tests-defs.sh \
        $(all_python_code) \

@@ -964,8 +1000,18 @@ man/footer.html: man/footer.rst
          { echo 'pandoc' not found during configure; exit 1; }
        $(PANDOC) -f rst -t html -o $@ $<
 
          { 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
-       PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(DOCPP) < $< > $@
+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 ; \
+         exit 1; \
+       fi
+       set -e ; \
+       trap 'echo auto-removing $@; rm $@' EXIT; \
+       PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(DOCPP) < $< > $@ ;\
+       trap - EXIT

 
 man/%.7.in man/%.8.in man/%.1.in: man/%.gen man/footer.man
        @test -n "$(PANDOC)" || \
 
 man/%.7.in man/%.8.in man/%.1.in: man/%.gen man/footer.man
        @test -n "$(PANDOC)" || \

@@ -1008,12 +1054,16 @@ vcs-version:
          echo "Cannot auto-generate $@ file"; exit 1; \
        fi
 
          echo "Cannot auto-generate $@ file"; exit 1; \
        fi
 

+.PHONY: clean-vcs-version
+clean-vcs-version:
+       rm -f vcs-version
+

 .PHONY: regen-vcs-version
 regen-vcs-version:
        set -e; \
        cd $(srcdir); \
        if test -d .git; then \
 .PHONY: regen-vcs-version
 regen-vcs-version:
        set -e; \
        cd $(srcdir); \
        if test -d .git; then \

-         rm -f vcs-version; \
+         $(MAKE) clean-vcs-version; \

          $(MAKE) vcs-version; \
        fi
 
          $(MAKE) vcs-version; \
        fi
 

@@ -1023,7 +1073,8 @@ htools/Ganeti/HTools/Version.hs: htools/Ganeti/HTools/Version.hs.in vcs-version
        sed -e "s/%ver%/$$VCSVER/" < $< > $@
 
 htools/Ganeti/Constants.hs: htools/Ganeti/Constants.hs.in \
        sed -e "s/%ver%/$$VCSVER/" < $< > $@
 
 htools/Ganeti/Constants.hs: htools/Ganeti/Constants.hs.in \

-       lib/constants.py lib/_autoconf.py $(CONVERT_CONSTANTS) \
+       lib/constants.py lib/_autoconf.py lib/luxi.py \
+       $(CONVERT_CONSTANTS) \

        | lib/_vcsversion.py
        set -e; \
        { cat $< ; PYTHONPATH=. $(CONVERT_CONSTANTS); } > $@
        | lib/_vcsversion.py
        set -e; \
        { cat $< ; PYTHONPATH=. $(CONVERT_CONSTANTS); } > $@

@@ -1059,6 +1110,7 @@ lib/_autoconf.py: Makefile | lib/.dir
          echo "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \
          echo "XEN_KERNEL = '$(XEN_KERNEL)'"; \
          echo "XEN_INITRD = '$(XEN_INITRD)'"; \
          echo "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \
          echo "XEN_KERNEL = '$(XEN_KERNEL)'"; \
          echo "XEN_INITRD = '$(XEN_INITRD)'"; \

+         echo "KVM_KERNEL = '$(KVM_KERNEL)'"; \

          echo "FILE_STORAGE_DIR = '$(FILE_STORAGE_DIR)'"; \
          echo "ENABLE_FILE_STORAGE = $(ENABLE_FILE_STORAGE)"; \
          echo "SHARED_FILE_STORAGE_DIR = '$(SHARED_FILE_STORAGE_DIR)'"; \
          echo "FILE_STORAGE_DIR = '$(FILE_STORAGE_DIR)'"; \
          echo "ENABLE_FILE_STORAGE = $(ENABLE_FILE_STORAGE)"; \
          echo "SHARED_FILE_STORAGE_DIR = '$(SHARED_FILE_STORAGE_DIR)'"; \

@@ -1094,6 +1146,9 @@ lib/_autoconf.py: Makefile | lib/.dir
            echo "HTOOLS = False"; \
          fi; \
          echo "ENABLE_CONFD = $(ENABLE_CONFD)"; \
            echo "HTOOLS = False"; \
          fi; \
          echo "ENABLE_CONFD = $(ENABLE_CONFD)"; \

+         echo "PY_CONFD = $(PY_CONFD)"; \
+         echo "HS_CONFD = $(HS_CONFD)"; \
+         echo "XEN_CMD = '$(XEN_CMD)'"; \

        } > $@
 
 lib/_vcsversion.py: Makefile vcs-version | lib/.dir
        } > $@
 
 lib/_vcsversion.py: Makefile vcs-version | lib/.dir

@@ -1265,28 +1320,43 @@ PEP8_IGNORE = E111,E261,E501
 # For excluding pep8 expects filenames only, not whole paths
 PEP8_EXCLUDE = $(subst $(space),$(comma),$(strip $(notdir $(BUILT_PYTHON_SOURCES))))
 
 # For excluding pep8 expects filenames only, not whole paths
 PEP8_EXCLUDE = $(subst $(space),$(comma),$(strip $(notdir $(BUILT_PYTHON_SOURCES))))
 

+LINT_TARGETS = pylint pylint-qa
+if HAS_PEP8
+LINT_TARGETS += pep8
+endif
+if HAS_HLINT
+LINT_TARGETS += hlint
+endif
+

 .PHONY: lint
 .PHONY: lint

-lint: $(BUILT_SOURCES)
+lint: $(LINT_TARGETS)
+
+.PHONY: pylint
+pylint: $(BUILT_SOURCES)

        @test -n "$(PYLINT)" || { echo 'pylint' not found during configure; exit 1; }
        @test -n "$(PYLINT)" || { echo 'pylint' not found during configure; exit 1; }

-       if test -z "$(PEP8)"; then \
-               echo '"pep8" not found during configure' >&2; \
-       else \
-               $(PEP8) --repeat --ignore='$(PEP8_IGNORE)' --exclude='$(PEP8_EXCLUDE)' \
-                       $(pep8_python_code); \
-       fi

        $(PYLINT) $(LINT_OPTS) $(lint_python_code)
        $(PYLINT) $(LINT_OPTS) $(lint_python_code)

+
+.PHONY: pylint-qa
+pylint-qa: $(BUILT_SOURCES)
+       @test -n "$(PYLINT)" || { echo 'pylint' not found during configure; exit 1; }

        cd $(top_srcdir)/qa && \
          PYTHONPATH=$(abs_top_srcdir) $(PYLINT) $(LINT_OPTS) \
          --rcfile  ../pylintrc $(patsubst qa/%.py,%,$(qa_scripts))
 
        cd $(top_srcdir)/qa && \
          PYTHONPATH=$(abs_top_srcdir) $(PYLINT) $(LINT_OPTS) \
          --rcfile  ../pylintrc $(patsubst qa/%.py,%,$(qa_scripts))
 

+.PHONY: pep8
+pep8: $(BUILT_SOURCES)
+       @test -n "$(PEP8)" || { echo 'pep8' not found during configure; exit 1; }
+       $(PEP8) --ignore='$(PEP8_IGNORE)' --exclude='$(PEP8_EXCLUDE)' \
+               --repeat $(pep8_python_code)
+

 .PHONY: hlint
 hlint: $(HS_BUILT_SRCS) htools/lint-hints.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; \
        if tty -s; then C="-c"; else C=""; fi; \

-       hlint --report=doc/hs-lint.html --cross $$C \
+       $(HLINT) --report=doc/hs-lint.html --cross $$C \

          --ignore "Use first" \
          --ignore "Use comparing" \
          --ignore "Use on" \
          --ignore "Use first" \
          --ignore "Use comparing" \
          --ignore "Use on" \

-         --ignore "Use Control.Exception.catch" \

          --ignore "Reduce duplication" \
          --hint htools/lint-hints \
          $(filter-out htools/Ganeti/THH.hs,$(HS_LIB_SRCS))
          --ignore "Reduce duplication" \
          --hint htools/lint-hints \
          $(filter-out htools/Ganeti/THH.hs,$(HS_LIB_SRCS))

@@ -1294,8 +1364,8 @@ hlint: $(HS_BUILT_SRCS) htools/lint-hints.hs
 # a dist hook rule for updating the vcs-version file; this is
 # hardcoded due to where it needs to build the file...
 dist-hook:
 # a dist hook rule for updating the vcs-version file; this is
 # hardcoded due to where it needs to build the file...
 dist-hook:

-       $(MAKE) regen-vcs-version && \
-       rm -f $(top_distdir)/vcs-version && \
+       $(MAKE) regen-vcs-version
+       rm -f $(top_distdir)/vcs-version

        cp -p $(srcdir)/vcs-version $(top_distdir)
 
 # a distcheck hook rule for catching revision control directories
        cp -p $(srcdir)/vcs-version $(top_distdir)
 
 # a distcheck hook rule for catching revision control directories

@@ -1421,7 +1491,8 @@ py-coverage: $(BUILT_SOURCES) $(python_tests)
 
 .PHONY: hs-coverage
 hs-coverage: $(haskell_tests) htools/hpc-htools
 
 .PHONY: hs-coverage
 hs-coverage: $(haskell_tests) htools/hpc-htools

-       rm -f *.tix && $(MAKE) hs-check
+       rm -f *.tix
+       $(MAKE) hs-check

        @mkdir_p@ $(COVERAGE_HS_DIR)
        hpc combine $(HPCEXCL) test.tix hpc-htools.tix > coverage-htools.tix
        hpc markup --destdir=$(COVERAGE_HS_DIR) coverage-htools.tix
        @mkdir_p@ $(COVERAGE_HS_DIR)
        hpc combine $(HPCEXCL) test.tix hpc-htools.tix > coverage-htools.tix
        hpc markup --destdir=$(COVERAGE_HS_DIR) coverage-htools.tix