package dependences calulation fixed

[helm.git] / helm / gTopLevel / Makefile

diff --git a/helm/gTopLevel/Makefile b/helm/gTopLevel/Makefile
index 200305cbe415ef5326a865f4c3bfe6989a92ab8f..bac191eb10cab92b7380d8de407175d4f8fa94c3 100644 (file)
--- a/helm/gTopLevel/Makefile
+++ b/helm/gTopLevel/Makefile
@@ -1,11 +1,13 @@
 BIN_DIR = /usr/local/bin
 REQUIRES = lablgtkmathview helm-cic_textual_parser helm-cic_proof_checking \
-           helm-xml gdome2-xslt helm-cic_unification helm-mathql \
+           helm-xml gdome2-xslt helm-cic_unification helm-tactics helm-mathql \
            helm-mathql_interpreter
-PREDICATES = "gnome,init"
+PREDICATES = "gnome,init,glade"
 OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -pp camlp4o
-OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
-OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
+OCAMLDEPOPTIONS = $(shell ocamlfind query -recursive -predicates "$(PREDICATES)" -i-format $(REQUIRES))
+OCAMLFIND = ocamlfind
+OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLOPTIONS)
+OCAMLOPT = $(OCAMLFIND) ocamlopt $(OCAMLOPTIONS)
 OCAMLDEP = ocamldep -pp camlp4o
 
 LIBRARIES = $(shell ocamlfind query -recursive -predicates "byte $(PREDICATES)" -format "%d/%a" $(REQUIRES))
@@ -14,29 +16,25 @@ LIBRARIES_OPT = $(shell ocamlfind query -recursive -predicates "native $(PREDICA
 all: gTopLevel
 opt: gTopLevel.opt
 
-DEPOBJS = xml2Gdome.ml xml2Gdome.mli proofEngineTypes.ml proofEngineHelpers.ml \
-         proofEngineReduction.ml proofEngineReduction.mli \
-          proofEngineStructuralRules.ml proofEngineStructuralRules.mli \
-          tacticals.ml tacticals.mli reductionTactics.ml reductionTactics.mli \
-          primitiveTactics.ml primitiveTactics.mli variousTactics.ml variousTactics.mli \
-          ring.ml ring.mli fourier.ml fourierR.ml fourierR.mli\
-         proofEngine.ml proofEngine.mli \
-          doubleTypeInference.ml doubleTypeInference.mli cic2acic.ml \
-          cic2acic.mli cic2Xml.ml cic2Xml.mli logicalOperations.ml \
-          logicalOperations.mli sequentPp.ml sequentPp.mli mQueryGenerator.mli \
-          mQueryGenerator.ml gTopLevel.ml
+DEPOBJS = \
+       xml2Gdome.ml xml2Gdome.mli proofEngine.ml proofEngine.mli \
+       doubleTypeInference.ml doubleTypeInference.mli cic2acic.ml cic2acic.mli\
+       cic2Xml.ml cic2Xml.mli logicalOperations.ml logicalOperations.mli \
+       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 termViewer.ml \
+        termViewer.mli invokeTactics.ml invokeTactics.mli gTopLevel.ml
 
-TOPLEVELOBJS = xml2Gdome.cmo proofEngineTypes.cmo proofEngineHelpers.cmo \
-              proofEngineReduction.cmo proofEngineStructuralRules.cmo \
-               tacticals.cmo reductionTactics.cmo primitiveTactics.cmo \
-               variousTactics.cmo \
-               ring.cmo fourier.cmo fourierR.cmo proofEngine.cmo \
-               doubleTypeInference.cmo cic2acic.cmo cic2Xml.cmo \
-               logicalOperations.cmo sequentPp.cmo mQueryGenerator.cmo \
-                  gTopLevel.cmo
+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 termViewer.cmo invokeTactics.cmo \
+        gTopLevel.cmo
 
 depend:
-       $(OCAMLDEP) $(DEPOBJS) > .depend
+       $(OCAMLDEP) $(OCAMLDEPOPTIONS) $(DEPOBJS) > .depend
 
 gTopLevel: $(TOPLEVELOBJS) $(LIBRARIES)
        $(OCAMLC) -linkpkg -o gTopLevel $(TOPLEVELOBJS)