Skip to content
Snippets Groups Projects
Commit ef53b4b2 authored by Iustin Pop's avatar Iustin Pop
Browse files

Change the check rule in Makefile

Since ghc won't trigger recompilation due to the -fhpc flag, it's not
useful to rm && make test, as this will only relink the binary.
Therefore we simplify this rule.
parent 095d7ac0
No related branches found
No related tags found
No related merge requests found
HPROGS = hbal hn1 hscan hail test
HPROGS = hbal hn1 hscan hail
HALLPROGS = $(HPROGS) test
HSRCS := $(wildcard Ganeti/HTools/*.hs)
HDDIR = apidoc
......@@ -13,9 +14,11 @@ HPCEXCL = --exclude Main --exclude Ganeti.HTools.QC
all: $(HPROGS)
$(HPROGS): %: %.hs Ganeti/HTools/Version.hs $(HSRCS) Makefile
$(HALLPROGS): %: %.hs Ganeti/HTools/Version.hs $(HSRCS) Makefile
ghc --make $(HFLAGS) $(HEXTRA) $@
test: HEXTRA=-fhpc
$(DOCS) : %.html : %
rst2html $< $@
......@@ -38,7 +41,7 @@ maintainer-clean:
rm -f $(DOCS) TAGS version Ganeti/HTools/Version.hs
clean:
rm -f $(HPROGS)
rm -f $(HALLPROGS)
rm -f *.o *.prof *.ps *.stat *.aux *.hi
cd Ganeti/HTools && rm -f *.o *.prof *.ps *.stat *.aux *.hi
......@@ -58,9 +61,8 @@ dist: Ganeti/HTools/Version.hs version doc
gzip -v9 $$ANAME ; \
tar tzvf $$ANAME.gz
check:
rm -f *.tix *.mix test
$(MAKE) HEXTRA=-fhpc test
check: test
rm -f *.tix *.mix
./test
ifeq ($(T),markup)
mkdir -p coverage
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment