diff options
| author | Richard Jones <rjones@redhat.com> | 2011-09-12 11:33:19 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-09-16 15:32:49 +0100 |
| commit | c5e2c5da1f516c9328dc3bb6dcbb4022d82b4d20 (patch) | |
| tree | a5e9b7c6e60a4963b674db4a298d4c6477d572f8 | |
| parent | 1018e225ddee3d87564ed52579994867493d187a (diff) | |
| download | libguestfs-c5e2c5da1f516c9328dc3bb6dcbb4022d82b4d20.tar.gz libguestfs-c5e2c5da1f516c9328dc3bb6dcbb4022d82b4d20.tar.xz libguestfs-c5e2c5da1f516c9328dc3bb6dcbb4022d82b4d20.zip | |
Stable OCaml dependencies.
(cherry picked from commit cbef2ffb0432756822cd2b02a305384f814e9b50)
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | ocaml/Makefile.am | 5 | ||||
| -rw-r--r-- | resize/.depend | 13 | ||||
| -rw-r--r-- | resize/Makefile.am | 3 |
4 files changed, 15 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 31743cc3..2245bb72 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 8daa6717..28c13c5f 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 90a87cbc..818f1b32 100644 --- 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 93a2600f..a09f3c2a 100644 --- 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 $@ |