[llvm] r230850 - [OCaml] Generate documentation again with autoconf buildsystem.

Peter Zotov whitequark at whitequark.org
Sat Feb 28 05:48:23 PST 2015


Author: whitequark
Date: Sat Feb 28 07:48:23 2015
New Revision: 230850

URL: http://llvm.org/viewvc/llvm-project?rev=230850&view=rev
Log:
[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.

Modified:
    llvm/trunk/docs/Makefile

Modified: llvm/trunk/docs/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/Makefile?rev=230850&r1=230849&r2=230850&view=diff
==============================================================================
--- llvm/trunk/docs/Makefile (original)
+++ llvm/trunk/docs/Makefile Sat Feb 28 07:48:23 2015
@@ -41,7 +41,7 @@ install_targets := install-html
 ifeq ($(ENABLE_DOXYGEN),1)
 install_targets += install-doxygen
 endif
-ifdef OCAMLDOC
+ifdef OCAMLFIND
 ifneq (,$(filter ocaml,$(BINDINGS_TO_BUILD)))
 install_targets += install-ocamldoc
 endif
@@ -49,7 +49,7 @@ endif
 install-local:: $(install_targets)
 
 generated_targets := doxygen
-ifdef OCAMLDOC
+ifdef OCAMLFIND
 generated_targets += ocamldoc
 endif
 
@@ -120,7 +120,7 @@ regen-ocamldoc:
 	$(Verb) $(MAKE) -C $(LEVEL)/bindings/ocaml ocamldoc
 	$(Verb) $(MKDIR) $(PROJ_OBJ_DIR)/ocamldoc/html
 	$(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" \
 		         -path "*/$(BuildMode)/*.odoc" -exec echo -load '{}' ';'`
 





More information about the llvm-commits mailing list