Revision b0b8458a

b/Makefile.am
566 566
# run before)
567 567
.PHONY: hs-prof hs-prof-quick
568 568
hs-prof:
569
	$(MAKE) clean
570
	$(MAKE) $(HS_ALL_PROGS) HEXTRA="-osuf .o"
569
	$(MAKE) $(AM_MAKEFLAGS) clean
570
	$(MAKE) $(AM_MAKEFLAGS) $(HS_ALL_PROGS) HEXTRA="-osuf .o"
571 571
	rm -f $(HS_ALL_PROGS)
572
	$(MAKE) hs-prof-quick
572
	$(MAKE) $(AM_MAKEFLAGS) hs-prof-quick
573 573

  
574 574
hs-prof-quick:
575
	$(MAKE) $(HS_ALL_PROGS) HEXTRA="-osuf .prof_o -prof -auto-all"
575
	$(MAKE) $(AM_MAKEFLAGS) $(HS_ALL_PROGS) HEXTRA="-osuf .prof_o -prof -auto-all"
576 576

  
577 577
dist_sbin_SCRIPTS = \
578 578
	tools/ganeti-listrunner
......
1066 1066
	set -e; \
1067 1067
	cd $(srcdir); \
1068 1068
	if test -d .git; then \
1069
	  $(MAKE) clean-vcs-version; \
1070
	  $(MAKE) vcs-version; \
1069
	  $(MAKE) $(AM_MAKEFLAGS) clean-vcs-version; \
1070
	  $(MAKE) $(AM_MAKEFLAGS) vcs-version; \
1071 1071
	fi
1072 1072

  
1073 1073
htools/Ganeti/HTools/Version.hs: htools/Ganeti/HTools/Version.hs.in vcs-version
......
1367 1367
# a dist hook rule for updating the vcs-version file; this is
1368 1368
# hardcoded due to where it needs to build the file...
1369 1369
dist-hook:
1370
	$(MAKE) regen-vcs-version
1370
	$(MAKE) $(AM_MAKEFLAGS) regen-vcs-version
1371 1371
	rm -f $(top_distdir)/vcs-version
1372 1372
	cp -p $(srcdir)/vcs-version $(top_distdir)
1373 1373

  
......
1496 1496
.PHONY: hs-coverage
1497 1497
hs-coverage: $(haskell_tests) htools/hpc-htools
1498 1498
	rm -f *.tix
1499
	$(MAKE) hs-check
1499
	$(MAKE) $(AM_MAKEFLAGS) hs-check
1500 1500
	@mkdir_p@ $(COVERAGE_HS_DIR)
1501 1501
	hpc combine --union $(HPCEXCL) \
1502 1502
	  test.tix hpc-htools.tix > coverage-htools.tix

Also available in: Unified diff