Fix "dune build" for syntax_extensions

- pa_unicode_macro.cma no longer "includes" helm_syntax_extensions.cma

The only reason for this change, that makes camlp5o harder to call, is
that dune enforces modules to belong to one library only.

diff --git a/matita/components/content_pres/dune b/matita/components/content_pres/dune
index 4ff7cd7a49e38dbdca9c937a720a4274241b39e0..bb909617671eb2f0afb66496e52b60163e712754 100644 (file)
--- a/matita/components/content_pres/dune
+++ b/matita/components/content_pres/dune
@@ -1,8 +1,8 @@
 (library
  (name helm_content_pres)
  (libraries helm_content helm_syntax_extensions camlp5.gramlib ulex-camlp5 helm_grafite)
- (preprocess (action (system "camlp5o -I components/syntax_extensions -I `ocamlfind query ulex-camlp5` pa_extend.cmo pa_ulex.cma pa_unicode_macro.cma -loc loc %{input-file}")))
- (preprocessor_deps ../syntax_extensions/pa_unicode_macro.cma)
+ (preprocess (action (system "camlp5o -I components/syntax_extensions -I `ocamlfind query ulex-camlp5` pa_extend.cmo pa_ulex.cma helm_syntax_extensions.cma pa_unicode_macro.cma -loc loc %{input-file}")))
+ (preprocessor_deps ../syntax_extensions/pa_unicode_macro.cma ../syntax_extensions/helm_syntax_extensions.cma)
  (wrapped false))
 (env
   (dev

diff --git a/matita/components/grafite_parser/dune b/matita/components/grafite_parser/dune
index f9ba525bc2b068b88c6582bbb35b55ea66fe540f..329efec92544ad31e792a5dfe6cf0d1806b3708a 100644 (file)
--- a/matita/components/grafite_parser/dune
+++ b/matita/components/grafite_parser/dune
@@ -1,8 +1,8 @@
 (library
  (name helm_grafite_parser)
  (libraries helm_grafite ulex-camlp5 helm_ng_disambiguation helm_ng_library helm_content_pres)
- (preprocess (action (system "camlp5o -I components/syntax_extensions -I `ocamlfind query ulex-camlp5` pa_extend.cmo pa_ulex.cma pa_unicode_macro.cma -loc loc %{input-file}")))
- (preprocessor_deps ../syntax_extensions/pa_unicode_macro.cma)
+ (preprocess (action (system "camlp5o -I components/syntax_extensions -I `ocamlfind query ulex-camlp5` pa_extend.cmo pa_ulex.cma helm_syntax_extensions.cma pa_unicode_macro.cma -loc loc %{input-file}")))
+ (preprocessor_deps ../syntax_extensions/pa_unicode_macro.cma ../syntax_extensions/helm_syntax_extensions.cma)
  (wrapped false))
 (env
   (dev

diff --git a/matita/components/syntax_extensions/dune b/matita/components/syntax_extensions/dune
index 884403ee6fd769b602713eacd0ba5e434861f191..c780ece7f51746f55535451cd7870973521717b5 100644 (file)
--- a/matita/components/syntax_extensions/dune
+++ b/matita/components/syntax_extensions/dune
@@ -16,7 +16,7 @@
  (wrapped false)
  (preprocess (action (system "camlp5o q_MLast.cmo pa_extend.cmo -loc loc %{input-file}")))
  (preprocessor_deps helm_syntax_extensions.cma)
- (library_flags components/syntax_extensions/helm_syntax_extensions.cma)
+ ;(library_flags components/syntax_extensions/helm_syntax_extensions.cma)
  (modules pa_unicode_macro))
 
 (library