From: Richard W.M. Jones Date: Tue, 14 Dec 2010 15:46:53 +0000 (+0000) Subject: ocaml: Make dependencies file stable. X-Git-Tag: 0.1.0~4 X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=09ccb09f2cb7413fa2a3e3ff0c1b6740256acb0f;p=guestfs-browser.git ocaml: Make dependencies file stable. --- diff --git a/Makefile.am b/Makefile.am index cc16b78..cfab18c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -103,7 +103,9 @@ depend: .depend .depend: $(wildcard *.mli) $(wildcard *.ml) rm -f $@ $@-t - $(OCAMLFIND) ocamldep $^ > $@-t + $(OCAMLFIND) ocamldep $^ | \ + $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ + sort > $@-t mv $@-t $@ include .depend diff --git a/configure.ac b/configure.ac index 1114c6a..477fc85 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,8 @@ test "x$U" != "x" && AC_MSG_ERROR([Compiler not ANSI compliant]) AM_PROG_CC_C_O AC_SYS_LARGEFILE +AC_PROG_SED + dnl Check for OCaml compiler. AC_PROG_OCAML if test "$OCAMLOPT" = "no"; then