Stable OCaml dependencies.

(cherry picked from commit cbef2ffb0432756822cd2b02a305384f814e9b50)

diff --git a/configure.ac b/configure.ac
index 31743cc..2245bb7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -69,6 +69,8 @@ gl_INIT
 
 AC_PROG_LIBTOOL
 
+AC_PROG_SED
+
 dnl Check for basic C environment.
 AC_PROG_CC_STDC
 AC_PROG_INSTALL

diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index 8daa671..28c13c5 100644 (file)
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -135,7 +135,10 @@ depend: .depend
 
 .depend: $(wildcard *.mli) $(wildcard *.ml)
        rm -f $@ $@-t
-       $(OCAMLFIND) ocamldep $^ | sed 's/  *$$//' | sort > $@-t
+       $(OCAMLFIND) ocamldep $^ | \
+         $(SED) 's/ *$$//' | \
+         $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
+         sort > $@-t
        mv $@-t $@
 
 include .depend

diff --git a/resize/.depend b/resize/.depend
index 90a87cb..818f1b3 100644 (file)
--- a/resize/.depend
+++ b/resize/.depend
@@ -1,6 +1,7 @@
-progress.cmo: utils.cmo ../ocaml/guestfs.cmi
-progress.cmx: utils.cmx ../ocaml/guestfs.cmx
-resize.cmo: utils.cmo progress.cmo ../ocaml/guestfs.cmi
-resize.cmx: utils.cmx progress.cmx ../ocaml/guestfs.cmx
-utils.cmo: ../ocaml/guestfs.cmi
-utils.cmx: ../ocaml/guestfs.cmx
+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:

diff --git a/resize/Makefile.am b/resize/Makefile.am
index 93a2600..a09f3c2 100644 (file)
--- a/resize/Makefile.am
+++ b/resize/Makefile.am
@@ -93,7 +93,8 @@ depend: .depend
 
 .depend: $(wildcard *.mli) $(wildcard *.ml)
        rm -f $@ $@-t
-       $(OCAMLFIND) ocamldep $(OCAMLPACKAGES) $^ | \
+       $(OCAMLFIND) ocamldep $^ | \
+         $(SED) 's/ *$$//' | \
          $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
          sort > $@-t
        mv $@-t $@