Matitaweb: Fixed long-time bug with dependencies and makefiles.

diff --git a/matitaB/components/content/.depend.opt b/matitaB/components/content/.depend.opt
index 34a327264c78f0574a21439a20b51f42b849ff21..381a803a929ef108889f0b24d9695ac33d33aba7 100644 (file)
--- a/matitaB/components/content/.depend.opt
+++ b/matitaB/components/content/.depend.opt
@@ -1,14 +1,13 @@
-content.cmi: 
 notationUtil.cmi: notationPt.cmx 
 notationEnv.cmi: notationPt.cmx 
 notationPp.cmi: notationPt.cmx notationEnv.cmi 
 notationPt.cmo: 
 notationPt.cmx: 
-content.cmo: content.cmi 
-content.cmx: content.cmi 
 notationUtil.cmo: notationPt.cmx notationUtil.cmi 
 notationUtil.cmx: notationPt.cmx notationUtil.cmi 
 notationEnv.cmo: notationUtil.cmi notationPt.cmx notationEnv.cmi 
 notationEnv.cmx: notationUtil.cmx notationPt.cmx notationEnv.cmi 
-notationPp.cmo: notationPt.cmx notationEnv.cmi notationPp.cmi 
-notationPp.cmx: notationPt.cmx notationEnv.cmx notationPp.cmi 
+notationPp.cmo: notationUtil.cmi notationPt.cmx notationEnv.cmi \
+    notationPp.cmi 
+notationPp.cmx: notationUtil.cmx notationPt.cmx notationEnv.cmx \
+    notationPp.cmi 

diff --git a/matitaB/components/content_pres/.depend.opt b/matitaB/components/content_pres/.depend.opt
index 5c11c1ded8262405d4b965fa534115da4d9f00c3..3a1c6036def82f4c2465eccb66b5ffff80032fcb 100644 (file)
--- a/matitaB/components/content_pres/.depend.opt
+++ b/matitaB/components/content_pres/.depend.opt
@@ -1,38 +1,26 @@
-renderingAttrs.cmi: 
 cicNotationLexer.cmi: 
+smallLexer.cmi: 
 cicNotationParser.cmi: 
-mpresentation.cmi: 
 box.cmi: 
 content2presMatcher.cmi: 
 termContentPres.cmi: cicNotationParser.cmi 
-boxPp.cmi: mpresentation.cmi cicNotationPres.cmi box.cmi 
-cicNotationPres.cmi: mpresentation.cmi box.cmi 
-content2pres.cmi: termContentPres.cmi cicNotationPres.cmi 
-renderingAttrs.cmo: renderingAttrs.cmi 
-renderingAttrs.cmx: renderingAttrs.cmi 
+boxPp.cmi: cicNotationPres.cmi 
+cicNotationPres.cmi: termContentPres.cmi box.cmi 
 cicNotationLexer.cmo: cicNotationLexer.cmi 
 cicNotationLexer.cmx: cicNotationLexer.cmi 
+smallLexer.cmo: smallLexer.cmi 
+smallLexer.cmx: smallLexer.cmi 
 cicNotationParser.cmo: cicNotationLexer.cmi cicNotationParser.cmi 
 cicNotationParser.cmx: cicNotationLexer.cmx cicNotationParser.cmi 
-mpresentation.cmo: mpresentation.cmi 
-mpresentation.cmx: mpresentation.cmi 
-box.cmo: renderingAttrs.cmi box.cmi 
-box.cmx: renderingAttrs.cmx box.cmi 
+box.cmo: box.cmi 
+box.cmx: box.cmi 
 content2presMatcher.cmo: content2presMatcher.cmi 
 content2presMatcher.cmx: content2presMatcher.cmi 
-termContentPres.cmo: renderingAttrs.cmi content2presMatcher.cmi \
-    cicNotationParser.cmi termContentPres.cmi 
-termContentPres.cmx: renderingAttrs.cmx content2presMatcher.cmx \
-    cicNotationParser.cmx termContentPres.cmi 
-boxPp.cmo: renderingAttrs.cmi mpresentation.cmi cicNotationPres.cmi box.cmi \
-    boxPp.cmi 
-boxPp.cmx: renderingAttrs.cmx mpresentation.cmx cicNotationPres.cmx box.cmx \
-    boxPp.cmi 
-cicNotationPres.cmo: renderingAttrs.cmi mpresentation.cmi box.cmi \
-    cicNotationPres.cmi 
-cicNotationPres.cmx: renderingAttrs.cmx mpresentation.cmx box.cmx \
-    cicNotationPres.cmi 
-content2pres.cmo: termContentPres.cmi renderingAttrs.cmi mpresentation.cmi \
-    cicNotationPres.cmi box.cmi content2pres.cmi 
-content2pres.cmx: termContentPres.cmx renderingAttrs.cmx mpresentation.cmx \
-    cicNotationPres.cmx box.cmx content2pres.cmi 
+termContentPres.cmo: content2presMatcher.cmi cicNotationParser.cmi \
+    termContentPres.cmi 
+termContentPres.cmx: content2presMatcher.cmx cicNotationParser.cmx \
+    termContentPres.cmi 
+boxPp.cmo: box.cmi boxPp.cmi 
+boxPp.cmx: box.cmx boxPp.cmi 
+cicNotationPres.cmo: termContentPres.cmi box.cmi cicNotationPres.cmi 
+cicNotationPres.cmx: termContentPres.cmx box.cmx cicNotationPres.cmi 

diff --git a/matitaB/components/extlib/.depend.opt b/matitaB/components/extlib/.depend.opt
index f6168c1bc823d387308d6a448108d3e09ae7641f..6f707effcd8f40c3cca0262be1d045e17b98c5d2 100644 (file)
--- a/matitaB/components/extlib/.depend.opt
+++ b/matitaB/components/extlib/.depend.opt
@@ -19,8 +19,8 @@ hLog.cmo: hLog.cmi
 hLog.cmx: hLog.cmi 
 trie.cmo: trie.cmi 
 trie.cmx: trie.cmi 
-discrimination_tree.cmo: trie.cmi discrimination_tree.cmi 
-discrimination_tree.cmx: trie.cmx discrimination_tree.cmi 
+discrimination_tree.cmo: trie.cmi hExtlib.cmi discrimination_tree.cmi 
+discrimination_tree.cmx: trie.cmx hExtlib.cmx discrimination_tree.cmi 
 hTopoSort.cmo: hTopoSort.cmi 
 hTopoSort.cmx: hTopoSort.cmi 
 graphvizPp.cmo: graphvizPp.cmi 

diff --git a/matitaB/components/grafite_parser/.depend.opt b/matitaB/components/grafite_parser/.depend.opt
index b8b65a8c0e3da3caf2c210780184bc484807aca6..e5cd5f2b357785b3a6ea40ea0ec42b06723ecd31 100644 (file)
--- a/matitaB/components/grafite_parser/.depend.opt
+++ b/matitaB/components/grafite_parser/.depend.opt
@@ -1,8 +1,5 @@
-dependenciesParser.cmi: 
 grafiteParser.cmi: 
 print_grammar.cmi: grafiteParser.cmi 
-dependenciesParser.cmo: dependenciesParser.cmi 
-dependenciesParser.cmx: dependenciesParser.cmi 
 grafiteParser.cmo: grafiteParser.cmi 
 grafiteParser.cmx: grafiteParser.cmi 
 print_grammar.cmo: print_grammar.cmi 

diff --git a/matitaB/components/library/.depend.opt b/matitaB/components/library/.depend.opt
index 975c9e8da23e2873132c03c24be55dd65827dc92..edb2abe955afe4357fc9126c8296ddf87dd7247c 100644 (file)
--- a/matitaB/components/library/.depend.opt
+++ b/matitaB/components/library/.depend.opt
@@ -5,5 +5,5 @@ librarian.cmo: librarian.cmi
 librarian.cmx: librarian.cmi 
 libraryMisc.cmo: libraryMisc.cmi 
 libraryMisc.cmx: libraryMisc.cmi 
-libraryClean.cmo: libraryMisc.cmi libraryClean.cmi 
-libraryClean.cmx: libraryMisc.cmx libraryClean.cmi 
+libraryClean.cmo: libraryClean.cmi 
+libraryClean.cmx: libraryClean.cmi 

diff --git a/matitaB/components/ng_disambiguation/.depend.opt b/matitaB/components/ng_disambiguation/.depend.opt
index df0847b170fa04851d9fc45fd22cef9608ca786e..0810bc8be9c2e8dce0593616b49c54eb617d961b 100644 (file)
--- a/matitaB/components/ng_disambiguation/.depend.opt
+++ b/matitaB/components/ng_disambiguation/.depend.opt
@@ -1,13 +1,13 @@
+nnumber_notation.cmi: 
 disambiguateChoices.cmi: 
 nCicDisambiguate.cmi: 
-nnumber_notation.cmi: 
 grafiteDisambiguate.cmi: 
-disambiguateChoices.cmo: disambiguateChoices.cmi 
-disambiguateChoices.cmx: disambiguateChoices.cmi 
+nnumber_notation.cmo: nnumber_notation.cmi 
+nnumber_notation.cmx: nnumber_notation.cmi 
+disambiguateChoices.cmo: nnumber_notation.cmi disambiguateChoices.cmi 
+disambiguateChoices.cmx: nnumber_notation.cmx disambiguateChoices.cmi 
 nCicDisambiguate.cmo: nCicDisambiguate.cmi 
 nCicDisambiguate.cmx: nCicDisambiguate.cmi 
-nnumber_notation.cmo: disambiguateChoices.cmi nnumber_notation.cmi 
-nnumber_notation.cmx: disambiguateChoices.cmx nnumber_notation.cmi 
 grafiteDisambiguate.cmo: nCicDisambiguate.cmi disambiguateChoices.cmi \
     grafiteDisambiguate.cmi 
 grafiteDisambiguate.cmx: nCicDisambiguate.cmx disambiguateChoices.cmx \

diff --git a/matitaB/components/ng_kernel/.depend.opt b/matitaB/components/ng_kernel/.depend.opt
index ab14e0fad16dd4695fc5f1c0d65e29ad77120d88..77aa113bd3181cfcf7d71bb815f6ce9d5890bbf1 100644 (file)
--- a/matitaB/components/ng_kernel/.depend.opt
+++ b/matitaB/components/ng_kernel/.depend.opt
@@ -1,34 +1,30 @@
 nUri.cmi: 
 nReference.cmi: nUri.cmi 
-nCicUtils.cmi: nCic.cmx 
-nCicSubstitution.cmi: nCic.cmx 
 nCicEnvironment.cmi: nUri.cmi nReference.cmi nCic.cmx 
-nCicReduction.cmi: nCic.cmx 
-nCicPp.cmi: nReference.cmi nCic.cmx 
-nCicTypeChecker.cmi: nUri.cmi nReference.cmi nCic.cmx 
-nCicUntrusted.cmi: nCic.cmx 
+nCicUtils.cmi: nCicEnvironment.cmi nCic.cmx 
+nCicSubstitution.cmi: nCicEnvironment.cmi nCic.cmx 
+nCicReduction.cmi: nCicEnvironment.cmi nCic.cmx 
+nCicTypeChecker.cmi: nUri.cmi nReference.cmi nCicEnvironment.cmi nCic.cmx 
+nCicUntrusted.cmi: nCicEnvironment.cmi nCic.cmx 
+nCicPp.cmi: nReference.cmi nCicEnvironment.cmi nCic.cmx 
 nCic.cmo: nUri.cmi nReference.cmi 
 nCic.cmx: nUri.cmx nReference.cmx 
 nUri.cmo: nUri.cmi 
 nUri.cmx: nUri.cmi 
 nReference.cmo: nUri.cmi nReference.cmi 
 nReference.cmx: nUri.cmx nReference.cmi 
-nCicUtils.cmo: nReference.cmi nCic.cmx nCicUtils.cmi 
-nCicUtils.cmx: nReference.cmx nCic.cmx nCicUtils.cmi 
+nCicEnvironment.cmo: nUri.cmi nReference.cmi nCic.cmx nCicEnvironment.cmi 
+nCicEnvironment.cmx: nUri.cmx nReference.cmx nCic.cmx nCicEnvironment.cmi 
+nCicUtils.cmo: nReference.cmi nCicEnvironment.cmi nCic.cmx nCicUtils.cmi 
+nCicUtils.cmx: nReference.cmx nCicEnvironment.cmx nCic.cmx nCicUtils.cmi 
 nCicSubstitution.cmo: nReference.cmi nCicUtils.cmi nCic.cmx \
     nCicSubstitution.cmi 
 nCicSubstitution.cmx: nReference.cmx nCicUtils.cmx nCic.cmx \
     nCicSubstitution.cmi 
-nCicEnvironment.cmo: nUri.cmi nReference.cmi nCic.cmx nCicEnvironment.cmi 
-nCicEnvironment.cmx: nUri.cmx nReference.cmx nCic.cmx nCicEnvironment.cmi 
 nCicReduction.cmo: nReference.cmi nCicUtils.cmi nCicSubstitution.cmi \
-    nCicPp.cmi nCicEnvironment.cmi nCic.cmx nCicReduction.cmi 
+    nCicEnvironment.cmi nCic.cmx nCicReduction.cmi 
 nCicReduction.cmx: nReference.cmx nCicUtils.cmx nCicSubstitution.cmx \
-    nCicPp.cmx nCicEnvironment.cmx nCic.cmx nCicReduction.cmi 
-nCicPp.cmo: nUri.cmi nReference.cmi nCicSubstitution.cmi nCicReduction.cmi \
-    nCicEnvironment.cmi nCic.cmx nCicPp.cmi 
-nCicPp.cmx: nUri.cmx nReference.cmx nCicSubstitution.cmx nCicReduction.cmx \
-    nCicEnvironment.cmx nCic.cmx nCicPp.cmi 
+    nCicEnvironment.cmx nCic.cmx nCicReduction.cmi 
 nCicTypeChecker.cmo: nUri.cmi nReference.cmi nCicUtils.cmi \
     nCicSubstitution.cmi nCicReduction.cmi nCicEnvironment.cmi nCic.cmx \
     nCicTypeChecker.cmi 
@@ -39,3 +35,7 @@ nCicUntrusted.cmo: nReference.cmi nCicUtils.cmi nCicSubstitution.cmi \
     nCicReduction.cmi nCicEnvironment.cmi nCic.cmx nCicUntrusted.cmi 
 nCicUntrusted.cmx: nReference.cmx nCicUtils.cmx nCicSubstitution.cmx \
     nCicReduction.cmx nCicEnvironment.cmx nCic.cmx nCicUntrusted.cmi 
+nCicPp.cmo: nUri.cmi nReference.cmi nCicSubstitution.cmi nCicReduction.cmi \
+    nCicEnvironment.cmi nCic.cmx nCicPp.cmi 
+nCicPp.cmx: nUri.cmx nReference.cmx nCicSubstitution.cmx nCicReduction.cmx \
+    nCicEnvironment.cmx nCic.cmx nCicPp.cmi 

diff --git a/matitaB/matita/.depend b/matitaB/matita/.depend
index 0237e9d2a7baac0a659b2ad55c1aaaa3e385c55e..c3485ce6b5d98390d0a3ca842e0218c81182a41a 100644 (file)
--- a/matitaB/matita/.depend
+++ b/matitaB/matita/.depend
@@ -1,87 +1,90 @@
 applyTransformation.cmo: applyTransformation.cmi 
 applyTransformation.cmx: applyTransformation.cmi 
+matitaclean.cmo: matitaMisc.cmi matitaInit.cmi matitaclean.cmi 
+matitaclean.cmx: matitaMisc.cmx matitaInit.cmx matitaclean.cmi 
+matitaFilesystem.cmo: matitaFilesystem.cmi 
+matitaFilesystem.cmx: matitaFilesystem.cmi 
+matitaMathView.cmo: virtuals.cmi matitaTypes.cmi matitaMisc.cmi \
+    matitaGuiTypes.cmi matitaGtkMisc.cmi matitaGeneratedGui.cmo \
+    matitaExcPp.cmi lablGraphviz.cmi cicMathView.cmi buildTimeConf.cmo \
+    applyTransformation.cmi matitaMathView.cmi 
+matitaMathView.cmx: virtuals.cmx matitaTypes.cmx matitaMisc.cmx \
+    matitaGuiTypes.cmi matitaGtkMisc.cmx matitaGeneratedGui.cmx \
+    matitaExcPp.cmx lablGraphviz.cmx cicMathView.cmx buildTimeConf.cmx \
+    applyTransformation.cmx matitaMathView.cmi 
+matitaTypes.cmo: matitaTypes.cmi 
+matitaTypes.cmx: matitaTypes.cmi 
 buildTimeConf.cmo: 
 buildTimeConf.cmx: 
+matitac.cmo: matitaclean.cmi matitaMisc.cmi matitaInit.cmi matitaEngine.cmi 
+matitac.cmx: matitaclean.cmx matitaMisc.cmx matitaInit.cmx matitaEngine.cmx 
+matitaGeneratedGui.cmo: 
+matitaGeneratedGui.cmx: 
+matitaMisc.cmo: matitaGuiTypes.cmi buildTimeConf.cmo matitaMisc.cmi 
+matitaMisc.cmx: matitaGuiTypes.cmi buildTimeConf.cmx matitaMisc.cmi 
+predefined_virtuals.cmo: virtuals.cmi predefined_virtuals.cmi 
+predefined_virtuals.cmx: virtuals.cmx predefined_virtuals.cmi 
 cicMathView.cmo: matitaMisc.cmi matitaGuiTypes.cmi matitaGtkMisc.cmi \
     buildTimeConf.cmo applyTransformation.cmi cicMathView.cmi 
 cicMathView.cmx: matitaMisc.cmx matitaGuiTypes.cmi matitaGtkMisc.cmx \
     buildTimeConf.cmx applyTransformation.cmx cicMathView.cmi 
-lablGraphviz.cmo: lablGraphviz.cmi 
-lablGraphviz.cmx: lablGraphviz.cmi 
-matitaAuthentication.cmo: matitaFilesystem.cmi matitaEngine.cmi \
-    matitaAuthentication.cmi 
-matitaAuthentication.cmx: matitaFilesystem.cmx matitaEngine.cmx \
-    matitaAuthentication.cmi 
-matitaclean.cmo: matitaMisc.cmi matitaInit.cmi matitaclean.cmi 
-matitaclean.cmx: matitaMisc.cmx matitaInit.cmx matitaclean.cmi 
-matitac.cmo: matitaclean.cmi matitaMisc.cmi matitaInit.cmi matitaEngine.cmi 
-matitac.cmx: matitaclean.cmx matitaMisc.cmx matitaInit.cmx matitaEngine.cmx 
 matitadaemon.cmo: matitaInit.cmi matitaFilesystem.cmi matitaEngine.cmi \
     matitaAuthentication.cmi applyTransformation.cmi 
 matitadaemon.cmx: matitaInit.cmx matitaFilesystem.cmx matitaEngine.cmx \
     matitaAuthentication.cmx applyTransformation.cmx 
-matitaEngine.cmo: applyTransformation.cmi matitaEngine.cmi 
-matitaEngine.cmx: applyTransformation.cmx matitaEngine.cmi 
-matitaExcPp.cmo: matitaEngine.cmi matitaExcPp.cmi 
-matitaExcPp.cmx: matitaEngine.cmx matitaExcPp.cmi 
-matitaFilesystem.cmo: matitaFilesystem.cmi 
-matitaFilesystem.cmx: matitaFilesystem.cmi 
-matitaGeneratedGui.cmo: 
-matitaGeneratedGui.cmx: 
 matitaGtkMisc.cmo: matitaTypes.cmi matitaGeneratedGui.cmo buildTimeConf.cmo \
     matitaGtkMisc.cmi 
 matitaGtkMisc.cmx: matitaTypes.cmx matitaGeneratedGui.cmx buildTimeConf.cmx \
     matitaGtkMisc.cmi 
+matita.cmo: predefined_virtuals.cmi matitaScript.cmi matitaInit.cmi \
+    matitaGui.cmi matitaGtkMisc.cmi buildTimeConf.cmo applyTransformation.cmi 
+matita.cmx: predefined_virtuals.cmx matitaScript.cmx matitaInit.cmx \
+    matitaGui.cmx matitaGtkMisc.cmx buildTimeConf.cmx applyTransformation.cmx 
+virtuals.cmo: virtuals.cmi 
+virtuals.cmx: virtuals.cmi 
+lablGraphviz.cmo: lablGraphviz.cmi 
+lablGraphviz.cmx: lablGraphviz.cmi 
+matitaEngine.cmo: applyTransformation.cmi matitaEngine.cmi 
+matitaEngine.cmx: applyTransformation.cmx matitaEngine.cmi 
 matitaGui.cmo: matitaTypes.cmi matitaScript.cmi matitaMisc.cmi \
     matitaMathView.cmi matitaGuiTypes.cmi matitaGtkMisc.cmi \
     matitaGeneratedGui.cmo matitaExcPp.cmi buildTimeConf.cmo matitaGui.cmi 
 matitaGui.cmx: matitaTypes.cmx matitaScript.cmx matitaMisc.cmx \
     matitaMathView.cmx matitaGuiTypes.cmi matitaGtkMisc.cmx \
     matitaGeneratedGui.cmx matitaExcPp.cmx buildTimeConf.cmx matitaGui.cmi 
+matitaAuthentication.cmo: matitaFilesystem.cmi matitaEngine.cmi \
+    matitaAuthentication.cmi 
+matitaAuthentication.cmx: matitaFilesystem.cmx matitaEngine.cmx \
+    matitaAuthentication.cmi 
+matitaExcPp.cmo: matitaEngine.cmi matitaExcPp.cmi 
+matitaExcPp.cmx: matitaEngine.cmx matitaExcPp.cmi 
 matitaInit.cmo: matitaExcPp.cmi buildTimeConf.cmo matitaInit.cmi 
 matitaInit.cmx: matitaExcPp.cmx buildTimeConf.cmx matitaInit.cmi 
-matitaMathView.cmo: virtuals.cmi matitaTypes.cmi matitaMisc.cmi \
-    matitaGuiTypes.cmi matitaGtkMisc.cmi matitaGeneratedGui.cmo \
-    matitaExcPp.cmi lablGraphviz.cmi cicMathView.cmi buildTimeConf.cmo \
-    applyTransformation.cmi matitaMathView.cmi 
-matitaMathView.cmx: virtuals.cmx matitaTypes.cmx matitaMisc.cmx \
-    matitaGuiTypes.cmi matitaGtkMisc.cmx matitaGeneratedGui.cmx \
-    matitaExcPp.cmx lablGraphviz.cmx cicMathView.cmx buildTimeConf.cmx \
-    applyTransformation.cmx matitaMathView.cmi 
-matitaMisc.cmo: matitaGuiTypes.cmi buildTimeConf.cmo matitaMisc.cmi 
-matitaMisc.cmx: matitaGuiTypes.cmi buildTimeConf.cmx matitaMisc.cmi 
-matita.cmo: predefined_virtuals.cmi matitaScript.cmi matitaInit.cmi \
-    matitaGui.cmi matitaGtkMisc.cmi buildTimeConf.cmo applyTransformation.cmi 
-matita.cmx: predefined_virtuals.cmx matitaScript.cmx matitaInit.cmx \
-    matitaGui.cmx matitaGtkMisc.cmx buildTimeConf.cmx applyTransformation.cmx 
 matitaScript.cmo: virtuals.cmi matitaTypes.cmi matitaScriptLexer.cmi \
     matitaMisc.cmi matitaMathView.cmi matitaGtkMisc.cmi matitaEngine.cmi \
     cicMathView.cmi buildTimeConf.cmo matitaScript.cmi 
 matitaScript.cmx: virtuals.cmx matitaTypes.cmx matitaScriptLexer.cmx \
     matitaMisc.cmx matitaMathView.cmx matitaGtkMisc.cmx matitaEngine.cmx \
     cicMathView.cmx buildTimeConf.cmx matitaScript.cmi 
-matitaTypes.cmo: matitaTypes.cmi 
-matitaTypes.cmx: matitaTypes.cmi 
-predefined_virtuals.cmo: virtuals.cmi predefined_virtuals.cmi 
-predefined_virtuals.cmx: virtuals.cmx predefined_virtuals.cmi 
-virtuals.cmo: virtuals.cmi 
-virtuals.cmx: virtuals.cmi 
 applyTransformation.cmi: 
-cicMathView.cmi: matitaGuiTypes.cmi applyTransformation.cmi 
-lablGraphviz.cmi: 
-matitaAuthentication.cmi: matitaEngine.cmi 
 matitaclean.cmi: 
-matitaEngine.cmi: applyTransformation.cmi 
-matitaExcPp.cmi: 
 matitaFilesystem.cmi: 
+matitaMathView.cmi: matitaTypes.cmi matitaGuiTypes.cmi 
+matitaTypes.cmi: 
+matitaMisc.cmi: matitaGuiTypes.cmi 
+predefined_virtuals.cmi: 
+cicMathView.cmi: matitaGuiTypes.cmi applyTransformation.cmi 
 matitaGtkMisc.cmi: matitaGeneratedGui.cmo 
+virtuals.cmi: 
+lablGraphviz.cmi: 
+matitaEngine.cmi: applyTransformation.cmi 
 matitaGui.cmi: matitaGuiTypes.cmi 
 matitaGuiTypes.cmi: matitaGeneratedGui.cmo applyTransformation.cmi 
-matitaInit.cmi: 
-matitaMathView.cmi: matitaTypes.cmi matitaGuiTypes.cmi 
-matitaMisc.cmi: matitaGuiTypes.cmi 
 matitaScriptLexer.cmi: 
+matitaAuthentication.cmi: matitaFilesystem.cmi matitaEngine.cmi 
+matitaExcPp.cmi: 
+matitaInit.cmi: 
 matitaScript.cmi: 
-matitaTypes.cmi: 
-predefined_virtuals.cmi: 
-virtuals.cmi: 
+matitaScriptLexer.cmo: matitaScriptLexer.cmi 
+matitaScriptLexer.cmx: matitaScriptLexer.cmi 
+matitaScriptLexer.cmi: 

diff --git a/matitaB/matita/.depend.opt b/matitaB/matita/.depend.opt
index fb6531fb03fa528cbec90f578d4420d45daffcba..92272e16ad9912c053b7f542f380d404c15d95a5 100644 (file)
--- a/matitaB/matita/.depend.opt
+++ b/matitaB/matita/.depend.opt
@@ -1,75 +1,90 @@
 applyTransformation.cmo: applyTransformation.cmi 
 applyTransformation.cmx: applyTransformation.cmi 
-buildTimeConf.cmo: 
-buildTimeConf.cmx: 
-cicMathView.cmo: matitaMisc.cmi matitaGuiTypes.cmi matitaGtkMisc.cmi \
-    buildTimeConf.cmx applyTransformation.cmi cicMathView.cmi 
-cicMathView.cmx: matitaMisc.cmx matitaGuiTypes.cmi matitaGtkMisc.cmx \
-    buildTimeConf.cmx applyTransformation.cmx cicMathView.cmi 
-lablGraphviz.cmo: lablGraphviz.cmi 
-lablGraphviz.cmx: lablGraphviz.cmi 
 matitaclean.cmo: matitaMisc.cmi matitaInit.cmi matitaclean.cmi 
 matitaclean.cmx: matitaMisc.cmx matitaInit.cmx matitaclean.cmi 
+matitaFilesystem.cmo: matitaFilesystem.cmi 
+matitaFilesystem.cmx: matitaFilesystem.cmi 
+matitaMathView.cmo: virtuals.cmi matitaTypes.cmi matitaMisc.cmi \
+    matitaGuiTypes.cmi matitaGtkMisc.cmi matitaGeneratedGui.cmx \
+    matitaExcPp.cmi lablGraphviz.cmi cicMathView.cmi buildTimeConf.cmx \
+    applyTransformation.cmi matitaMathView.cmi 
+matitaMathView.cmx: virtuals.cmx matitaTypes.cmx matitaMisc.cmx \
+    matitaGuiTypes.cmi matitaGtkMisc.cmx matitaGeneratedGui.cmx \
+    matitaExcPp.cmx lablGraphviz.cmx cicMathView.cmx buildTimeConf.cmx \
+    applyTransformation.cmx matitaMathView.cmi 
+matitaTypes.cmo: matitaTypes.cmi 
+matitaTypes.cmx: matitaTypes.cmi 
+buildTimeConf.cmo: 
+buildTimeConf.cmx: 
 matitac.cmo: matitaclean.cmi matitaMisc.cmi matitaInit.cmi matitaEngine.cmi 
 matitac.cmx: matitaclean.cmx matitaMisc.cmx matitaInit.cmx matitaEngine.cmx 
-matitaEngine.cmo: matitaEngine.cmi 
-matitaEngine.cmx: matitaEngine.cmi 
-matitaExcPp.cmo: matitaEngine.cmi matitaExcPp.cmi 
-matitaExcPp.cmx: matitaEngine.cmx matitaExcPp.cmi 
 matitaGeneratedGui.cmo: 
 matitaGeneratedGui.cmx: 
+matitaMisc.cmo: matitaGuiTypes.cmi buildTimeConf.cmx matitaMisc.cmi 
+matitaMisc.cmx: matitaGuiTypes.cmi buildTimeConf.cmx matitaMisc.cmi 
+predefined_virtuals.cmo: virtuals.cmi predefined_virtuals.cmi 
+predefined_virtuals.cmx: virtuals.cmx predefined_virtuals.cmi 
+cicMathView.cmo: matitaMisc.cmi matitaGuiTypes.cmi matitaGtkMisc.cmi \
+    buildTimeConf.cmx applyTransformation.cmi cicMathView.cmi 
+cicMathView.cmx: matitaMisc.cmx matitaGuiTypes.cmi matitaGtkMisc.cmx \
+    buildTimeConf.cmx applyTransformation.cmx cicMathView.cmi 
+matitadaemon.cmo: matitaInit.cmi matitaFilesystem.cmi matitaEngine.cmi \
+    matitaAuthentication.cmi applyTransformation.cmi 
+matitadaemon.cmx: matitaInit.cmx matitaFilesystem.cmx matitaEngine.cmx \
+    matitaAuthentication.cmx applyTransformation.cmx 
 matitaGtkMisc.cmo: matitaTypes.cmi matitaGeneratedGui.cmx buildTimeConf.cmx \
     matitaGtkMisc.cmi 
 matitaGtkMisc.cmx: matitaTypes.cmx matitaGeneratedGui.cmx buildTimeConf.cmx \
     matitaGtkMisc.cmi 
-matitaGui.cmo: matitaTypes.cmi matitaScript.cmi matitaMisc.cmi \
-    matitaMathView.cmi matitaGtkMisc.cmi matitaGeneratedGui.cmx \
-    matitaExcPp.cmi buildTimeConf.cmx matitaGui.cmi 
-matitaGui.cmx: matitaTypes.cmx matitaScript.cmx matitaMisc.cmx \
-    matitaMathView.cmx matitaGtkMisc.cmx matitaGeneratedGui.cmx \
-    matitaExcPp.cmx buildTimeConf.cmx matitaGui.cmi 
-matitaInit.cmo: matitaExcPp.cmi buildTimeConf.cmx matitaInit.cmi 
-matitaInit.cmx: matitaExcPp.cmx buildTimeConf.cmx matitaInit.cmi 
-matitaMathView.cmo: virtuals.cmi matitaTypes.cmi matitaMisc.cmi \
-    matitaGuiTypes.cmi matitaGtkMisc.cmi matitaExcPp.cmi lablGraphviz.cmi \
-    cicMathView.cmi buildTimeConf.cmx applyTransformation.cmi \
-    matitaMathView.cmi 
-matitaMathView.cmx: virtuals.cmx matitaTypes.cmx matitaMisc.cmx \
-    matitaGuiTypes.cmi matitaGtkMisc.cmx matitaExcPp.cmx lablGraphviz.cmx \
-    cicMathView.cmx buildTimeConf.cmx applyTransformation.cmx \
-    matitaMathView.cmi 
-matitaMisc.cmo: matitaGuiTypes.cmi buildTimeConf.cmx matitaMisc.cmi 
-matitaMisc.cmx: matitaGuiTypes.cmi buildTimeConf.cmx matitaMisc.cmi 
 matita.cmo: predefined_virtuals.cmi matitaScript.cmi matitaInit.cmi \
-    matitaGui.cmi matitaGtkMisc.cmi buildTimeConf.cmx 
+    matitaGui.cmi matitaGtkMisc.cmi buildTimeConf.cmx applyTransformation.cmi 
 matita.cmx: predefined_virtuals.cmx matitaScript.cmx matitaInit.cmx \
-    matitaGui.cmx matitaGtkMisc.cmx buildTimeConf.cmx 
-matitaScript.cmo: virtuals.cmi matitaTypes.cmi matitaMisc.cmi \
-    matitaMathView.cmi matitaGtkMisc.cmi matitaEngine.cmi cicMathView.cmi \
-    buildTimeConf.cmx matitaScript.cmi 
-matitaScript.cmx: virtuals.cmx matitaTypes.cmx matitaMisc.cmx \
-    matitaMathView.cmx matitaGtkMisc.cmx matitaEngine.cmx cicMathView.cmx \
-    buildTimeConf.cmx matitaScript.cmi 
-matitaTypes.cmo: matitaTypes.cmi 
-matitaTypes.cmx: matitaTypes.cmi 
-predefined_virtuals.cmo: virtuals.cmi predefined_virtuals.cmi 
-predefined_virtuals.cmx: virtuals.cmx predefined_virtuals.cmi 
+    matitaGui.cmx matitaGtkMisc.cmx buildTimeConf.cmx applyTransformation.cmx 
 virtuals.cmo: virtuals.cmi 
 virtuals.cmx: virtuals.cmi 
+lablGraphviz.cmo: lablGraphviz.cmi 
+lablGraphviz.cmx: lablGraphviz.cmi 
+matitaEngine.cmo: applyTransformation.cmi matitaEngine.cmi 
+matitaEngine.cmx: applyTransformation.cmx matitaEngine.cmi 
+matitaGui.cmo: matitaTypes.cmi matitaScript.cmi matitaMisc.cmi \
+    matitaMathView.cmi matitaGuiTypes.cmi matitaGtkMisc.cmi \
+    matitaGeneratedGui.cmx matitaExcPp.cmi buildTimeConf.cmx matitaGui.cmi 
+matitaGui.cmx: matitaTypes.cmx matitaScript.cmx matitaMisc.cmx \
+    matitaMathView.cmx matitaGuiTypes.cmi matitaGtkMisc.cmx \
+    matitaGeneratedGui.cmx matitaExcPp.cmx buildTimeConf.cmx matitaGui.cmi 
+matitaAuthentication.cmo: matitaFilesystem.cmi matitaEngine.cmi \
+    matitaAuthentication.cmi 
+matitaAuthentication.cmx: matitaFilesystem.cmx matitaEngine.cmx \
+    matitaAuthentication.cmi 
+matitaExcPp.cmo: matitaEngine.cmi matitaExcPp.cmi 
+matitaExcPp.cmx: matitaEngine.cmx matitaExcPp.cmi 
+matitaInit.cmo: matitaExcPp.cmi buildTimeConf.cmx matitaInit.cmi 
+matitaInit.cmx: matitaExcPp.cmx buildTimeConf.cmx matitaInit.cmi 
+matitaScript.cmo: virtuals.cmi matitaTypes.cmi matitaScriptLexer.cmi \
+    matitaMisc.cmi matitaMathView.cmi matitaGtkMisc.cmi matitaEngine.cmi \
+    cicMathView.cmi buildTimeConf.cmx matitaScript.cmi 
+matitaScript.cmx: virtuals.cmx matitaTypes.cmx matitaScriptLexer.cmx \
+    matitaMisc.cmx matitaMathView.cmx matitaGtkMisc.cmx matitaEngine.cmx \
+    cicMathView.cmx buildTimeConf.cmx matitaScript.cmi 
 applyTransformation.cmi: 
-cicMathView.cmi: matitaGuiTypes.cmi applyTransformation.cmi 
-lablGraphviz.cmi: 
 matitaclean.cmi: 
-matitaEngine.cmi: 
-matitaExcPp.cmi: 
-matitaGtkMisc.cmi: matitaGeneratedGui.cmx 
-matitaGui.cmi: matitaGuiTypes.cmi 
-matitaGuiTypes.cmi: matitaTypes.cmi matitaGeneratedGui.cmx \
-    applyTransformation.cmi 
-matitaInit.cmi: 
+matitaFilesystem.cmi: 
 matitaMathView.cmi: matitaTypes.cmi matitaGuiTypes.cmi 
-matitaMisc.cmi: matitaGuiTypes.cmi 
-matitaScript.cmi: 
 matitaTypes.cmi: 
+matitaMisc.cmi: matitaGuiTypes.cmi 
 predefined_virtuals.cmi: 
+cicMathView.cmi: matitaGuiTypes.cmi applyTransformation.cmi 
+matitaGtkMisc.cmi: matitaGeneratedGui.cmx 
 virtuals.cmi: 
+lablGraphviz.cmi: 
+matitaEngine.cmi: applyTransformation.cmi 
+matitaGui.cmi: matitaGuiTypes.cmi 
+matitaGuiTypes.cmi: matitaGeneratedGui.cmx applyTransformation.cmi 
+matitaScriptLexer.cmi: 
+matitaAuthentication.cmi: matitaFilesystem.cmi matitaEngine.cmi 
+matitaExcPp.cmi: 
+matitaInit.cmi: 
+matitaScript.cmi: 
+matitaScriptLexer.cmo: matitaScriptLexer.cmi 
+matitaScriptLexer.cmx: matitaScriptLexer.cmi 
+matitaScriptLexer.cmi: 

diff --git a/matitaB/matita/Makefile b/matitaB/matita/Makefile
index 24cf2514702742935a128c0dbbe3d96cffc9d2e4..ba9baef615895852b68703dc9eb79bb82e5fd567 100644 (file)
--- a/matitaB/matita/Makefile
+++ b/matitaB/matita/Makefile
@@ -23,11 +23,13 @@ OCAML_DEBUG_FLAGS = -g
 OCAMLC_FLAGS = $(OCAML_FLAGS) $(OCAML_THREADS_FLAGS)
 OCAMLC = $(OCAMLFIND) ocamlc$(OCAML_PROF) $(OCAMLC_FLAGS) $(OCAML_DEBUG_FLAGS) $(SYNTAXOPTIONS)
 OCAMLTOP = $(OCAMLFIND) ocamlmktop$(OCAML_PROF) $(OCAMLC_FLAGS) $(OCAML_DEBUG_FLAGS) $(SYNTAXOPTIONS)
-OCAMLOPT = $(OCAMLFIND) opt $(OCAMLC_FLAGS) $(OCAMLOPT_DEBUG_FLAGS)
+OCAMLOPT = $(OCAMLFIND) opt $(OCAMLC_FLAGS) $(OCAMLOPT_DEBUG_FLAGS) $(SYNTAXOPTIONS)
 OCAMLDEP = $(OCAMLFIND) ocamldep $(OCAMLDEP_FLAGS)
 INSTALL_PROGRAMS= matita matitac
 INSTALL_PROGRAMS_LINKS_MATITA= 
 INSTALL_PROGRAMS_LINKS_MATITAC= matitaclean
+MY_SYNTAXOPTIONS = -pp "camlp5o -I $(UTF8DIR) -I $(ULEXDIR) pa_extend.cmo pa_ulex.cma pa_unicode_macro.cma -loc loc"
+
 
 MATITA_FLAGS = -noprofile
 NODB=false
@@ -80,6 +82,54 @@ CML = buildTimeConf.ml $(CMLI:%.mli=%.ml)
 WML = buildTimeConf.ml $(WMLI:%.mli=%.ml)
 MAINCML = $(MAINCMLI:%.mli=%.ml)
 
+ALL_NORMAL_ML =                                \
+                applyTransformation.ml  \
+                matitaclean.ml          \
+                matitaFilesystem.ml     \
+                matitaMathView.ml       \
+                matitaTypes.ml          \
+                buildTimeConf.ml        \
+                matitac.ml              \
+                matitaGeneratedGui.ml   \
+                matitaMisc.ml           \
+                predefined_virtuals.ml  \
+                cicMathView.ml          \
+                matitadaemon.ml         \
+                matitaGtkMisc.ml        \
+                matita.ml               \
+                virtuals.ml             \
+                lablGraphviz.ml         \
+                matitaEngine.ml         \
+                matitaGui.ml            \
+                matitaAuthentication.ml \
+                matitaExcPp.ml          \
+                matitaInit.ml           \
+                matitaScript.ml
+
+ALL_NORMAL_MLI =                               \
+                applyTransformation.mli  \
+                matitaclean.mli          \
+                matitaFilesystem.mli     \
+                matitaMathView.mli       \
+                matitaTypes.mli          \
+                matitaMisc.mli           \
+                predefined_virtuals.mli  \
+                cicMathView.mli          \
+                matitaGtkMisc.mli        \
+                virtuals.mli             \
+                lablGraphviz.mli         \
+                matitaEngine.mli         \
+                matitaGui.mli            \
+                matitaGuiTypes.mli       \
+                matitaScriptLexer.mli    \
+                matitaAuthentication.mli \
+                matitaExcPp.mli          \
+                matitaInit.mli           \
+                matitaScript.mli
+
+ALL_SYNTAX_ML = matitaScriptLexer.ml
+ALL_SYNTAX_MLI = matitaScriptLexer.mli
+
 PROGRAMS_BYTE = \
        matita matitac matitadaemon matitaclean
 PROGRAMS = $(PROGRAMS_BYTE) 
@@ -93,7 +143,8 @@ all: $(PROGRAMS) $(NOINST_PROGRAMS)
 UTF8DIR := $(shell $(OCAMLFIND) query helm-syntax_extensions)
 ULEXDIR := $(shell $(OCAMLFIND) query ulex08)
 
-matitaScriptLexer.cmo: SYNTAXOPTIONS = -pp "camlp5o -I $(UTF8DIR) -I $(ULEXDIR) pa_extend.cmo pa_ulex.cma pa_unicode_macro.cma -loc loc"
+matitaScriptLexer.cmo: SYNTAXOPTIONS = $(MY_SYNTAXOPTIONS)
+matitaScriptLexer.cmx: SYNTAXOPTIONS = $(MY_SYNTAXOPTIONS) 
 
 matitaFilesystem.cmi: matitaFilesystem.mli
        $(H)echo "  OCAMLC $<"
@@ -108,6 +159,9 @@ matitaAuthentication.cmi: matitaAuthentication.mli
 matitaAuthentication.cmo: matitaAuthentication.ml
        $(H)echo "  OCAMLC $<"
        $(H)$(OCAMLC) $(WPKGS) -c $<
+matitaAuthentication.cmx: matitaAuthentication.ml
+       $(H)echo "  OCAMLOPT $<"
+       $(H)$(OCAMLOPT) $(WPKGS) -c $<
 
 CMOS = $(ML:%.ml=%.cmo)
 CCMOS = $(CML:%.ml=%.cmo)
@@ -389,10 +443,12 @@ TAGS:
 
 depend: 
        $(H)echo "  OCAMLDEP"
-       $(H)$(OCAMLDEP) *.ml *.mli > .depend
+       $(H)$(OCAMLDEP) $(ALL_NORMAL_ML) $(ALL_NORMAL_MLI) > .depend
+       $(H)$(OCAMLDEP) $(MY_SYNTAXOPTIONS) $(ALL_SYNTAX_ML) $(ALL_SYNTAX_MLI) >> .depend
 depend.opt: 
        $(H)echo "  OCAMLDEP -native"
-       $(H)$(OCAMLDEP) -native *.ml *.mli > .depend.opt
+       $(H)$(OCAMLDEP) -native $(ALL_NORMAL_ML) $(ALL_NORMAL_MLI) > .depend.opt
+       $(H)$(OCAMLDEP) $(MY_SYNTAXOPTIONS) -native $(ALL_SYNTAX_ML) $(ALL_SYNTAX_MLI) >> .depend.opt
 
 # this should be sligtly better, since should work with 'make all opt'
 MAKECMDGOALS_DELIM=$(addprefix _x_,$(addsuffix _x_,$(MAKECMDGOALS)))