packege dependences calculation patched

[helm.git] / helm / gTopLevel / Makefile

diff --git a/helm/gTopLevel/Makefile b/helm/gTopLevel/Makefile
index c3626bcd038c46de8fd134cf1714a6f38e8da293..5f630f23c7f05187b48fab150a397304fad33b88 100644 (file)
--- a/helm/gTopLevel/Makefile
+++ b/helm/gTopLevel/Makefile
@@ -4,6 +4,7 @@ REQUIRES = lablgtkmathview helm-cic_textual_parser helm-cic_proof_checking \
            helm-mathql_interpreter
 PREDICATES = "gnome,init,glade"
 OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -pp camlp4o
+OCAMLDEPOPTIONS = $(shell ocamlfind query -recursive -predicates "$(PREDICATES)" -i-format $(REQUIRES))
 OCAMLFIND = ocamlfind
 OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLOPTIONS)
 OCAMLOPT = $(OCAMLFIND) ocamlopt $(OCAMLOPTIONS)
@@ -22,16 +23,18 @@ DEPOBJS = \
        sequentPp.ml sequentPp.mli mQueryGenerator.mli mQueryLevels.ml \
        mQueryLevels2.mli mQueryLevels2.ml mQueryGenerator.ml misc.ml misc.mli \
         disambiguate.ml disambiguate.mli termEditor.ml termEditor.mli \
-        applyStylesheets.ml applyStylesheets.mli gTopLevel.ml
+        applyStylesheets.ml applyStylesheets.mli termViewer.ml \
+        termViewer.mli invokeTactics.ml invokeTactics.mli gTopLevel.ml
 
 TOPLEVELOBJS = \
        xml2Gdome.cmo proofEngine.cmo doubleTypeInference.cmo cic2acic.cmo \
        cic2Xml.cmo logicalOperations.cmo sequentPp.cmo mQueryLevels.cmo \
        mQueryLevels2.cmo mQueryGenerator.cmo misc.cmo disambiguate.cmo \
-       termEditor.cmo applyStylesheets.cmo gTopLevel.cmo
+       termEditor.cmo applyStylesheets.cmo termViewer.cmo invokeTactics.cmo \
+        gTopLevel.cmo
 
 depend:
-       $(OCAMLDEP) $(DEPOBJS) > .depend
+       $(OCAMLDEP) $(OCAMLDEPOPTIONS) $(DEPOBJS) > .depend
 
 gTopLevel: $(TOPLEVELOBJS) $(LIBRARIES)
        $(OCAMLC) -linkpkg -o gTopLevel $(TOPLEVELOBJS)
@@ -58,4 +61,6 @@ uninstall:
 
 .PHONY: install uninstall clean
 
-include .depend
+ifneq ($(MAKECMDGOALS), depend)
+   include .depend   
+endif