Moving XML handling to lib directory

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@14723 85f007b7-540e-0410-9357-904b9bb8a0f7

11 files changed, 6 insertions, 7 deletions

diff --git a/Makefile.build b/Makefile.build
index 6c977712f..a21bee1b3 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -547,7 +547,7 @@ $(COQDOC): $(COQDOCCMO:.cmo=$(BESTOBJ))
 # fake_ide : for debugging or test-suite purpose, a fake ide simulating
 # a connection to coqtop -ideslave
 
-$(FAKEIDE): toplevel/utils/xml_lexer$(BESTOBJ) toplevel/utils/xml_parser$(BESTOBJ) toplevel/utils/xml_utils$(BESTOBJ) toplevel/ide_intf$(BESTOBJ) tools/fake_ide$(BESTOBJ)
+$(FAKEIDE): lib/xml_lexer$(BESTOBJ) lib/xml_parser$(BESTOBJ) lib/xml_utils$(BESTOBJ) toplevel/ide_intf$(BESTOBJ) tools/fake_ide$(BESTOBJ)
 	$(SHOW)'OCAMLBEST -o $@'
 	$(HIDE)$(call bestocaml,,unix)
 
diff --git a/Makefile.common b/Makefile.common
index 6ef3f9622..d3818f78f 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -221,8 +221,8 @@ INITPLUGINSBEST:=$(if $(OPT),$(INITPLUGINSOPT),$(INITPLUGINS))
 LINKCMO:=$(CONFIG) $(CORECMA) $(STATICPLUGINS)
 LINKCMX:=$(CONFIG:.cmo=.cmx) $(CORECMA:.cma=.cmxa) $(STATICPLUGINS:.cma=.cmxa)
 
-IDEDEPS:=$(CONFIG) lib/flags.cmo toplevel/utils/xml_lexer.cmo toplevel/utils/xml_parser.cmo \
-  toplevel/utils/xml_utils.cmo toplevel/ide_intf.cmo
+IDEDEPS:=$(CONFIG) lib/flags.cmo lib/xml_lexer.cmo lib/xml_parser.cmo \
+  lib/xml_utils.cmo toplevel/ide_intf.cmo
 IDECMA:=ide/ide.cma
 
 LINKIDE:=$(IDEDEPS) $(IDECMA) ide/coqide_main.ml
diff --git a/_tags b/_tags
index 6ffe3a837..6c69011b8 100644
--- a/_tags
+++ b/_tags
@@ -79,6 +79,5 @@
 "tools": include
 "tools/coqdoc": include
 "toplevel": include
-"toplevel/utils": include
 
 <plugins/**>: include
\ No newline at end of file
diff --git a/lib/lib.mllib b/lib/lib.mllib
index 635a35396..db79b5c24 100644
--- a/lib/lib.mllib
+++ b/lib/lib.mllib
@@ -1,3 +1,6 @@
+Xml_lexer
+Xml_parser
+Xml_utils
 Pp_control
 Pp
 Compat
diff --git a/toplevel/utils/xml_lexer.mli b/lib/xml_lexer.mli
index 6edc414bf..6edc414bf 100644
--- a/toplevel/utils/xml_lexer.mli
+++ b/lib/xml_lexer.mli
diff --git a/toplevel/utils/xml_lexer.mll b/lib/xml_lexer.mll
index 3e5a47ed9..3e5a47ed9 100644
--- a/toplevel/utils/xml_lexer.mll
+++ b/lib/xml_lexer.mll
diff --git a/toplevel/utils/xml_parser.ml b/lib/xml_parser.ml
index 16d9922ae..16d9922ae 100644
--- a/toplevel/utils/xml_parser.ml
+++ b/lib/xml_parser.ml
diff --git a/toplevel/utils/xml_parser.mli b/lib/xml_parser.mli
index 34dec792d..34dec792d 100644
--- a/toplevel/utils/xml_parser.mli
+++ b/lib/xml_parser.mli
diff --git a/toplevel/utils/xml_utils.ml b/lib/xml_utils.ml
index 0a73cec09..0a73cec09 100644
--- a/toplevel/utils/xml_utils.ml
+++ b/lib/xml_utils.ml
diff --git a/toplevel/utils/xml_utils.mli b/lib/xml_utils.mli
index 606e3182d..606e3182d 100644
--- a/toplevel/utils/xml_utils.mli
+++ b/lib/xml_utils.mli
diff --git a/toplevel/toplevel.mllib b/toplevel/toplevel.mllib
index 2db870202..8b03e9380 100644
--- a/toplevel/toplevel.mllib
+++ b/toplevel/toplevel.mllib
@@ -1,6 +1,3 @@
-Xml_lexer
-Xml_parser
-Xml_utils
 Himsg
 Cerrors
 Class