summaryrefslogtreecommitdiffstats
path: root/resize
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2011-10-25 14:14:35 +0100
committerRichard W.M. Jones <rjones@redhat.com>2011-10-25 14:16:47 +0100
commit663b99950daeaa2b023520aae756a3a28969c493 (patch)
tree4dd7ee8990d958810bf9149dc0707cefafb515e9 /resize
parent51672634fddc20095adc1300e0bfee2c99c604f5 (diff)
downloadlibguestfs-663b99950daeaa2b023520aae756a3a28969c493.tar.gz
libguestfs-663b99950daeaa2b023520aae756a3a28969c493.tar.xz
libguestfs-663b99950daeaa2b023520aae756a3a28969c493.zip
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.
Diffstat (limited to 'resize')
-rw-r--r--resize/.depend14
-rw-r--r--resize/Makefile.am2
2 files changed, 8 insertions, 8 deletions
diff --git a/resize/.depend b/resize/.depend
index 818f1b32..17bdaca7 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 ff10cf8e..e8ffff0f 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