CicCache ==> CicEnvironment (in testlibrary.ml)

[helm.git] / helm / gTopLevel / Makefile

diff --git a/helm/gTopLevel/Makefile b/helm/gTopLevel/Makefile
index 3175bbea7a2c2294a3edc0b844e237b3affd5cd6..b4446b8f35d5ae64e36625a88828c5f5064a4acc 100644 (file)
--- a/helm/gTopLevel/Makefile
+++ b/helm/gTopLevel/Makefile
@@ -8,13 +8,11 @@ TEST_REQUIRES = \
        helm-cic_textual_parser \
        helm-tex_cic_textual_parser \
        mathml-editor \
-       lablgtkmathview \
-       helm-cic_cache
+       lablgtkmathview
 REQUIRES = \
        $(TEST_REQUIRES) \
        gdome2-xslt \
-       hbugs-client \
-       helm-cic_cache
+       hbugs-client
 PREDICATES = "gnome,init,glade"
 OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -pp camlp4o
 OCAMLFIND = ocamlfind
@@ -38,22 +36,30 @@ stop:
        $(MAKE) -C ../hbugs/ stop
 
 INTERFACE_FILES = \
-       proofEngine.mli logicalOperations.mli oldDisambiguate.mli \
-  disambiguatingParser.mli termEditor.mli texTermEditor.mli xmlDiff.mli \
-  chosenTransformer.mli termViewer.mli invokeTactics.mli hbugs.mli \
-  chosenTermEditor.mli 
+       proofEngine.mli \
+       logicalOperations.mli \
+       oldDisambiguate.mli \
+       disambiguatingParser.mli \
+       termEditor.mli \
+       texTermEditor.mli \
+       xmlDiff.mli \
+       chosenTransformer.mli \
+       termViewer.mli \
+       invokeTactics.mli \
+       hbugs.mli \
+       chosenTermEditor.mli 
 
 DEPOBJS = \
        $(INTERFACE_FILES) $(INTERFACE_FILES:%.mli=%.ml) \
        gTopLevel.ml regtest.ml testlibrary.ml batchParser.ml batchParser.mli
 
 TOPLEVELOBJS = $(INTERFACE_FILES:%.mli=%.cmo) gTopLevel.cmo
-REGTESTOBJS = \
+TESTOBJS = \
        oldDisambiguate.cmo \
        disambiguatingParser.cmo \
-       batchParser.cmo \
-       regtest.cmo
-TESTLIBOBJS = testlibrary.cmo
+       batchParser.cmo
+REGTESTOBJS = $(TESTOBJS) regtest.cmo
+TESTLIBOBJS = $(TESTOBJS) testlibrary.cmo
 
 $(INTERFACE_FILES:%.mli=%.cmo): $(LIBRARIES)
 $(INTERFACE_FILES:%.mli=%.cmx): $(LIBRARIES_OPT)
@@ -121,7 +127,7 @@ test: regtest
 envtest: regtest
        ./regtest -dump $(INTESTS) 2> /dev/null
 librarytest: testlibrary.opt
-       ./testlibrary.opt - <index.txt 2>/dev/null >LOG &
+       ./testlibrary.opt index.txt 2>/dev/null >LOG &
 
 MAIN = ./gTopLevel
 ARGS =
@@ -133,7 +139,7 @@ debug:
        echo "install_printer CicMetaSubst.fppsubst" >> .debug_script
        echo "install_printer CicMetaSubst.fppterm" >> .debug_script
        echo "install_printer CicMetaSubst.fppmetasenv" >> .debug_script
-       $(OCAMLDEBUG) \
+       ledit $(OCAMLDEBUG) \
                -source .debug_script \
                $(shell $(OCAMLFIND) query -recursive -i-format $(REQUIRES)) \
                $(MAIN) $(ARGS)