Revision d9a900dc Makefile.am
| b/Makefile.am | ||
|---|---|---|
| 54 | 54 |
# Delete output file if an error occurred while building it |
| 55 | 55 |
.DELETE_ON_ERROR: |
| 56 | 56 |
|
| 57 |
HTOOLS_DIRS = \
|
|
| 57 |
HS_DIRS = \ |
|
| 58 | 58 |
src \ |
| 59 | 59 |
src/Ganeti \ |
| 60 | 60 |
src/Ganeti/Block \ |
| ... | ... | |
| 76 | 76 |
htest/Test/Ganeti/Query |
| 77 | 77 |
|
| 78 | 78 |
DIRS = \ |
| 79 |
$(HTOOLS_DIRS) \
|
|
| 79 |
$(HS_DIRS) \ |
|
| 80 | 80 |
autotools \ |
| 81 | 81 |
daemons \ |
| 82 | 82 |
devel \ |
| ... | ... | |
| 161 | 161 |
|
| 162 | 162 |
CLEANFILES = \ |
| 163 | 163 |
$(addsuffix /*.py[co],$(DIRS)) \ |
| 164 |
$(addsuffix /*.hi,$(HTOOLS_DIRS)) \
|
|
| 165 |
$(addsuffix /*.o,$(HTOOLS_DIRS)) \
|
|
| 164 |
$(addsuffix /*.hi,$(HS_DIRS)) \ |
|
| 165 |
$(addsuffix /*.o,$(HS_DIRS)) \ |
|
| 166 | 166 |
$(PYTHON_BOOTSTRAP) \ |
| 167 | 167 |
epydoc.conf \ |
| 168 | 168 |
$(REPLACE_VARS_SED) \ |
| ... | ... | |
| 191 | 191 |
$(BUILT_PYTHON_SOURCES) \ |
| 192 | 192 |
$(PYTHON_BOOTSTRAP) |
| 193 | 193 |
|
| 194 |
HTOOLS_GENERATED_FILES =
|
|
| 194 |
HS_GENERATED_FILES = |
|
| 195 | 195 |
if WANT_HTOOLS |
| 196 |
HTOOLS_GENERATED_FILES += $(HS_PROGS)
|
|
| 196 |
HS_GENERATED_FILES += $(HS_PROGS) |
|
| 197 | 197 |
if ENABLE_CONFD |
| 198 |
HTOOLS_GENERATED_FILES += src/hconfd src/ganeti-confd
|
|
| 198 |
HS_GENERATED_FILES += src/hconfd src/ganeti-confd |
|
| 199 | 199 |
endif |
| 200 | 200 |
endif |
| 201 | 201 |
|
| ... | ... | |
| 670 | 670 |
endif |
| 671 | 671 |
|
| 672 | 672 |
$(HS_ALL_PROGS): %: %.hs $(HS_LIBTEST_SRCS) $(HS_BUILT_SRCS) Makefile |
| 673 |
@if [ "$(notdir $@)" = "test" ] && [ "$(HTOOLS_NODEV)" ]; then \
|
|
| 673 |
@if [ "$(notdir $@)" = "test" ] && [ "$(HS_NODEV)" ]; then \ |
|
| 674 | 674 |
echo "Error: cannot run unittests without the development" \ |
| 675 | 675 |
" libraries (see devnotes.rst)" 1>&2; \ |
| 676 | 676 |
exit 1; \ |
| ... | ... | |
| 678 | 678 |
@rm -f $(notdir $@).tix |
| 679 | 679 |
$(GHC) --make \ |
| 680 | 680 |
$(HFLAGS) \ |
| 681 |
$(HTOOLS_NOCURL) $(HTOOLS_PARALLEL3) $(HTOOLS_REGEX_PCRE) \
|
|
| 681 |
$(HS_NOCURL) $(HS_PARALLEL3) $(HS_REGEX_PCRE) \
|
|
| 682 | 682 |
-osuf $(notdir $@).o -hisuf $(notdir $@).hi \ |
| 683 | 683 |
$(HEXTRA) $(HEXTRA_INT) $@ |
| 684 | 684 |
@touch "$@" |
| ... | ... | |
| 1053 | 1053 |
nodist_TESTS = |
| 1054 | 1054 |
check_SCRIPTS = |
| 1055 | 1055 |
|
| 1056 |
if WANT_HTOOLSTESTS
|
|
| 1056 |
if WANT_HSTESTS |
|
| 1057 | 1057 |
nodist_TESTS += $(haskell_tests) |
| 1058 | 1058 |
dist_TESTS += htest/offline-test.sh |
| 1059 | 1059 |
check_SCRIPTS += \ |
| ... | ... | |
| 1173 | 1173 |
$(BUILD_BASH_COMPLETION) $(RUN_IN_TEMPDIR) \ |
| 1174 | 1174 |
lib/cli.py $(gnt_scripts) $(client_PYTHON) tools/burnin \ |
| 1175 | 1175 |
daemons/ganeti-cleaner \ |
| 1176 |
$(GENERATED_FILES) $(HTOOLS_GENERATED_FILES)
|
|
| 1176 |
$(GENERATED_FILES) $(HS_GENERATED_FILES) |
|
| 1177 | 1177 |
PYTHONPATH=. $(RUN_IN_TEMPDIR) \ |
| 1178 | 1178 |
$(CURDIR)/$(BUILD_BASH_COMPLETION) $(BC_ARGS) > $@ |
| 1179 | 1179 |
|
| ... | ... | |
| 1685 | 1685 |
"$(DESTDIR)${localstatedir}/run/ganeti"
|
| 1686 | 1686 |
|
| 1687 | 1687 |
.PHONY: apidoc |
| 1688 |
if WANT_HTOOLSAPIDOC
|
|
| 1688 |
if WANT_HSAPIDOC |
|
| 1689 | 1689 |
apidoc: py-apidoc hs-apidoc |
| 1690 | 1690 |
else |
| 1691 | 1691 |
apidoc: py-apidoc |
| ... | ... | |
| 1713 | 1713 |
$(LN_S) ../hscolour.css $(APIDOC_HS_DIR)/Ganeti/Confd/hscolour.css |
| 1714 | 1714 |
set -e ; \ |
| 1715 | 1715 |
cd src; \ |
| 1716 |
if [ "$(HTOOLS_NOCURL)" ]; \
|
|
| 1717 |
then OPTGHC="--optghc=$(HTOOLS_NOCURL)"; \
|
|
| 1716 |
if [ "$(HS_NOCURL)" ]; \ |
|
| 1717 |
then OPTGHC="--optghc=$(HS_NOCURL)"; \ |
|
| 1718 | 1718 |
else OPTGHC=""; \ |
| 1719 | 1719 |
fi; \ |
| 1720 |
if [ "$(HTOOLS_PARALLEL3)" ]; \
|
|
| 1721 |
then OPTGHC="$$OPTGHC --optghc=$(HTOOLS_PARALLEL3)"; \
|
|
| 1720 |
if [ "$(HS_PARALLEL3)" ]; \ |
|
| 1721 |
then OPTGHC="$$OPTGHC --optghc=$(HS_PARALLEL3)"; \ |
|
| 1722 | 1722 |
fi; \ |
| 1723 |
if [ "$(HTOOLS_REGEX_PCRE)" ]; \
|
|
| 1724 |
then OPTGHC="$$OPTGHC --optghc=$(HTOOLS_REGEX_PCRE)"; \
|
|
| 1723 |
if [ "$(HS_REGEX_PCRE)" ]; \ |
|
| 1724 |
then OPTGHC="$$OPTGHC --optghc=$(HS_REGEX_PCRE)"; \ |
|
| 1725 | 1725 |
fi; \ |
| 1726 | 1726 |
RELSRCS="$(HS_LIB_SRCS:src/%=%) $(patsubst src/%,%,$(filter src/%,$(HS_BUILT_SRCS)))"; \ |
| 1727 | 1727 |
for file in $$RELSRCS; do \ |
| ... | ... | |
| 1740 | 1740 |
rm -f TAGS |
| 1741 | 1741 |
$(GHC) -e ":etags" -v0 \ |
| 1742 | 1742 |
$(filter-out -O -Werror,$(HFLAGS)) \ |
| 1743 |
$(HTOOLS_NOCURL) $(HTOOLS_PARALLEL3) $(HTOOLS_REGEX_PCRE) \
|
|
| 1743 |
$(HS_NOCURL) $(HS_PARALLEL3) $(HS_REGEX_PCRE) \
|
|
| 1744 | 1744 |
$(HS_LIBTEST_SRCS) |
| 1745 | 1745 |
find . -path './lib/*.py' -o -path './scripts/gnt-*' -o \ |
| 1746 | 1746 |
-path './daemons/ganeti-*' -o -path './tools/*' -o \ |
Also available in: Unified diff