From 663b99950daeaa2b023520aae756a3a28969c493 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 25 Oct 2011 14:14:35 +0100
Subject: [PATCH] ocaml: Make sure virt-resize, virt-sparsify are rebuilt if
 Guestfs API changes.

Add a dependency so these tools are rebuilt from scratch if the
Guestfs API changes.  This prevents the error:
"[...] make inconsistent assumptions over interface Guestfs".

This commit includes the generated changes to .depend files.
---
 resize/.depend       | 14 +++++++-------
 resize/Makefile.am   |  2 +-
 sparsify/.depend     | 14 +++++++-------
 sparsify/Makefile.am |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/resize/.depend b/resize/.depend
index 818f1b3..17bdaca 100644
--- a/resize/.depend
+++ b/resize/.depend
@@ -1,7 +1,7 @@
-progress.cmi:
-progress.cmo: utils.cmo progress.cmi
-progress.cmx: utils.cmx progress.cmi
-resize.cmo: utils.cmo progress.cmi
-resize.cmx: utils.cmx progress.cmx
-utils.cmo:
-utils.cmx:
+progress.cmi: ../ocaml/guestfs.cmi
+progress.cmo: utils.cmo ../ocaml/guestfs.cmi progress.cmi
+progress.cmx: utils.cmx ../ocaml/guestfs.cmx progress.cmi
+resize.cmo: utils.cmo progress.cmi ../ocaml/guestfs.cmi
+resize.cmx: utils.cmx progress.cmx ../ocaml/guestfs.cmx
+utils.cmo: ../ocaml/guestfs.cmi
+utils.cmx: ../ocaml/guestfs.cmx
diff --git a/resize/Makefile.am b/resize/Makefile.am
index ff10cf8..e8ffff0 100644
--- a/resize/Makefile.am
+++ b/resize/Makefile.am
@@ -106,7 +106,7 @@ depend: .depend
 
 .depend: $(wildcard *.mli) $(wildcard *.ml)
 	rm -f $@ $@-t
-	$(OCAMLFIND) ocamldep $^ | \
+	$(OCAMLFIND) ocamldep -I ../ocaml $^ | \
 	  $(SED) 's/ *$$//' | \
 	  $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
 	  sort > $@-t
diff --git a/sparsify/.depend b/sparsify/.depend
index 9b7f865..a6c60a9 100644
--- a/sparsify/.depend
+++ b/sparsify/.depend
@@ -1,7 +1,7 @@
-progress.cmi:
-progress.cmo: utils.cmo progress.cmi
-progress.cmx: utils.cmx progress.cmi
-sparsify.cmo: utils.cmo progress.cmi
-sparsify.cmx: utils.cmx progress.cmx
-utils.cmo:
-utils.cmx:
+progress.cmi: ../ocaml/guestfs.cmi
+progress.cmo: utils.cmo ../ocaml/guestfs.cmi progress.cmi
+progress.cmx: utils.cmx ../ocaml/guestfs.cmx progress.cmi
+sparsify.cmo: utils.cmo progress.cmi ../ocaml/guestfs.cmi
+sparsify.cmx: utils.cmx progress.cmx ../ocaml/guestfs.cmx
+utils.cmo: ../ocaml/guestfs.cmi
+utils.cmx: ../ocaml/guestfs.cmx
diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am
index 7d950b4..ab90818 100644
--- a/sparsify/Makefile.am
+++ b/sparsify/Makefile.am
@@ -105,7 +105,7 @@ depend: .depend
 
 .depend: $(wildcard *.mli) $(wildcard *.ml)
 	rm -f $@ $@-t
-	$(OCAMLFIND) ocamldep $^ | \
+	$(OCAMLFIND) ocamldep -I ../ocaml $^ | \
 	  $(SED) 's/ *$$//' | \
 	  $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
 	  sort > $@-t
-- 
1.8.3.1