Commit f67aabd9 authored by Petr Pudlak's avatar Petr Pudlak

Fix deamon dependencies in Makefile.am

In particular, kvmd, luxid, metad and wconfd aren't dependent on
enabling confd.
Signed-off-by: default avatarPetr Pudlak <pudlak@google.com>
Reviewed-by: default avatarKlaus Aehlig <aehlig@google.com>
parent 0877393e
...@@ -308,6 +308,7 @@ CLEANFILES = \ ...@@ -308,6 +308,7 @@ CLEANFILES = \
src/ganeti-confd \ src/ganeti-confd \
src/ganeti-wconfd \ src/ganeti-wconfd \
src/ganeti-luxid \ src/ganeti-luxid \
src/ganeti-metad \
src/ganeti-mond \ src/ganeti-mond \
.hpc/*.mix src/*.tix test/hs/*.tix *.tix \ .hpc/*.mix src/*.tix test/hs/*.tix *.tix \
doc/hs-lint.html doc/hs-lint.html
...@@ -1223,7 +1224,14 @@ dist_sbin_SCRIPTS = \ ...@@ -1223,7 +1224,14 @@ dist_sbin_SCRIPTS = \
tools/ganeti-listrunner tools/ganeti-listrunner
nodist_sbin_SCRIPTS = \ 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 # strip path prefixes off the sbin scripts
all_sbin_scripts = \ all_sbin_scripts = \
...@@ -1234,14 +1242,7 @@ if ENABLE_CONFD ...@@ -1234,14 +1242,7 @@ if ENABLE_CONFD
src/ganeti-confd: src/hconfd src/ganeti-confd: src/hconfd
cp -f $< $@ cp -f $< $@
src/ganeti-luxid: src/hluxid
cp -f $< $@
nodist_sbin_SCRIPTS += src/ganeti-confd 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 endif
if ENABLE_MOND if ENABLE_MOND
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment