From 7959b8753f7150d03440f540dc0648a009b174eb Mon Sep 17 00:00:00 2001 From: Petr Pudlak Date: Thu, 27 Feb 2014 14:07:32 +0100 Subject: [PATCH] Include mond and confd only when configured Previously they were included no matter of what the configuration was, failing to compile if some of the dependencies were missing. Signed-off-by: Petr Pudlak Reviewed-by: Helga Velroyen --- Makefile.am | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 22367e9f9..55c1a70a2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -593,13 +593,17 @@ HS_MYEXECLIB_PROGS= endif # Haskell programs to be compiled by "make really-all" -HS_COMPILE_PROGS= \ +HS_COMPILE_PROGS = \ src/ganeti-kvmd \ - src/ganeti-mond \ - src/hconfd \ src/hluxid \ src/hs2py \ src/rpc-test +if ENABLE_CONFD +HS_COMPILE_PROGS += src/hconfd +endif +if ENABLE_MOND +HS_COMPILE_PROGS += src/ganeti-mond +endif # All Haskell non-test programs to be compiled but not automatically installed HS_PROGS = $(HS_BIN_PROGS) $(HS_MYEXECLIB_PROGS) -- GitLab