X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2FgTopLevel%2FMakefile;h=9cba34bc70c771b0f3186d85937bc37e0ab339ee;hb=9766d606b71ec69594919ca34b067e268afeabf0;hp=b4446b8f35d5ae64e36625a88828c5f5064a4acc;hpb=845407985feddc9974cac58ba93e6743a4db95c5;p=helm.git

diff --git a/helm/gTopLevel/Makefile b/helm/gTopLevel/Makefile
index b4446b8f3..9cba34bc7 100644
--- a/helm/gTopLevel/Makefile
+++ b/helm/gTopLevel/Makefile
@@ -1,5 +1,6 @@
 BIN_DIR = /usr/local/bin
 TEST_REQUIRES = \
+	helm-registry \
 	helm-mathql_interpreter \
 	helm-mathql_generator \
 	helm-tactics \
@@ -14,11 +15,12 @@ REQUIRES = \
 	gdome2-xslt \
 	hbugs-client
 PREDICATES = "gnome,init,glade"
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -pp camlp4o
+OCAMLOPTIONS = \
+	-package "$(REQUIRES)" -predicates "$(PREDICATES)" -pp camlp4o -thread
 OCAMLFIND = ocamlfind
 OCAMLDEBUGOPTIONS = -g
 OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLDEBUGOPTIONS) $(OCAMLOPTIONS)
-OCAMLOPT = $(OCAMLFIND) opt $(OCAMLOPTIONS)
+OCAMLOPT = $(OCAMLFIND) ocamlopt $(OCAMLOPTIONS)
 OCAMLDEP = $(OCAMLFIND) ocamldep -pp camlp4o
 OCAMLDEBUG = wowcamldebug
 
@@ -47,7 +49,8 @@ INTERFACE_FILES = \
 	termViewer.mli \
 	invokeTactics.mli \
 	hbugs.mli \
-  	chosenTermEditor.mli 
+  	chosenTermEditor.mli \
+	helmGtkLogger.mli
 
 DEPOBJS = \
 	$(INTERFACE_FILES) $(INTERFACE_FILES:%.mli=%.ml) \
@@ -82,17 +85,17 @@ gTopLevel.opt: $(TOPLEVELOBJS:.cmo=.cmx) $(LIBRARIES_OPT)
 	$(OCAMLOPT) -thread -linkpkg -o $@ $(TOPLEVELOBJS:.cmo=.cmx)
 
 testlibrary: $(TESTLIBOBJS) $(TEST_LIBRARIES)
-	$(OCAMLFIND) ocamlc $(OCAMLDEBUGOPTIONS) -linkpkg \
+	$(OCAMLFIND) ocamlc -thread $(OCAMLDEBUGOPTIONS) -linkpkg \
 		-package "$(TEST_REQUIRES)" -o $@ $(TESTLIBOBJS)
 testlibrary.opt: $(TESTLIBOBJS:.cmo=.cmx) $(TEST_LIBRARIES_OPT)
-	$(OCAMLFIND) opt -linkpkg -package "$(TEST_REQUIRES)" -o $@ \
+	$(OCAMLFIND) ocamlopt -thread -linkpkg -package "$(TEST_REQUIRES)" -o $@ \
 		$(TESTLIBOBJS:.cmo=.cmx)
 
 regtest: $(REGTESTOBJS) $(TEST_LIBRARIES)
-	$(OCAMLFIND) ocamlc $(OCAMLDEBUGOPTIONS) -linkpkg \
+	$(OCAMLFIND) ocamlc -thread $(OCAMLDEBUGOPTIONS) -linkpkg \
 		-package "$(TEST_REQUIRES)" -o $@ $(REGTESTOBJS)
 regtest.opt: $(REGTESTOBJS:.cmo=.cmx) $(TEST_LIBRARIES_OPT)
-	$(OCAMLOPT) opt -linkpkg -package "$(TEST_REQUIRES)" -o $@ \
+	$(OCAMLFIND) ocamlopt -thread -linkpkg -package "$(TEST_REQUIRES)" -o $@ \
 		$(REGTESTOBJS:.cmo=.cmx)
 
 .SUFFIXES: .ml .mli .cmo .cmi .cmx
@@ -124,10 +127,16 @@ tests/%.cic.test: tests/%.cic regtest
 	time ./regtest -gen $<
 test: regtest
 	./regtest $(INTESTS) 2> /dev/null
+test.opt: regtest.opt
+	./regtest.opt $(INTESTS) 2> /dev/null
 envtest: regtest
 	./regtest -dump $(INTESTS) 2> /dev/null
-librarytest: testlibrary.opt
-	./testlibrary.opt index.txt 2>/dev/null >LOG &
+envtest.opt: regtest.opt
+	./regtest.opt -dump $(INTESTS) 2> /dev/null
+librarytest: testlibrary
+	./testlibrary -vars -varsprefix cic:/Coq index.txt 2>/dev/null >LOG &
+librarytest.opt: testlibrary.opt
+	./testlibrary.opt -vars -varsprefix cic:/Coq index.txt 2>/dev/null >LOG &
 
 MAIN = ./gTopLevel
 ARGS =