From f67aabd93d44f370109fed4ce4a96903db3a3e97 Mon Sep 17 00:00:00 2001 From: Petr Pudlak Date: Thu, 17 Jul 2014 13:28:57 +0200 Subject: [PATCH] Fix deamon dependencies in Makefile.am In particular, kvmd, luxid, metad and wconfd aren't dependent on enabling confd. Signed-off-by: Petr Pudlak Reviewed-by: Klaus Aehlig --- Makefile.am | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index c48890403..4b20fab38 100644 --- a/Makefile.am +++ b/Makefile.am @@ -308,6 +308,7 @@ CLEANFILES = \ src/ganeti-confd \ src/ganeti-wconfd \ src/ganeti-luxid \ + src/ganeti-metad \ src/ganeti-mond \ .hpc/*.mix src/*.tix test/hs/*.tix *.tix \ doc/hs-lint.html @@ -1223,7 +1224,14 @@ dist_sbin_SCRIPTS = \ tools/ganeti-listrunner nodist_sbin_SCRIPTS = \ - daemons/ganeti-cleaner + daemons/ganeti-cleaner \ + src/ganeti-kvmd \ + src/ganeti-luxid \ + src/ganeti-metad \ + src/ganeti-wconfd + +src/ganeti-luxid: src/hluxid + cp -f $< $@ # strip path prefixes off the sbin scripts all_sbin_scripts = \ @@ -1234,14 +1242,7 @@ if ENABLE_CONFD src/ganeti-confd: src/hconfd cp -f $< $@ -src/ganeti-luxid: src/hluxid - cp -f $< $@ - nodist_sbin_SCRIPTS += src/ganeti-confd -nodist_sbin_SCRIPTS += src/ganeti-wconfd -nodist_sbin_SCRIPTS += src/ganeti-luxid -nodist_sbin_SCRIPTS += src/ganeti-kvmd -nodist_sbin_SCRIPTS += src/ganeti-metad endif if ENABLE_MOND -- GitLab