Revision 21a5e56c Makefile.am

b/Makefile.am
601 601
endif
602 602

  
603 603
$(HS_ALL_PROGS): %: %.hs $(HS_LIBTEST_SRCS) $(HS_BUILT_SRCS) Makefile
604
	@if [ -z "$(HTOOLS)" ]; then \
605
	  echo "Error: htools compilation disabled at configure time" 1>&2 ;\
606
	  exit 1; \
607
	fi
608
	@if [ "$(notdir $@)" = "test" ] && [ -z "$(GHC_PKG_QUICKCHECK)" ]; then \
609
	  echo "Error: cannot run unittests without the QuickCheck library (see devnotes.rst)" 1>&2; \
604
	@if [ "$(notdir $@)" = "test" ] && [ "$(HTOOLS_NODEV)" ]; then \
605
	  echo "Error: cannot run unittests without the development" \
606
	       " libraries (see devnotes.rst)" 1>&2; \
610 607
	  exit 1; \
611 608
	fi
612 609
	@rm -f $(notdir $@).tix
613 610
	$(GHC) --make \
614 611
	  $(HFLAGS) \
615
	  $(HTOOLS_NOCURL) $(HTOOLS_PARALLEL3) \
612
	  $(HTOOLS_NOCURL) $(HTOOLS_PARALLEL3) $(HTOOLS_REGEX_PCRE) \
616 613
	  -osuf $(notdir $@).o -hisuf $(notdir $@).hi \
617 614
	  $(HEXTRA) $(HEXTRA_INT) $@
618 615
	@touch "$@"
......
1234 1231
	  echo "NODED_GROUP = '$(NODED_GROUP)'"; \
1235 1232
	  echo "DISK_SEPARATOR = '$(DISK_SEPARATOR)'"; \
1236 1233
	  echo "QEMUIMG_PATH = '$(QEMUIMG_PATH)'"; \
1237
	  if [ "$(HTOOLS)" ]; then \
1238
	    echo "HTOOLS = True"; \
1239
	  else \
1240
	    echo "HTOOLS = False"; \
1241
	  fi; \
1234
	  echo "HTOOLS = True"; \
1242 1235
	  echo "ENABLE_CONFD = $(ENABLE_CONFD)"; \
1243 1236
	  echo "XEN_CMD = '$(XEN_CMD)'"; \
1244 1237
	  echo "ENABLE_SPLIT_QUERY = $(ENABLE_SPLIT_QUERY)"; \
......
1593 1586
	if [ "$(HTOOLS_PARALLEL3)" ]; \
1594 1587
	then OPTGHC="$$OPTGHC --optghc=$(HTOOLS_PARALLEL3)"; \
1595 1588
	fi; \
1589
	if [ "$(HTOOLS_REGEX_PCRE)" ]; \
1590
	then OPTGHC="$$OPTGHC --optghc=$(HTOOLS_REGEX_PCRE)"; \
1591
	fi; \
1596 1592
	RELSRCS="$(HS_LIB_SRCS:htools/%=%) $(patsubst htools/%,%,$(filter htools/%,$(HS_BUILT_SRCS)))"; \
1597 1593
	for file in $$RELSRCS; do \
1598 1594
		hfile=`echo $$file|sed 's/\\.hs$$//'`.html; \
......
1610 1606
	rm -f TAGS
1611 1607
	$(GHC) -e ":etags" -v0 \
1612 1608
	  $(filter-out -O -Werror,$(HFLAGS)) \
1613
	  $(HTOOLS_NOCURL) $(HTOOLS_PARALLEL3) \
1609
	  $(HTOOLS_NOCURL) $(HTOOLS_PARALLEL3) $(HTOOLS_REGEX_PCRE) \
1614 1610
	  $(HS_LIBTEST_SRCS)
1615 1611
	find . -path './lib/*.py' -o -path './scripts/gnt-*' -o \
1616 1612
	  -path './daemons/ganeti-*' -o -path './tools/*' -o \

Also available in: Unified diff