Revision 458a286a Makefile.am
b/Makefile.am | ||
---|---|---|
46 | 46 |
HTOOLS_DIRS = \ |
47 | 47 |
htools \ |
48 | 48 |
htools/Ganeti \ |
49 |
htools/Ganeti/HTools |
|
49 |
htools/Ganeti/HTools \ |
|
50 |
htools/Ganeti/HTools/Program |
|
50 | 51 |
|
51 | 52 |
DIRS = \ |
52 | 53 |
autotools \ |
... | ... | |
82 | 83 |
$(APIDOC_PY_DIR) \ |
83 | 84 |
$(APIDOC_HS_DIR) \ |
84 | 85 |
$(APIDOC_HS_DIR)/Ganeti $(APIDOC_HS_DIR)/Ganeti/HTools \ |
86 |
$(APIDOC_HS_DIR)/Ganeti/HTools/Program \ |
|
85 | 87 |
$(COVERAGE_DIR) \ |
86 | 88 |
$(COVERAGE_PY_DIR) \ |
87 | 89 |
$(COVERAGE_HS_DIR) \ |
... | ... | |
307 | 309 |
HS_PROGS = \ |
308 | 310 |
htools/hbal \ |
309 | 311 |
htools/hscan \ |
310 |
htools/hail \ |
|
311 | 312 |
htools/hspace \ |
312 | 313 |
htools/htools |
313 | 314 |
|
... | ... | |
341 | 342 |
htools/Ganeti/HTools/Text.hs \ |
342 | 343 |
htools/Ganeti/HTools/Types.hs \ |
343 | 344 |
htools/Ganeti/HTools/Utils.hs \ |
345 |
htools/Ganeti/HTools/Program/Hail.hs \ |
|
344 | 346 |
htools/Ganeti/Jobs.hs \ |
345 | 347 |
htools/Ganeti/Luxi.hs \ |
346 | 348 |
htools/Ganeti/OpCodes.hs |
... | ... | |
447 | 449 |
qa/qa_utils.py |
448 | 450 |
|
449 | 451 |
bin_SCRIPTS = |
450 |
iallocators_SCRIPTS = |
|
451 | 452 |
if WANT_HTOOLS |
452 | 453 |
bin_SCRIPTS += $(filter-out htools/hail,$(HS_PROGS)) |
453 |
iallocators_SCRIPTS += $(filter htools/hail,$(HS_PROGS)) |
|
454 |
install-exec-hook: |
|
455 |
@mkdir_p@ $(DESTDIR)$(iallocatorsdir) |
|
456 |
$(LN_S) -f $(DESTDIR)$(bindir)/htools \ |
|
457 |
$(DESTDIR)$(iallocatorsdir)/hail |
|
454 | 458 |
endif |
455 | 459 |
|
456 | 460 |
$(HS_ALL_PROGS): %: %.hs $(HS_LIB_SRCS) $(HS_BUILT_SRCS) Makefile |
... | ... | |
1108 | 1112 |
@test -n "$(HADDOCK)" || \ |
1109 | 1113 |
{ echo 'haddock' not found during configure; exit 1; } |
1110 | 1114 |
rm -rf $(APIDOC_HS_DIR)/* |
1111 |
@mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/HTools |
|
1115 |
@mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/HTools/Program
|
|
1112 | 1116 |
$(HSCOLOUR) -print-css > $(APIDOC_HS_DIR)/Ganeti/hscolour.css |
1113 | 1117 |
ln -s ../hscolour.css $(APIDOC_HS_DIR)/Ganeti/HTools/hscolour.css |
1114 | 1118 |
set -e ; \ |
Also available in: Unified diff