Revision 6249f1c2

b/Makefile.am
409 409
	doc/virtual-cluster.rst \
410 410
	doc/walkthrough.rst
411 411

  
412
HS_PROGS = src/htools src/mon-collector
412
# Haskell programs to be installed in $PREFIX/bin
413
HS_BIN_PROGS=src/htools
414

  
415
# Haskell programs to be installed in the MYEXECLIB dir
416
HS_MYEXECLIB_PROGS=src/mon-collector
417

  
418
# Haskell programs to compiled but not installed automatically
419
# Usually they have their own specific installation rules
420
HS_COMPILE_PROGS= \
421
	src/hconfd \
422
	src/rpc-test
423

  
424
# All Haskell non-test programs to be compiled but not automatically installed
425
HS_PROGS = $(HS_BIN_PROGS) $(HS_MYEXECLIB_PROGS)
426

  
413 427
HS_BIN_ROLES = hbal hscan hspace hinfo hcheck hroller
414 428
HS_HTOOLS_PROGS = $(HS_BIN_ROLES) hail
415 429

  
......
418 432
	test/hs/hpc-htools \
419 433
	test/hs/hpc-mon-collector \
420 434
	test/hs/htest \
421
	src/hconfd \
422
	src/rpc-test
435
	$(HS_COMPILE_PROGS)
423 436

  
424 437
HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS))
425 438
HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=test/hs/%) test/hs/hail
......
659 672

  
660 673
bin_SCRIPTS =
661 674
if WANT_HTOOLS
662
bin_SCRIPTS += $(filter-out src/hail,$(HS_PROGS))
675
bin_SCRIPTS += $(HS_BIN_PROGS)
663 676
install-exec-hook:
664 677
	@mkdir_p@ $(DESTDIR)$(iallocatorsdir)
665 678
# FIXME: this is a hardcoded logic, instead of auto-resolving
......
771 784
	daemons/daemon-util \
772 785
	tools/kvm-ifup \
773 786
	$(pkglib_python_scripts) \
774
	src/mon-collector
787
	$(HS_MYEXECLIB_PROGS)
775 788

  
776 789
nodist_myexeclib_SCRIPTS = \
777 790
	$(nodist_pkglib_python_scripts)

Also available in: Unified diff