From 65822315109cdb1e0079d687ce0d59fdfd6d83f2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 2 Sep 2014 09:05:12 +0100 Subject: [PATCH] generator: Don't use ocamldep -all option in this directory. ocamldep -all (introduced in commit a3881445efd0) creates a dependency rule optgroups.cmi ... : utils.cmx ... Because we never build a native code version of the generator, utils.cmx can never be remade, and so this results in optgroups.cmi being always rebuilt and hence rebuilding the whole directory. It's unclear how to fix this, but reverting the ocamldep -all change in this directory works around it. Partially reverts commit a3881445efd04d5fe6da29db8b2d62a30088b9d1. --- generator/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator/Makefile.am b/generator/Makefile.am index 15308be48..3716c7702 100644 --- a/generator/Makefile.am +++ b/generator/Makefile.am @@ -116,7 +116,7 @@ depend: .depend .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) rm -f $@ $@-t - $(OCAMLFIND) ocamldep -all -I ../ocaml -I $(abs_srcdir) $^ | \ + $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) $^ | \ $(SED) 's/ *$$//' | \ $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \