summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2009-08-04 13:55:51 +0200
committerJim Meyering <meyering@redhat.com>2009-08-04 14:26:28 +0200
commitdc3d0e3b8ed8e77b1314f09d116ed97f6a440914 (patch)
treecde385dbc5100036988f69ade6b863737bd4253d
parentfebff9d2a35c4f40abbaf8943146476bdeac671e (diff)
downloadlibguestfs-dc3d0e3b8ed8e77b1314f09d116ed97f6a440914.tar.gz
libguestfs-dc3d0e3b8ed8e77b1314f09d116ed97f6a440914.tar.xz
libguestfs-dc3d0e3b8ed8e77b1314f09d116ed97f6a440914.zip
build: don't emit trailing blanks, remove generated file
* ocaml/Makefile.am (.depend): Don't redirect directly to $@. Filter out trailing blanks. * ocaml/.depend: Regenerate.
-rw-r--r--ocaml/.depend10
-rw-r--r--ocaml/Makefile.am5
2 files changed, 8 insertions, 7 deletions
diff --git a/ocaml/.depend b/ocaml/.depend
index 50746674..2a582db6 100644
--- a/ocaml/.depend
+++ b/ocaml/.depend
@@ -1,5 +1,5 @@
-guestfs.cmi:
-bindtests.cmo: guestfs.cmi
-bindtests.cmx: guestfs.cmx
-guestfs.cmo: guestfs.cmi
-guestfs.cmx: guestfs.cmi
+guestfs.cmi:
+bindtests.cmo: guestfs.cmi
+bindtests.cmx: guestfs.cmx
+guestfs.cmo: guestfs.cmi
+guestfs.cmx: guestfs.cmi
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index 1aa0cb6a..d65ebaaf 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -94,8 +94,9 @@ t/%.cmx: t/%.ml mlguestfs.cmxa
depend: .depend
.depend: $(wildcard *.mli) $(wildcard *.ml)
- rm -f .depend
- $(OCAMLFIND) ocamldep $^ > $@
+ rm -f $@ $@-t
+ $(OCAMLFIND) ocamldep $^ | sed 's/ *$$//' > $@-t
+ mv $@-t $@
include .depend