packege dependences calculation patched

[helm.git] / helm / gTopLevel / topLevel / Makefile

diff --git a/helm/gTopLevel/topLevel/Makefile b/helm/gTopLevel/topLevel/Makefile
index 01dd0e1735154710d0ba4e477faff058249951cf..a78019a811b8982a494c87a041fef2ea93db3686 100644 (file)
--- a/helm/gTopLevel/topLevel/Makefile
+++ b/helm/gTopLevel/topLevel/Makefile
@@ -2,9 +2,10 @@ BIN_DIR = /usr/local/bin
 REQUIRES = helm-urimanager helm-cic_textual_parser helm-cic_proof_checking helm-mathql helm-mathql_interpreter
 PREDICATES =
 OCAMLOPTIONS = -I .. -package "$(REQUIRES)" -predicates "$(PREDICATES)"
+OCAMLDEPOPTIONS = $(shell ocamlfind query -recursive -predicates "$(PREDICATES)" -i-format $(REQUIRES))
 OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
 OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
-OCAMLDEP = ocamldep
+OCAMLDEP = ocamldep -I .. -I ../../ocaml/mathql_interpreter -I ../../ocaml/mathql
 
 LIBRARIES = $(shell ocamlfind query -recursive -predicates "byte $(PREDICATES)" -format "%d/%a" $(REQUIRES))
 LIBRARIES_OPT = $(shell ocamlfind query -recursive -predicates "native $(PREDICATES)" -format "%d/%a" $(REQUIRES))
@@ -14,10 +15,10 @@ opt: topLevel.opt
 
 DEPOBJS = topLevel.ml
 
-TOPLEVELOBJS = ../mQueryGenerator.cmo topLevel.cmo
+TOPLEVELOBJS = ../mQueryLevels.cmo ../mQueryGenerator.cmo topLevel.cmo
 
 depend:
-       $(OCAMLDEP) $(DEPOBJS) > .depend
+       $(OCAMLDEP) $(OCAMLDEPOPTIONS) $(DEPOBJS) > .depend
 
 topLevel: $(TOPLEVELOBJS) $(LIBRARIES)
        $(OCAMLC)  -linkpkg -o topLevel $(TOPLEVELOBJS)
@@ -44,4 +45,6 @@ uninstall:
 
 .PHONY: install uninstall clean
 
-include .depend
+ifneq ($(MAKECMDGOALS), depend)
+   include .depend   
+endif