From: Richard Jones <rjones@redhat.com>
Date: Mon, 12 Sep 2011 09:07:31 +0000 (+0100)
Subject: Stable OCaml dependencies.
X-Git-Tag: 3.11~11
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=3e6927876b64665fa8a2259707052aec1ff2ef5d;p=febootstrap.git

Stable OCaml dependencies.

This technique copied from libguestfs/resize/Makefile.am and modified
so that it works with old ocamldep that used to add spaces at the end
of lines.
---

diff --git a/configure.ac b/configure.ac
index 46039da..a75a581 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,9 @@ AC_SYS_LARGEFILE
 
 gl_INIT
 
+# Define $(SED).
+AC_PROG_SED
+
 # OCaml and ocamlfind are required to compile.
 AC_PROG_OCAML
 if test "$OCAMLC" = "no"; then
diff --git a/src/.depend b/src/.depend
index e71f272..33b1cfb 100644
--- a/src/.depend
+++ b/src/.depend
@@ -3,27 +3,17 @@ config.cmx:
 febootstrap_cmdline.cmi:
 febootstrap_cmdline.cmo: config.cmo febootstrap_cmdline.cmi
 febootstrap_cmdline.cmx: config.cmx febootstrap_cmdline.cmi
+febootstrap.cmo: febootstrap_utils.cmi febootstrap_package_handlers.cmi febootstrap_cmdline.cmi config.cmo
+febootstrap.cmx: febootstrap_utils.cmx febootstrap_package_handlers.cmx febootstrap_cmdline.cmx config.cmx
+febootstrap_debian.cmo: febootstrap_utils.cmi febootstrap_package_handlers.cmi febootstrap_cmdline.cmi config.cmo
+febootstrap_debian.cmx: febootstrap_utils.cmx febootstrap_package_handlers.cmx febootstrap_cmdline.cmx config.cmx
+febootstrap_package_handlers.cmi:
+febootstrap_package_handlers.cmo: febootstrap_utils.cmi febootstrap_cmdline.cmi febootstrap_package_handlers.cmi
+febootstrap_package_handlers.cmx: febootstrap_utils.cmx febootstrap_cmdline.cmx febootstrap_package_handlers.cmi
+febootstrap_pacman.cmo: febootstrap_utils.cmi febootstrap_package_handlers.cmi febootstrap_cmdline.cmi config.cmo
+febootstrap_pacman.cmx: febootstrap_utils.cmx febootstrap_package_handlers.cmx febootstrap_cmdline.cmx config.cmx
 febootstrap_utils.cmi:
 febootstrap_utils.cmo: febootstrap_cmdline.cmi febootstrap_utils.cmi
 febootstrap_utils.cmx: febootstrap_cmdline.cmx febootstrap_utils.cmi
-febootstrap_package_handlers.cmi:
-febootstrap_package_handlers.cmo: febootstrap_utils.cmi \
-    febootstrap_cmdline.cmi febootstrap_package_handlers.cmi
-febootstrap_package_handlers.cmx: febootstrap_utils.cmx \
-    febootstrap_cmdline.cmx febootstrap_package_handlers.cmi
-febootstrap_yum_rpm.cmo: febootstrap_utils.cmi \
-    febootstrap_package_handlers.cmi febootstrap_cmdline.cmi config.cmo
-febootstrap_yum_rpm.cmx: febootstrap_utils.cmx \
-    febootstrap_package_handlers.cmx febootstrap_cmdline.cmx config.cmx
-febootstrap_debian.cmo: febootstrap_utils.cmi \
-    febootstrap_package_handlers.cmi febootstrap_cmdline.cmi config.cmo
-febootstrap_debian.cmx: febootstrap_utils.cmx \
-    febootstrap_package_handlers.cmx febootstrap_cmdline.cmx config.cmx
-febootstrap_pacman.cmo: febootstrap_utils.cmi \
-    febootstrap_package_handlers.cmi febootstrap_cmdline.cmi config.cmo
-febootstrap_pacman.cmx: febootstrap_utils.cmx \
-    febootstrap_package_handlers.cmx febootstrap_cmdline.cmx config.cmx
-febootstrap.cmo: febootstrap_utils.cmi febootstrap_package_handlers.cmi \
-    febootstrap_cmdline.cmi config.cmo
-febootstrap.cmx: febootstrap_utils.cmx febootstrap_package_handlers.cmx \
-    febootstrap_cmdline.cmx config.cmx
+febootstrap_yum_rpm.cmo: febootstrap_utils.cmi febootstrap_package_handlers.cmi febootstrap_cmdline.cmi config.cmo
+febootstrap_yum_rpm.cmx: febootstrap_utils.cmx febootstrap_package_handlers.cmx febootstrap_cmdline.cmx config.cmx
diff --git a/src/Makefile.am b/src/Makefile.am
index b715c9f..2bcad79 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -73,7 +73,10 @@ depend: .depend
 
 .depend: $(SOURCES)
 	rm -f $@ $@-t
-	$(OCAMLFIND) ocamldep $^ > $@-t
+	$(OCAMLFIND) ocamldep $^ | \
+	  $(SED) 's/ *$$//' | \
+	  $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
+	  sort > $@-t
 	mv $@-t $@
 
 include .depend