X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FgTopLevel%2FMakefile;h=6076d97126f29db76c3e003a255aff940a91828c;hb=11b9b274291baa8c5462b2ce3e2a5f93a39c9d57;hp=c3626bcd038c46de8fd134cf1714a6f38e8da293;hpb=7fedf47037503b281d078eef6de13927020eb410;p=helm.git

diff --git a/helm/gTopLevel/Makefile b/helm/gTopLevel/Makefile
index c3626bcd0..6076d9712 100644
--- a/helm/gTopLevel/Makefile
+++ b/helm/gTopLevel/Makefile
@@ -1,12 +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-tactics helm-mathql \
-           helm-mathql_interpreter
+REQUIRES = lablgtkmathview helm-cic_textual_parser helm-tex_cic_textual_parser \
+           helm-cic_proof_checking helm-xml gdome2-xslt helm-cic_unification \
+           helm-tactics helm-mathql helm-mathql_interpreter \
+           helm-mquery_generator threads hbugs-client mathml-editor
 PREDICATES = "gnome,init,glade"
 OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -pp camlp4o
 OCAMLFIND = ocamlfind
-OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLOPTIONS)
-OCAMLOPT = $(OCAMLFIND) ocamlopt $(OCAMLOPTIONS)
+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))
@@ -22,13 +23,16 @@ 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
+        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 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
+	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
@@ -40,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
 
@@ -58,4 +65,6 @@ uninstall:
 
 .PHONY: install uninstall clean
 
-include .depend
+ifneq ($(MAKECMDGOALS), depend)
+   include .depend   
+endif