mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-13 20:32:21 +00:00
[OCaml] Generate documentation again with autoconf buildsystem.
Patch by Evangelos Foutras: r220899 started using ocamlfind to build the OCaml bindings but docs/Makefile still contains references to the OCAMLDOC macro which is no longer being defined. The result is that OCaml documentation isn't generated/installed. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@230850 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
bac8d0ec70
commit
fc21e4b4a8
@ -41,7 +41,7 @@ install_targets := install-html
|
|||||||
ifeq ($(ENABLE_DOXYGEN),1)
|
ifeq ($(ENABLE_DOXYGEN),1)
|
||||||
install_targets += install-doxygen
|
install_targets += install-doxygen
|
||||||
endif
|
endif
|
||||||
ifdef OCAMLDOC
|
ifdef OCAMLFIND
|
||||||
ifneq (,$(filter ocaml,$(BINDINGS_TO_BUILD)))
|
ifneq (,$(filter ocaml,$(BINDINGS_TO_BUILD)))
|
||||||
install_targets += install-ocamldoc
|
install_targets += install-ocamldoc
|
||||||
endif
|
endif
|
||||||
@ -49,7 +49,7 @@ endif
|
|||||||
install-local:: $(install_targets)
|
install-local:: $(install_targets)
|
||||||
|
|
||||||
generated_targets := doxygen
|
generated_targets := doxygen
|
||||||
ifdef OCAMLDOC
|
ifdef OCAMLFIND
|
||||||
generated_targets += ocamldoc
|
generated_targets += ocamldoc
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -120,7 +120,7 @@ regen-ocamldoc:
|
|||||||
$(Verb) $(MAKE) -C $(LEVEL)/bindings/ocaml ocamldoc
|
$(Verb) $(MAKE) -C $(LEVEL)/bindings/ocaml ocamldoc
|
||||||
$(Verb) $(MKDIR) $(PROJ_OBJ_DIR)/ocamldoc/html
|
$(Verb) $(MKDIR) $(PROJ_OBJ_DIR)/ocamldoc/html
|
||||||
$(Verb) \
|
$(Verb) \
|
||||||
$(OCAMLDOC) -d $(PROJ_OBJ_DIR)/ocamldoc/html -sort -colorize-code -html \
|
$(OCAMLFIND) ocamldoc -d $(PROJ_OBJ_DIR)/ocamldoc/html -sort -colorize-code -html \
|
||||||
`$(FIND) $(LEVEL)/bindings/ocaml -name "*.odoc" \
|
`$(FIND) $(LEVEL)/bindings/ocaml -name "*.odoc" \
|
||||||
-path "*/$(BuildMode)/*.odoc" -exec echo -load '{}' ';'`
|
-path "*/$(BuildMode)/*.odoc" -exec echo -load '{}' ';'`
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user