From: Richard W.M. Jones <rjones@redhat.com>
Date: Tue, 25 Oct 2011 13:14:35 +0000 (+0100)
Subject: ocaml: Make sure virt-resize is rebuilt if Guestfs API changes.
X-Git-Tag: 1.12.9~5
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=3e46467249bb9359ed65bce489781dbfa8ba8a5c;p=libguestfs.git

ocaml: Make sure virt-resize is rebuilt if Guestfs API changes.

Add a dependency so this tool is 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.
(cherry picked from commit 663b99950daeaa2b023520aae756a3a28969c493)
---

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 a09f3c2..f2a8e46 100644
--- a/resize/Makefile.am
+++ b/resize/Makefile.am
@@ -93,7 +93,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