Makefiles patched

diff --git a/helm/ocaml/Makefile.common.in b/helm/ocaml/Makefile.common.in
index 7d9c56d6f126a6fee8eb84f9f668d736d9932da3..e71b71942d19875be0967ec515525fa0fa32edaa 100644 (file)
--- a/helm/ocaml/Makefile.common.in
+++ b/helm/ocaml/Makefile.common.in
@@ -82,3 +82,11 @@ uninstall:
 ifneq ($(MAKECMDGOALS), depend)
    include .depend   
 endif
+
+ifeq ($(MAKECMDGOALS), all)
+   $(IMPLEMENTATION_FILES:%.ml=%.cmi): $(LIBRARIES)
+endif
+
+ifeq ($(MAKECMDGOALS), opt)
+   $(IMPLEMENTATION_FILES:%.ml=%.cmi): $(LIBRARIES_OPT)
+endif

diff --git a/helm/ocaml/Makefile.in b/helm/ocaml/Makefile.in
index 3f9fd7a3bf61ea5fec15bc8a795fababb6f71a78..aa23d24baff7835e64050145601be8536c34bd7b 100644 (file)
--- a/helm/ocaml/Makefile.in
+++ b/helm/ocaml/Makefile.in
@@ -1,7 +1,6 @@
 # Warning: the modules must be in compilation order
 MODULES = xml urimanager getter pxp cic cic_annotations cic_annotations_cache \
           cic_cache cic_proof_checking cic_textual_parser \
-         cic_textual_parser2 \
           tex_cic_textual_parser cic_unification mathql mathql_generator \
          mathql_interpreter cic_omdoc tactics cic_transformations
 

diff --git a/helm/ocaml/cic_proof_checking/.depend b/helm/ocaml/cic_proof_checking/.depend
index 2698db04ee4f24f0df2146be589b56f75c32c8f8..9249839cd7c9972d3b007acda43adc499a4f15d7 100644 (file)
--- a/helm/ocaml/cic_proof_checking/.depend
+++ b/helm/ocaml/cic_proof_checking/.depend
@@ -1,7 +1,7 @@
 cicLogger.cmo: cicLogger.cmi 
 cicLogger.cmx: cicLogger.cmi 
-cicEnvironment.cmo: cicEnvironment.cmi 
-cicEnvironment.cmx: cicEnvironment.cmi 
+cicEnvironment.cmo: cicLogger.cmi cicEnvironment.cmi 
+cicEnvironment.cmx: cicLogger.cmx cicEnvironment.cmi 
 cicPp.cmo: cicEnvironment.cmi cicPp.cmi 
 cicPp.cmx: cicEnvironment.cmx cicPp.cmi 
 cicSubstitution.cmo: cicEnvironment.cmi cicSubstitution.cmi 
@@ -16,7 +16,7 @@ cicReduction.cmo: cicEnvironment.cmi cicPp.cmi cicSubstitution.cmi \
     cicReduction.cmi 
 cicReduction.cmx: cicEnvironment.cmx cicPp.cmx cicSubstitution.cmx \
     cicReduction.cmi 
-cicTypeChecker.cmo: cicEnvironment.cmi cicPp.cmi cicReduction.cmi \
-    cicSubstitution.cmi cicTypeChecker.cmi 
-cicTypeChecker.cmx: cicEnvironment.cmx cicPp.cmx cicReduction.cmx \
-    cicSubstitution.cmx cicTypeChecker.cmi 
+cicTypeChecker.cmo: cicEnvironment.cmi cicLogger.cmi cicPp.cmi \
+    cicReduction.cmi cicSubstitution.cmi cicTypeChecker.cmi 
+cicTypeChecker.cmx: cicEnvironment.cmx cicLogger.cmx cicPp.cmx \
+    cicReduction.cmx cicSubstitution.cmx cicTypeChecker.cmi 

diff --git a/helm/ocaml/mathql_interpreter/.depend b/helm/ocaml/mathql_interpreter/.depend
index 7d9b3c6257f0e968ea03155348276c90fbf448f7..bbe2948d5e3cedf4862fdb5811b0ac9f8c186900 100644 (file)
--- a/helm/ocaml/mathql_interpreter/.depend
+++ b/helm/ocaml/mathql_interpreter/.depend
@@ -1,11 +1,9 @@
 mQIConn.cmi: mQIMap.cmi 
 mQIProperty.cmi: mQIConn.cmi 
 mQueryInterpreter.cmi: mQIConn.cmi 
-mQueryTParser.cmo: mQueryTParser.cmi 
-mQueryTParser.cmx: mQueryTParser.cmi 
-mQueryTLexer.cmo: mQueryTParser.cmi 
+mQueryTLexer.cmo: mQueryTParser.cmo 
 mQueryTLexer.cmx: mQueryTParser.cmx 
-mQueryUtil.cmo: mQueryTLexer.cmo mQueryTParser.cmi mQueryUtil.cmi 
+mQueryUtil.cmo: mQueryTLexer.cmo mQueryTParser.cmo mQueryUtil.cmi 
 mQueryUtil.cmx: mQueryTLexer.cmx mQueryTParser.cmx mQueryUtil.cmi 
 mQIUtil.cmo: mQIUtil.cmi 
 mQIUtil.cmx: mQIUtil.cmi