From 8fa4f3e1f84a017201f7b264fb70593538ea909f Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Tue, 13 Jun 2017 14:19:37 +0200
Subject: [meta] [api] Fix META file for API introduction.

---
 META.coq | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/META.coq b/META.coq
index 5bf7a000c0..e70b8e28df 100644
--- a/META.coq
+++ b/META.coq
@@ -95,6 +95,8 @@ package "intf" (
 
   directory   = "intf"
 
+  archive(byte)    = "intf.cma"
+  archive(native)  = "intf.cmxa"
 )
 
 package "engine" (
@@ -239,19 +241,6 @@ package "toplevel" (
 
 )
 
-package "highparsing" (
-
-  description = "Coq Extra Parsing"
-  version     = "8.7"
-
-  requires    = "coq.toplevel"
-  directory   = "parsing"
-
-  archive(byte)    = "highparsing.cma"
-  archive(native)  = "highparsing.cmxa"
-
-)
-
 package "idetop" (
 
   description = "Coq IDE Libraries"
@@ -279,28 +268,43 @@ package "ide" (
 
 )
 
-package "ltac" (
+# XXX: Remove the dependency on toplevel (due to Coqinit use for compat flags)
+package "highparsing" (
 
-  description = "Coq LTAC Plugin"
+  description = "Coq Extra Parsing"
   version     = "8.7"
 
-  requires    = "coq.highparsing"
-  directory   = "plugins/ltac"
+  requires    = "coq.toplevel"
+  directory   = "parsing"
 
-  archive(byte)    = "ltac_plugin.cmo"
-  archive(native)  = "ltac_plugin.cmx"
+  archive(byte)    = "highparsing.cma"
+  archive(native)  = "highparsing.cmxa"
 
 )
 
+# XXX: API should depend only on stm.
 package "API" (
 
   description = "Coq API"
   version     = "8.7"
 
-  requires    = "coq.toplevel"
+  requires    = "coq.highparsing"
   directory   = "API"
 
   archive(byte)    = "API.cma"
   archive(native)  = "API.cmxa"
 
 )
+
+package "ltac" (
+
+  description = "Coq LTAC Plugin"
+  version     = "8.7"
+
+  requires    = "coq.API"
+  directory   = "plugins/ltac"
+
+  archive(byte)    = "ltac_plugin.cmo"
+  archive(native)  = "ltac_plugin.cmx"
+
+)
-- 
cgit v1.2.3