Commit f4445f53 authored by Petr Pudlak's avatar Petr Pudlak

Make htools and luxid mandatory in the Makefile

Since Ganeti now uses luxid for core operations, it needs to be always
present.
Signed-off-by: default avatarPetr Pudlak <pudlak@google.com>
Reviewed-by: default avatarHelga Velroyen <helgav@google.com>
parent 89671df1
......@@ -280,17 +280,13 @@ GENERATED_FILES = \
$(PYTHON_BOOTSTRAP) \
$(gnt_python_sbin_SCRIPTS)
HS_GENERATED_FILES =
if WANT_HTOOLS
HS_GENERATED_FILES += $(HS_PROGS)
HS_GENERATED_FILES = $(HS_PROGS) src/hluxid src/ganeti-luxid
if ENABLE_CONFD
HS_GENERATED_FILES += src/hconfd src/ganeti-confd src/hluxid src/ganeti-luxid
HS_GENERATED_FILES += src/hconfd src/ganeti-confd
endif
if ENABLE_MOND
HS_GENERATED_FILES += src/ganeti-mond
endif
endif
built_base_sources = \
stamp-directories \
......@@ -983,9 +979,7 @@ qa_scripts = \
qa/qa_utils.py \
qa/rapi-workload.py
bin_SCRIPTS =
if WANT_HTOOLS
bin_SCRIPTS += $(HS_BIN_PROGS)
bin_SCRIPTS = $(HS_BIN_PROGS)
install-exec-hook:
@mkdir_p@ $(DESTDIR)$(iallocatorsdir)
# FIXME: this is a hardcoded logic, instead of auto-resolving
......@@ -994,7 +988,6 @@ install-exec-hook:
for role in $(HS_BIN_ROLES); do \
$(LN_S) -f htools $(DESTDIR)$(bindir)/$$role ; \
done
endif
HNORMAL_SUFFIX = .o
HPROFILE_SUFFIX = .prof.o
......@@ -2360,9 +2353,7 @@ TAGS: $(GENERATED_FILES)
.PHONY: coverage
COVERAGE_TESTS=
if WANT_HTOOLS
COVERAGE_TESTS += hs-coverage
endif
if PY_UNIT
COVERAGE_TESTS += py-coverage
endif
......
......@@ -633,9 +633,6 @@ else
fi
AC_SUBST(HS_NODEV)
HTOOLS=yes
AC_SUBST(HTOOLS)
# Check for HsColour
HS_APIDOC=no
AC_ARG_VAR(HSCOLOUR, [HsColour path])
......@@ -664,12 +661,6 @@ if test -z "$HLINT"; then
AC_MSG_WARN([hlint not found, checking code will not be possible])
fi
if test "$HTOOLS" != yes && test "$ENABLE_CONFD" = True; then
AC_MSG_ERROR(m4_normalize([cannot enable ganeti-confd if
htools support is not enabled]))
fi
AM_CONDITIONAL([WANT_HTOOLS], [test "$HTOOLS" = yes])
AM_CONDITIONAL([WANT_HSTESTS], [test "x$HS_NODEV" = x])
AM_CONDITIONAL([WANT_HSAPIDOC], [test "$HS_APIDOC" = yes])
AM_CONDITIONAL([HAS_HLINT], [test "$HLINT"])
......
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