From: Richard Jones <rjones@redhat.com> Date: Mon, 12 Sep 2011 10:33:19 +0000 (+0100) Subject: Stable OCaml dependencies. X-Git-Tag: 1.13.12~7 X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=cbef2ffb0432756822cd2b02a305384f814e9b50;p=libguestfs.git Stable OCaml dependencies. --- diff --git a/configure.ac b/configure.ac index bec1618..a7a15a0 100644 --- 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 --- 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 17bdaca..818f1b3 100644 --- a/resize/.depend +++ b/resize/.depend @@ -1,7 +1,7 @@ -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 +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 c2fbc3a..ff10cf8 100644 --- a/resize/Makefile.am +++ b/resize/Makefile.am @@ -106,7 +106,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 $@