mathql query generator interface patched

[helm.git] / helm / gTopLevel / Makefile

diff --git a/helm/gTopLevel/Makefile b/helm/gTopLevel/Makefile
index 403b8b180953895f8505ae6168c054418ce2f6d5..a94767f01c020183fb875b1746e6752062deb67f 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-mathql_interpreter
-PREDICATES = "gnome,init"
+REQUIRES = lablgtkmathview helm-cic_textual_parser helm-tex_cic_textual_parser \
+           helm-cic_proof_checking helm-xml gdome2-xslt helm-cic_unification \
+           helm-mathql helm-mathql_interpreter helm-mathql_generator \
+          helm-tactics threads hbugs-client mathml-editor
+PREDICATES = "gnome,init,glade"
 OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -pp camlp4o
-OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
-OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
+OCAMLFIND = ocamlfind
+OCAMLC = $(OCAMLFIND) ocamlc -thread $(OCAMLOPTIONS)
+OCAMLOPT = $(OCAMLFIND) ocamlopt -thread $(OCAMLOPTIONS)
 OCAMLDEP = ocamldep -pp camlp4o
 
 LIBRARIES = $(shell ocamlfind query -recursive -predicates "byte $(PREDICATES)" -format "%d/%a" $(REQUIRES))
@@ -14,24 +16,23 @@ 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 \
-          primitiveTactics.ml primitiveTactics.mli tacticals.ml tacticals.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 \
+        texTermEditor.ml texTermEditor.mli applyStylesheets.ml \
+        applyStylesheets.mli termViewer.ml termViewer.mli invokeTactics.ml \
+        invokeTactics.mli hbugs.ml hbugs.mli gTopLevel.ml
 
-TOPLEVELOBJS = xml2Gdome.cmo proofEngineTypes.cmo proofEngineHelpers.cmo \
-              proofEngineReduction.cmo proofEngineStructuralRules.cmo \
-              primitiveTactics.cmo tacticals.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 doubleTypeInference.cmo cic2acic.cmo cic2Xml.cmo \
+        proofEngine.cmo logicalOperations.cmo sequentPp.cmo \
+       mQueryLevels2.cmo misc.cmo disambiguate.cmo \
+       termEditor.cmo texTermEditor.cmo applyStylesheets.cmo termViewer.cmo \
+       invokeTactics.cmo hbugs.cmo gTopLevel.cmo
 
 depend:
        $(OCAMLDEP) $(DEPOBJS) > .depend
@@ -43,13 +44,16 @@ gTopLevel.opt: $(TOPLEVELOBJS:.cmo=.cmx) $(LIBRARIES_OPT)
        $(OCAMLOPT) -linkpkg -o gTopLevel.opt $(TOPLEVELOBJS:.cmo=.cmx)
 
 .SUFFIXES: .ml .mli .cmo .cmi .cmx
-.ml.cmo: $(LIBRARIES)
+.ml.cmo:
        $(OCAMLC) -c $<
-.mli.cmi: $(LIBRARIES)
+.mli.cmi:
        $(OCAMLC) -c $<
-.ml.cmx: $(LIBRARIES_OPT)
+.ml.cmx:
        $(OCAMLOPT) -c $<
 
+$(TOPLEVELOBJS): $(LIBRARIES)
+$(TOPLEVELOBJS:.cmo=.cmx)): $(LIBRARIES_OPT)
+
 clean:
        rm -f *.cm[iox] *.o gTopLevel gTopLevel.opt
 
@@ -61,4 +65,6 @@ uninstall:
 
 .PHONY: install uninstall clean
 
-include .depend
+ifneq ($(MAKECMDGOALS), depend)
+   include .depend   
+endif