[Xen-devel] [PATCH v2] tools: update ocamlfind handling

[Olaf Hering <olaf@xxxxxxxxx>]

# HG changeset patch
# User Olaf Hering <olaf@xxxxxxxxx>
# Date 1359642490 -3600
# Node ID 10d9f4caffa8986185b9f8824bd5bf0bb41de660
# Parent  6727070b4129cf852199b66b6a81042ee6966a98
tools: update ocamlfind handling

configure checks just for ocamlc, but the tools in tools/ocaml depend
also on ocamlfind. On my workstation I have just ocamlc installed, but
no ocamlfind. As a result make will fail.

Update configure.ac to check also for OCAMLFIND, update various
Makefiles and replace hardcoded ocamlfind string with $(OCAMLFIND)

Please rerun autogen.sh after applying this patch.

v2:
 - fix logic error in configure.ac

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>

diff -r 6727070b4129 -r 10d9f4caffa8 tools/configure.ac
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -85,7 +85,8 @@ AS_IF([test "x$xapi" = "xy"], [
 ])
 AS_IF([test "x$ocamltools" = "xy"], [
     AC_PROG_OCAML
-    AS_IF([test "x$OCAMLC" = "xno"], [
+    AC_PROG_FINDLIB
+    AS_IF([test "x$OCAMLC" = "xno" || test "x$OCAMLFIND" = "xno"], [
         AS_IF([test "x$enable_ocamltools" = "xyes"], [
             AC_MSG_ERROR([Ocaml tools enabled, but unable to find Ocaml])])
         ocamltools="n"
diff -r 6727070b4129 -r 10d9f4caffa8 tools/ocaml/common.make
--- a/tools/ocaml/common.make
+++ b/tools/ocaml/common.make
@@ -7,6 +7,7 @@ OCAMLMKLIB ?= ocamlmklib
 OCAMLDEP ?= ocamldep
 OCAMLLEX ?= ocamllex
 OCAMLYACC ?= ocamlyacc
+OCAMLFIND ?= ocamlfind
 
 CFLAGS += -fPIC -Werror -I$(shell ocamlc -where)
 
@@ -16,6 +17,6 @@ OCAMLCFLAGS += -g $(OCAMLINCLUDE) -w F -
 
 VERSION := 4.1
 
-OCAMLDESTDIR ?= $(DESTDIR)$(shell ocamlfind printconf destdir)
+OCAMLDESTDIR ?= $(DESTDIR)$(shell $(OCAMLFIND) printconf destdir)
 
 o= >$@.new && mv -f $@.new $@
diff -r 6727070b4129 -r 10d9f4caffa8 tools/ocaml/libs/eventchn/Makefile
--- a/tools/ocaml/libs/eventchn/Makefile
+++ b/tools/ocaml/libs/eventchn/Makefile
@@ -24,12 +24,12 @@ OCAML_LIBRARY = xeneventchn
 .PHONY: install
 install: $(LIBS) META
        mkdir -p $(OCAMLDESTDIR)
-       ocamlfind remove -destdir $(OCAMLDESTDIR) xeneventchn
-       ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xeneventchn 
META $(INTF) $(LIBS) *.a *.so *.cmx
+       $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xeneventchn
+       $(OCAMLFIND) install -destdir $(OCAMLDESTDIR) -ldconf ignore 
xeneventchn META $(INTF) $(LIBS) *.a *.so *.cmx
 
 .PHONY: uninstall
 uninstall:
-       ocamlfind remove -destdir $(OCAMLDESTDIR) xeneventchn
+       $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xeneventchn
 
 include $(TOPLEVEL)/Makefile.rules
 
diff -r 6727070b4129 -r 10d9f4caffa8 tools/ocaml/libs/mmap/Makefile
--- a/tools/ocaml/libs/mmap/Makefile
+++ b/tools/ocaml/libs/mmap/Makefile
@@ -19,12 +19,12 @@ OCAML_LIBRARY = xenmmap
 .PHONY: install
 install: $(LIBS) META
        mkdir -p $(OCAMLDESTDIR)
-       ocamlfind remove -destdir $(OCAMLDESTDIR) xenmmap
-       ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xenmmap META 
$(INTF) $(LIBS) *.a *.so *.cmx
+       $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenmmap
+       $(OCAMLFIND) install -destdir $(OCAMLDESTDIR) -ldconf ignore xenmmap 
META $(INTF) $(LIBS) *.a *.so *.cmx
 
 .PHONY: uninstall
 uninstall:
-       ocamlfind remove -destdir $(OCAMLDESTDIR) xenmmap
+       $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenmmap
 
 include $(TOPLEVEL)/Makefile.rules
 
diff -r 6727070b4129 -r 10d9f4caffa8 tools/ocaml/libs/xb/Makefile
--- a/tools/ocaml/libs/xb/Makefile
+++ b/tools/ocaml/libs/xb/Makefile
@@ -45,11 +45,11 @@ xenbus.cmo : $(foreach obj, $(OBJS), $(o
 .PHONY: install
 install: $(LIBS) META
        mkdir -p $(OCAMLDESTDIR)
-       ocamlfind remove -destdir $(OCAMLDESTDIR) xenbus
-       ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xenbus META 
$(LIBS) xenbus.cmo xenbus.cmi xenbus.cmx *.a *.so 
+       $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenbus
+       $(OCAMLFIND) install -destdir $(OCAMLDESTDIR) -ldconf ignore xenbus 
META $(LIBS) xenbus.cmo xenbus.cmi xenbus.cmx *.a *.so 
 
 .PHONY: uninstall
 uninstall:
-       ocamlfind remove -destdir $(OCAMLDESTDIR) xenbus
+       $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenbus
 
 include $(TOPLEVEL)/Makefile.rules
diff -r 6727070b4129 -r 10d9f4caffa8 tools/ocaml/libs/xc/Makefile
--- a/tools/ocaml/libs/xc/Makefile
+++ b/tools/ocaml/libs/xc/Makefile
@@ -23,11 +23,11 @@ libs: $(LIBS)
 .PHONY: install
 install: $(LIBS) META
        mkdir -p $(OCAMLDESTDIR)
-       ocamlfind remove -destdir $(OCAMLDESTDIR) xenctrl
-       ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xenctrl META 
$(INTF) $(LIBS) *.a *.so *.cmx
+       $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenctrl
+       $(OCAMLFIND) install -destdir $(OCAMLDESTDIR) -ldconf ignore xenctrl 
META $(INTF) $(LIBS) *.a *.so *.cmx
 
 .PHONY: uninstall
 uninstall:
-       ocamlfind remove -destdir $(OCAMLDESTDIR) xenctrl
+       $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenctrl
 
 include $(TOPLEVEL)/Makefile.rules
diff -r 6727070b4129 -r 10d9f4caffa8 tools/ocaml/libs/xl/Makefile
--- a/tools/ocaml/libs/xl/Makefile
+++ b/tools/ocaml/libs/xl/Makefile
@@ -56,11 +56,11 @@ libs: $(LIBS)
 .PHONY: install
 install: $(LIBS) META
        mkdir -p $(OCAMLDESTDIR)
-       ocamlfind remove -destdir $(OCAMLDESTDIR) xenlight
-       ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xenlight META 
$(INTF) $(LIBS) *.a *.so *.cmx
+       $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenlight
+       $(OCAMLFIND) install -destdir $(OCAMLDESTDIR) -ldconf ignore xenlight 
META $(INTF) $(LIBS) *.a *.so *.cmx
 
 .PHONY: uninstall
 uninstall:
-       ocamlfind remove -destdir $(OCAMLDESTDIR) xenlight
+       $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenlight
 
 include $(TOPLEVEL)/Makefile.rules
diff -r 6727070b4129 -r 10d9f4caffa8 tools/ocaml/libs/xs/Makefile
--- a/tools/ocaml/libs/xs/Makefile
+++ b/tools/ocaml/libs/xs/Makefile
@@ -36,12 +36,12 @@ xenstore.cmo : $(foreach obj, $(OBJS), $
 .PHONY: install
 install: $(LIBS) META
        mkdir -p $(OCAMLDESTDIR)
-       ocamlfind remove -destdir $(OCAMLDESTDIR) xenstore
-       ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xenstore META 
$(LIBS) xenstore.cmo xenstore.cmi xenstore.cmx *.a 
+       $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenstore
+       $(OCAMLFIND) install -destdir $(OCAMLDESTDIR) -ldconf ignore xenstore 
META $(LIBS) xenstore.cmo xenstore.cmi xenstore.cmx *.a 
 
 .PHONY: uninstall
 uninstall:
-       ocamlfind remove -destdir $(OCAMLDESTDIR) xenstore
+       $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenstore
 
 include $(TOPLEVEL)/Makefile.rules
 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel