diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index 35cba466e..fbeefc944 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -139,12 +139,13 @@ t/%.cmx: t/%.ml mlguestfs.cmxa depend: .depend -.depend: $(wildcard *.mli) $(wildcard *.ml) +.depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) rm -f $@ $@-t - $(OCAMLFIND) ocamldep $^ | \ - $(SED) -e 's/ *$$//' | \ + $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) $^ | \ + $(SED) 's/ *$$//' | \ $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ - LANG=C sort > $@-t + $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \ + sort > $@-t mv $@-t $@ -include .depend diff --git a/resize/Makefile.am b/resize/Makefile.am index 5227c2369..32c1af7e5 100644 --- a/resize/Makefile.am +++ b/resize/Makefile.am @@ -112,11 +112,12 @@ TESTS = test-virt-resize.sh utils_tests # Dependencies. depend: .depend -.depend: $(wildcard *.mli) $(wildcard *.ml) +.depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) rm -f $@ $@-t - $(OCAMLFIND) ocamldep -I ../ocaml $^ | \ + $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) $^ | \ $(SED) 's/ *$$//' | \ $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ + $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \ sort > $@-t mv $@-t $@ diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am index 4f735c8cb..4d73c942c 100644 --- a/sparsify/Makefile.am +++ b/sparsify/Makefile.am @@ -105,11 +105,12 @@ TESTS = test-virt-sparsify.sh # Dependencies. depend: .depend -.depend: $(wildcard *.mli) $(wildcard *.ml) +.depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) rm -f $@ $@-t - $(OCAMLFIND) ocamldep -I ../ocaml $^ | \ + $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) $^ | \ $(SED) 's/ *$$//' | \ $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ + $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \ sort > $@-t mv $@-t $@