[Libguestfs] ocamldep -all seems to break builds on platforms without a native compiler

Sun Sep 14 17:56:54 UTC 2014

On Sun, Sep 14, 2014 at 05:07:57PM +0200, Hilko Bengen wrote:
> Hi,
> 
> I have been trying to catch up my Debian packages to the current 1.27
> branch of libguestfs (and uploaded those packages to experimental), but
> apparently the build was broken for architectures where no native OCaml
> compiler is available because make wanted to build .cmx files -- see
> <https://buildd.debian.org/status/package.php?p=libguestfs&suite=experimental>.
> 
> So far mips[1], ppc64el[2], and s390x[3] builds have failed with the same error.
> 
> It looks like this commit
> 
> ,----
> | commit a3881445efd04d5fe6da29db8b2d62a30088b9d1
> | Author: Richard W.M. Jones <rjones at redhat.com>
> | Date:   Mon Sep 1 22:24:14 2014 +0100
> | 
> |     Use ocamldep -all option.
> `----
> 
> caused the build to break. After reverting it, everything worked fine,
> at least that's what I found on ppc64el.

Yes, also this commit doesn't actually fix the problem.  I still see
occasional problems building StringMap.  I have reverted this commit.

> What does this -all switch do anyhow? It certainly seems that ocamldep
> and/or ocamlfind documentation are lacking.

Indeed, it doesn't look as if -all is properly documented anywhere.
The flag -all seems to add explicit dependencies for things like *.o
files.  I have attached the difference between ocamldep alone and
ocamldep -all in the v2v/ directory.

I suspect the answer is simply to add a v2v/stringMap.mli file.
Because the Makefile.am has a *.mli -> *.cmi rule, it should cause
make to generate the build order correctly.  In fact, that's what I'm
going to do now.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine.  Supports Linux and Windows.
http://people.redhat.com/~rjones/virt-df/
-------------- next part --------------

--- v2v/.depend-not-all	2014-09-14 18:49:12.344487246 +0100
+++ v2v/.depend-all	2014-09-14 18:54:00.367542357 +0100
@@ -1,74 +1,74 @@
 ./DOM.cmi :
-./DOM.cmo : utils.cmo /home/rjones/d/libguestfs/mllib/common_utils.cmi ./DOM.cmi
-./DOM.cmx : utils.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmx ./DOM.cmi
+./DOM.cmo : utils.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi ./DOM.cmi ./DOM.ml
+./DOM.cmx ./DOM.o : utils.cmi utils.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmx ./DOM.cmi ./DOM.ml
 ./JSON.cmi :
-./JSON.cmo : /home/rjones/d/libguestfs/mllib/common_utils.cmi ./JSON.cmi
-./JSON.cmx : /home/rjones/d/libguestfs/mllib/common_utils.cmx ./JSON.cmi
-./cmdline.cmo : utils.cmo types.cmi output_vdsm.cmi output_rhev.cmi output_null.cmi output_local.cmi output_libvirt.cmi output_glance.cmi modules_list.cmi input_ova.cmi input_libvirtxml.cmi input_libvirt.cmi input_disk.cmi /home/rjones/d/libguestfs/mllib/config.cmo /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmo
-./cmdline.cmx : utils.cmx types.cmx output_vdsm.cmx output_rhev.cmx output_null.cmx output_local.cmx output_libvirt.cmx output_glance.cmx modules_list.cmx input_ova.cmx input_libvirtxml.cmx input_libvirt.cmx input_disk.cmx /home/rjones/d/libguestfs/mllib/config.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmx
+./JSON.cmo : /home/rjones/d/libguestfs/mllib/common_utils.cmi ./JSON.cmi ./JSON.ml
+./JSON.cmx ./JSON.o : /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmx ./JSON.cmi ./JSON.ml
+./cmdline.cmo ./cmdline.cmi : utils.cmi types.cmi output_vdsm.cmi output_rhev.cmi output_null.cmi output_local.cmi output_libvirt.cmi output_glance.cmi modules_list.cmi input_ova.cmi input_libvirtxml.cmi input_libvirt.cmi input_disk.cmi /home/rjones/d/libguestfs/mllib/config.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmi ./cmdline.ml
+./cmdline.cmx ./cmdline.o ./cmdline.cmi : utils.cmi utils.cmx types.cmi types.cmx output_vdsm.cmi output_vdsm.cmx output_rhev.cmi output_rhev.cmx output_null.cmi output_null.cmx output_local.cmi output_local.cmx output_libvirt.cmi output_libvirt.cmx output_glance.cmi output_glance.cmx modules_list.cmi modules_list.cmx input_ova.cmi input_ova.cmx input_libvirtxml.cmi input_libvirtxml.cmx input_libvirt.cmi input_libvirt.cmx input_disk.cmi input_disk.cmx /home/rjones/d/libguestfs/mllib/config.cmi /home/rjones/d/libguestfs/mllib/config.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./cmdline.ml
 ./convert_linux.cmi :
-./convert_linux.cmo : utils.cmo types.cmi modules_list.cmi lib_linux.cmi ../ocaml/guestfs.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmo ./convert_linux.cmi
-./convert_linux.cmx : utils.cmx types.cmx modules_list.cmx lib_linux.cmx ../ocaml/guestfs.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./convert_linux.cmi
+./convert_linux.cmo : utils.cmi types.cmi modules_list.cmi lib_linux.cmi ../ocaml/guestfs.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmi ./convert_linux.cmi ./convert_linux.ml
+./convert_linux.cmx ./convert_linux.o : utils.cmi utils.cmx types.cmi types.cmx modules_list.cmi modules_list.cmx lib_linux.cmi lib_linux.cmx ../ocaml/guestfs.cmi ../ocaml/guestfs.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./convert_linux.cmi ./convert_linux.ml
 ./convert_windows.cmi :
-./convert_windows.cmo : utils.cmo types.cmi /home/rjones/d/libguestfs/mllib/regedit.cmi modules_list.cmi ../ocaml/guestfs.cmi /home/rjones/d/libguestfs/customize/firstboot.cmi /home/rjones/d/libguestfs/mllib/config.cmo /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmo ./convert_windows.cmi
-./convert_windows.cmx : utils.cmx types.cmx /home/rjones/d/libguestfs/mllib/regedit.cmx modules_list.cmx ../ocaml/guestfs.cmx /home/rjones/d/libguestfs/customize/firstboot.cmx /home/rjones/d/libguestfs/mllib/config.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./convert_windows.cmi
+./convert_windows.cmo : utils.cmi types.cmi /home/rjones/d/libguestfs/mllib/regedit.cmi modules_list.cmi ../ocaml/guestfs.cmi /home/rjones/d/libguestfs/customize/firstboot.cmi /home/rjones/d/libguestfs/mllib/config.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmi ./convert_windows.cmi ./convert_windows.ml
+./convert_windows.cmx ./convert_windows.o : utils.cmi utils.cmx types.cmi types.cmx /home/rjones/d/libguestfs/mllib/regedit.cmi /home/rjones/d/libguestfs/mllib/regedit.cmx modules_list.cmi modules_list.cmx ../ocaml/guestfs.cmi ../ocaml/guestfs.cmx /home/rjones/d/libguestfs/customize/firstboot.cmi /home/rjones/d/libguestfs/customize/firstboot.cmx /home/rjones/d/libguestfs/mllib/config.cmi /home/rjones/d/libguestfs/mllib/config.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./convert_windows.cmi ./convert_windows.ml
 ./domainxml.cmi :
-./domainxml.cmo : ./domainxml.cmi
-./domainxml.cmx : ./domainxml.cmi
+./domainxml.cmo : ./domainxml.cmi ./domainxml.ml
+./domainxml.cmx ./domainxml.o : ./domainxml.cmi ./domainxml.ml
 ./input_disk.cmi : types.cmi
-./input_disk.cmo : utils.cmo types.cmi modules_list.cmi ../ocaml/guestfs.cmi /home/rjones/d/libguestfs/mllib/config.cmo /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmo ./input_disk.cmi
-./input_disk.cmx : utils.cmx types.cmx modules_list.cmx ../ocaml/guestfs.cmx /home/rjones/d/libguestfs/mllib/config.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./input_disk.cmi
+./input_disk.cmo : utils.cmi types.cmi modules_list.cmi ../ocaml/guestfs.cmi /home/rjones/d/libguestfs/mllib/config.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmi ./input_disk.cmi ./input_disk.ml
+./input_disk.cmx ./input_disk.o : utils.cmi utils.cmx types.cmi types.cmx modules_list.cmi modules_list.cmx ../ocaml/guestfs.cmi ../ocaml/guestfs.cmx /home/rjones/d/libguestfs/mllib/config.cmi /home/rjones/d/libguestfs/mllib/config.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./input_disk.cmi ./input_disk.ml
 ./input_libvirt.cmi : types.cmi
-./input_libvirt.cmo : xml.cmi utils.cmo types.cmi modules_list.cmi lib_xen.cmi lib_esx.cmi input_libvirtxml.cmi ../ocaml/guestfs.cmi domainxml.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmo ./input_libvirt.cmi
-./input_libvirt.cmx : xml.cmx utils.cmx types.cmx modules_list.cmx lib_xen.cmx lib_esx.cmx input_libvirtxml.cmx ../ocaml/guestfs.cmx domainxml.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./input_libvirt.cmi
+./input_libvirt.cmo : xml.cmi utils.cmi types.cmi modules_list.cmi lib_xen.cmi lib_esx.cmi input_libvirtxml.cmi ../ocaml/guestfs.cmi domainxml.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmi ./input_libvirt.cmi ./input_libvirt.ml
+./input_libvirt.cmx ./input_libvirt.o : xml.cmi xml.cmx utils.cmi utils.cmx types.cmi types.cmx modules_list.cmi modules_list.cmx lib_xen.cmi lib_xen.cmx lib_esx.cmi lib_esx.cmx input_libvirtxml.cmi input_libvirtxml.cmx ../ocaml/guestfs.cmi ../ocaml/guestfs.cmx domainxml.cmi domainxml.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./input_libvirt.cmi ./input_libvirt.ml
 ./input_libvirtxml.cmi : types.cmi
-./input_libvirtxml.cmo : xml.cmi utils.cmo types.cmi modules_list.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmo ./input_libvirtxml.cmi
-./input_libvirtxml.cmx : xml.cmx utils.cmx types.cmx modules_list.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./input_libvirtxml.cmi
+./input_libvirtxml.cmo : xml.cmi utils.cmi types.cmi modules_list.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmi ./input_libvirtxml.cmi ./input_libvirtxml.ml
+./input_libvirtxml.cmx ./input_libvirtxml.o : xml.cmi xml.cmx utils.cmi utils.cmx types.cmi types.cmx modules_list.cmi modules_list.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./input_libvirtxml.cmi ./input_libvirtxml.ml
 ./input_ova.cmi : types.cmi
-./input_ova.cmo : xml.cmi utils.cmo types.cmi modules_list.cmi /home/rjones/d/libguestfs/mllib/mkdtemp.cmi ../ocaml/guestfs.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmo ./input_ova.cmi
-./input_ova.cmx : xml.cmx utils.cmx types.cmx modules_list.cmx /home/rjones/d/libguestfs/mllib/mkdtemp.cmx ../ocaml/guestfs.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./input_ova.cmi
+./input_ova.cmo : xml.cmi utils.cmi types.cmi modules_list.cmi /home/rjones/d/libguestfs/mllib/mkdtemp.cmi ../ocaml/guestfs.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmi ./input_ova.cmi ./input_ova.ml
+./input_ova.cmx ./input_ova.o : xml.cmi xml.cmx utils.cmi utils.cmx types.cmi types.cmx modules_list.cmi modules_list.cmx /home/rjones/d/libguestfs/mllib/mkdtemp.cmi /home/rjones/d/libguestfs/mllib/mkdtemp.cmx ../ocaml/guestfs.cmi ../ocaml/guestfs.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./input_ova.cmi ./input_ova.ml
 ./lib_esx.cmi : xml.cmi
-./lib_esx.cmo : xml.cmi utils.cmo JSON.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmo ./lib_esx.cmi
-./lib_esx.cmx : xml.cmx utils.cmx JSON.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./lib_esx.cmi
+./lib_esx.cmo : xml.cmi utils.cmi JSON.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmi ./lib_esx.cmi ./lib_esx.ml
+./lib_esx.cmx ./lib_esx.o : xml.cmi xml.cmx utils.cmi utils.cmx JSON.cmi JSON.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./lib_esx.cmi ./lib_esx.ml
 ./lib_linux.cmi : types.cmi ../ocaml/guestfs.cmi
-./lib_linux.cmo : utils.cmo types.cmi stringMap.cmo ../ocaml/guestfs.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmo ./lib_linux.cmi
-./lib_linux.cmx : utils.cmx types.cmx stringMap.cmx ../ocaml/guestfs.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./lib_linux.cmi
+./lib_linux.cmo : utils.cmi types.cmi stringMap.cmi ../ocaml/guestfs.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmi ./lib_linux.cmi ./lib_linux.ml
+./lib_linux.cmx ./lib_linux.o : utils.cmi utils.cmx types.cmi types.cmx stringMap.cmi stringMap.cmx ../ocaml/guestfs.cmi ../ocaml/guestfs.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./lib_linux.cmi ./lib_linux.ml
 ./lib_ovf.cmi : types.cmi DOM.cmi
-./lib_ovf.cmo : utils.cmo types.cmi DOM.cmi /home/rjones/d/libguestfs/mllib/config.cmo /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmo ./lib_ovf.cmi
-./lib_ovf.cmx : utils.cmx types.cmx DOM.cmx /home/rjones/d/libguestfs/mllib/config.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./lib_ovf.cmi
+./lib_ovf.cmo : utils.cmi types.cmi DOM.cmi /home/rjones/d/libguestfs/mllib/config.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmi ./lib_ovf.cmi ./lib_ovf.ml
+./lib_ovf.cmx ./lib_ovf.o : utils.cmi utils.cmx types.cmi types.cmx DOM.cmi DOM.cmx /home/rjones/d/libguestfs/mllib/config.cmi /home/rjones/d/libguestfs/mllib/config.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./lib_ovf.cmi ./lib_ovf.ml
 ./lib_xen.cmi : xml.cmi
-./lib_xen.cmo : xml.cmi utils.cmo JSON.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmo ./lib_xen.cmi
-./lib_xen.cmx : xml.cmx utils.cmx JSON.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./lib_xen.cmi
+./lib_xen.cmo : xml.cmi utils.cmi JSON.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmi ./lib_xen.cmi ./lib_xen.ml
+./lib_xen.cmx ./lib_xen.o : xml.cmi xml.cmx utils.cmi utils.cmx JSON.cmi JSON.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./lib_xen.cmi ./lib_xen.ml
 ./modules_list.cmi : types.cmi ../ocaml/guestfs.cmi
-./modules_list.cmo : types.cmi ../ocaml/guestfs.cmi ./modules_list.cmi
-./modules_list.cmx : types.cmx ../ocaml/guestfs.cmx ./modules_list.cmi
+./modules_list.cmo : types.cmi ../ocaml/guestfs.cmi ./modules_list.cmi ./modules_list.ml
+./modules_list.cmx ./modules_list.o : types.cmi types.cmx ../ocaml/guestfs.cmi ../ocaml/guestfs.cmx ./modules_list.cmi ./modules_list.ml
 ./output_glance.cmi : types.cmi
-./output_glance.cmo : utils.cmo types.cmi modules_list.cmi /home/rjones/d/libguestfs/mllib/mkdtemp.cmi ../ocaml/guestfs.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmo ./output_glance.cmi
-./output_glance.cmx : utils.cmx types.cmx modules_list.cmx /home/rjones/d/libguestfs/mllib/mkdtemp.cmx ../ocaml/guestfs.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./output_glance.cmi
+./output_glance.cmo : utils.cmi types.cmi modules_list.cmi /home/rjones/d/libguestfs/mllib/mkdtemp.cmi ../ocaml/guestfs.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmi ./output_glance.cmi ./output_glance.ml
+./output_glance.cmx ./output_glance.o : utils.cmi utils.cmx types.cmi types.cmx modules_list.cmi modules_list.cmx /home/rjones/d/libguestfs/mllib/mkdtemp.cmi /home/rjones/d/libguestfs/mllib/mkdtemp.cmx ../ocaml/guestfs.cmi ../ocaml/guestfs.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./output_glance.cmi ./output_glance.ml
 ./output_libvirt.cmi : types.cmi DOM.cmi
-./output_libvirt.cmo : xml.cmi utils.cmo types.cmi modules_list.cmi domainxml.cmi DOM.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmo ./output_libvirt.cmi
-./output_libvirt.cmx : xml.cmx utils.cmx types.cmx modules_list.cmx domainxml.cmx DOM.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./output_libvirt.cmi
+./output_libvirt.cmo : xml.cmi utils.cmi types.cmi modules_list.cmi domainxml.cmi DOM.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmi ./output_libvirt.cmi ./output_libvirt.ml
+./output_libvirt.cmx ./output_libvirt.o : xml.cmi xml.cmx utils.cmi utils.cmx types.cmi types.cmx modules_list.cmi modules_list.cmx domainxml.cmi domainxml.cmx DOM.cmi DOM.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./output_libvirt.cmi ./output_libvirt.ml
 ./output_local.cmi : types.cmi
-./output_local.cmo : utils.cmo types.cmi output_libvirt.cmi modules_list.cmi DOM.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmo ./output_local.cmi
-./output_local.cmx : utils.cmx types.cmx output_libvirt.cmx modules_list.cmx DOM.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./output_local.cmi
+./output_local.cmo : utils.cmi types.cmi output_libvirt.cmi modules_list.cmi DOM.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmi ./output_local.cmi ./output_local.ml
+./output_local.cmx ./output_local.o : utils.cmi utils.cmx types.cmi types.cmx output_libvirt.cmi output_libvirt.cmx modules_list.cmi modules_list.cmx DOM.cmi DOM.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./output_local.cmi ./output_local.ml
 ./output_null.cmi : types.cmi
-./output_null.cmo : utils.cmo types.cmi modules_list.cmi /home/rjones/d/libguestfs/mllib/mkdtemp.cmi ../ocaml/guestfs.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmo ./output_null.cmi
-./output_null.cmx : utils.cmx types.cmx modules_list.cmx /home/rjones/d/libguestfs/mllib/mkdtemp.cmx ../ocaml/guestfs.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./output_null.cmi
+./output_null.cmo : utils.cmi types.cmi modules_list.cmi /home/rjones/d/libguestfs/mllib/mkdtemp.cmi ../ocaml/guestfs.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmi ./output_null.cmi ./output_null.ml
+./output_null.cmx ./output_null.o : utils.cmi utils.cmx types.cmi types.cmx modules_list.cmi modules_list.cmx /home/rjones/d/libguestfs/mllib/mkdtemp.cmi /home/rjones/d/libguestfs/mllib/mkdtemp.cmx ../ocaml/guestfs.cmi ../ocaml/guestfs.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./output_null.cmi ./output_null.ml
 ./output_rhev.cmi : types.cmi
-./output_rhev.cmo : utils.cmo types.cmi modules_list.cmi /home/rjones/d/libguestfs/mllib/mkdtemp.cmi lib_ovf.cmi DOM.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmo ./output_rhev.cmi
-./output_rhev.cmx : utils.cmx types.cmx modules_list.cmx /home/rjones/d/libguestfs/mllib/mkdtemp.cmx lib_ovf.cmx DOM.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./output_rhev.cmi
+./output_rhev.cmo : utils.cmi types.cmi modules_list.cmi /home/rjones/d/libguestfs/mllib/mkdtemp.cmi lib_ovf.cmi DOM.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmi ./output_rhev.cmi ./output_rhev.ml
+./output_rhev.cmx ./output_rhev.o : utils.cmi utils.cmx types.cmi types.cmx modules_list.cmi modules_list.cmx /home/rjones/d/libguestfs/mllib/mkdtemp.cmi /home/rjones/d/libguestfs/mllib/mkdtemp.cmx lib_ovf.cmi lib_ovf.cmx DOM.cmi DOM.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./output_rhev.cmi ./output_rhev.ml
 ./output_vdsm.cmi : types.cmi
-./output_vdsm.cmo : utils.cmo types.cmi output_rhev.cmi modules_list.cmi lib_ovf.cmi DOM.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmo ./output_vdsm.cmi
-./output_vdsm.cmx : utils.cmx types.cmx output_rhev.cmx modules_list.cmx lib_ovf.cmx DOM.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./output_vdsm.cmi
-./stringMap.cmo :
-./stringMap.cmx :
-./types.cmi : stringMap.cmo ../ocaml/guestfs.cmi
-./types.cmo : stringMap.cmo ../ocaml/guestfs.cmi ./types.cmi
-./types.cmx : stringMap.cmx ../ocaml/guestfs.cmx ./types.cmi
-./utils.cmo : types.cmi ../ocaml/guestfs.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmo
-./utils.cmx : types.cmx ../ocaml/guestfs.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmx
-./v2v.cmo : utils.cmo types.cmi stringMap.cmo modules_list.cmi ../ocaml/guestfs.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmo cmdline.cmo
-./v2v.cmx : utils.cmx types.cmx stringMap.cmx modules_list.cmx ../ocaml/guestfs.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmx cmdline.cmx
+./output_vdsm.cmo : utils.cmi types.cmi output_rhev.cmi modules_list.cmi lib_ovf.cmi DOM.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmi ./output_vdsm.cmi ./output_vdsm.ml
+./output_vdsm.cmx ./output_vdsm.o : utils.cmi utils.cmx types.cmi types.cmx output_rhev.cmi output_rhev.cmx modules_list.cmi modules_list.cmx lib_ovf.cmi lib_ovf.cmx DOM.cmi DOM.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./output_vdsm.cmi ./output_vdsm.ml
+./stringMap.cmo ./stringMap.cmi : ./stringMap.ml
+./stringMap.cmx ./stringMap.o ./stringMap.cmi : ./stringMap.ml
+./types.cmi : stringMap.cmi ../ocaml/guestfs.cmi
+./types.cmo : stringMap.cmi ../ocaml/guestfs.cmi ./types.cmi ./types.ml
+./types.cmx ./types.o : stringMap.cmi stringMap.cmx ../ocaml/guestfs.cmi ../ocaml/guestfs.cmx ./types.cmi ./types.ml
+./utils.cmo ./utils.cmi : types.cmi ../ocaml/guestfs.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmi ./utils.ml
+./utils.cmx ./utils.o ./utils.cmi : types.cmi types.cmx ../ocaml/guestfs.cmi ../ocaml/guestfs.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmx ./utils.ml
+./v2v.cmo ./v2v.cmi : utils.cmi types.cmi stringMap.cmi modules_list.cmi ../ocaml/guestfs.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmi cmdline.cmi ./v2v.ml
+./v2v.cmx ./v2v.o ./v2v.cmi : utils.cmi utils.cmx types.cmi types.cmx stringMap.cmi stringMap.cmx modules_list.cmi modules_list.cmx ../ocaml/guestfs.cmi ../ocaml/guestfs.cmx /home/rjones/d/libguestfs/mllib/common_utils.cmi /home/rjones/d/libguestfs/mllib/common_utils.cmx /home/rjones/d/libguestfs/mllib/common_gettext.cmi /home/rjones/d/libguestfs/mllib/common_gettext.cmx cmdline.cmi cmdline.cmx ./v2v.ml
 ./xml.cmi :
-./xml.cmo : ./xml.cmi
-./xml.cmx : ./xml.cmi
+./xml.cmo : ./xml.cmi ./xml.ml
+./xml.cmx ./xml.o : ./xml.cmi ./xml.ml
