Re: [Xen-devel] [PATCH 1 of 6] [OCAML] Rename the ocaml libraries

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

Bit late but:

On Fri, 2011-10-07 at 11:25 +0100, Jon Ludlam wrote:
> diff -r 3d1664cc9e45 -r ffbc5e9929d5 tools/ocaml/libs/xb/Makefile
> --- a/tools/ocaml/libs/xb/Makefile
> +++ b/tools/ocaml/libs/xb/Makefile
> @@ -25,22 +26,30 @@
[...]
> +xenbus.cmx : $(foreach obj, $(OBJS), $(obj).cmx)
> +       $(E) " CMX       $@"
> +       $(OCAMLOPT) -pack -o $@ $^
> +
> +xenbus.cmo : $(foreach obj, $(OBJS), $(obj).cmo)
> +       $(E) " CMO       $@"
> +       $(OCAMLC) -pack -o $@ $^
> [...]
> diff -r 3d1664cc9e45 -r ffbc5e9929d5 tools/ocaml/libs/xs/Makefile
> --- a/tools/ocaml/libs/xs/Makefile
> +++ b/tools/ocaml/libs/xs/Makefile
> @@ -20,18 +21,27 @@
[...]
> +xenstore.cmx : $(foreach obj, $(OBJS), $(obj).cmx)
> +       $(E) " CMX      $@"
> +       $(Q)$(OCAMLOPT) -pack -o $@ $^
> +
> +xenstore.cmo : $(foreach obj, $(OBJS), $(obj).cmo)
> +       $(E) " CMO      $@"
> +       $(Q)$(OCAMLC) -pack -o $@ $^
> +

These can't use the generic rules in tools/ocaml/Makefile.rules?

I noticed because:

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1318496187 -3600
# Node ID 333fef90be8250379c294daf15d12b234d95f824
# Parent  9738d92a3625d6b6b3c49badc0ca9e95a67b2bbd
ocaml: align build output

Fix:
 MLI       op.mli
 MLI      op.cmi
 MLI       partial.mli
 MLI      partial.cmi
 MLI       packet.mli


Signed-off-by: Ian Cmpabell <ian.campbell@xxxxxxxxxx>

diff -r 9738d92a3625 -r 333fef90be82 tools/ocaml/libs/xb/Makefile
--- a/tools/ocaml/libs/xb/Makefile      Thu Oct 13 09:45:09 2011 +0100
+++ b/tools/ocaml/libs/xb/Makefile      Thu Oct 13 09:56:27 2011 +0100
@@ -31,15 +31,15 @@ xenbus_C_OBJS = xs_ring_stubs xenbus_stu
 OCAML_LIBRARY = xenbus
 
 xenbus.cmx : $(foreach obj, $(OBJS), $(obj).cmx)
-       $(E) " CMX       $@"
+       $(E) " CMX      $@"
        $(OCAMLOPT) -pack -o $@ $^
 
 xenbus.cmo : $(foreach obj, $(OBJS), $(obj).cmo)
-       $(E) " CMO       $@"
+       $(E) " CMO      $@"
        $(OCAMLC) -pack -o $@ $^
 
 %.mli: %.ml
-       $(E) " MLI       $@"
+       $(E) " MLI      $@"
        $(Q)$(OCAMLC) $(OCAMLINCLUDE) -i $< $o
 
 .PHONY: install



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel