summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard Jones <rjones@redhat.com>2011-09-12 10:07:31 +0100
committerRichard Jones <rjones@redhat.com>2011-09-12 10:09:59 +0100
commit3e6927876b64665fa8a2259707052aec1ff2ef5d (patch)
tree907b5cca32c38930b98a95f4a77fe660cce4b4a1 /src
parent7189eb48dd8f46049d982f1d99e158609409019f (diff)
downloadfebootstrap-3e6927876b64665fa8a2259707052aec1ff2ef5d.tar.gz
febootstrap-3e6927876b64665fa8a2259707052aec1ff2ef5d.tar.xz
febootstrap-3e6927876b64665fa8a2259707052aec1ff2ef5d.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/.depend32
-rw-r--r--src/Makefile.am5
2 files changed, 15 insertions, 22 deletions
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