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.

diff --git a/ocaml/.depend b/ocaml/.depend
index 5074667..2a582db 100644 (file)
--- 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 1aa0cb6..d65ebaa 100644 (file)
--- 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