From cd8b8974e2d62a3c3c4d7572921b5a83cbb8642c Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias <e+git@x80.org>
Date: Mon, 8 Oct 2018 16:09:49 +0200
Subject: [PATCH] [gramlib] Wrap `Gramlib`.

This introduces a bit of noise in the Dune files but for now I think
it is the best way to do it.
---
 gramlib/dune                         | 3 +--
 parsing/dune                         | 3 ++-
 plugins/funind/plugin_base.dune      | 1 +
 plugins/ltac/plugin_base.dune        | 1 +
 plugins/ssr/plugin_base.dune         | 1 +
 plugins/ssrmatching/plugin_base.dune | 1 +
 pretyping/dune                       | 2 +-
 printing/dune                        | 1 +
 toplevel/dune                        | 1 +
 vernac/dune                          | 1 +
 10 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/gramlib/dune b/gramlib/dune
index f7605fa9f36e..6a9e622b4cdc 100644
--- a/gramlib/dune
+++ b/gramlib/dune
@@ -1,4 +1,3 @@
 (library
  (name gramlib)
- (public_name coq.gramlib)
- (wrapped false))
+ (public_name coq.gramlib))
diff --git a/parsing/dune b/parsing/dune
index f9313213582d..0669e3a3c23e 100644
--- a/parsing/dune
+++ b/parsing/dune
@@ -2,7 +2,8 @@
  (name parsing)
  (public_name coq.parsing)
  (wrapped false)
- (libraries proofs))
+ (flags :standard -open Gramlib)
+ (libraries coq.gramlib proofs))
 
 (rule
  (targets g_prim.ml)
diff --git a/plugins/funind/plugin_base.dune b/plugins/funind/plugin_base.dune
index 002eb28eea9b..9f583234d85b 100644
--- a/plugins/funind/plugin_base.dune
+++ b/plugins/funind/plugin_base.dune
@@ -2,4 +2,5 @@
  (name recdef_plugin)
  (public_name coq.plugins.recdef)
  (synopsis "Coq's functional induction plugin")
+ (flags :standard -open Gramlib)
  (libraries coq.plugins.extraction))
diff --git a/plugins/ltac/plugin_base.dune b/plugins/ltac/plugin_base.dune
index 5611f5ba1631..1b316553109d 100644
--- a/plugins/ltac/plugin_base.dune
+++ b/plugins/ltac/plugin_base.dune
@@ -3,6 +3,7 @@
  (public_name coq.plugins.ltac)
  (synopsis "Coq's LTAC tactic language")
  (modules :standard \ tauto)
+ (flags :standard -open Gramlib)
  (libraries coq.stm))
 
 (library
diff --git a/plugins/ssr/plugin_base.dune b/plugins/ssr/plugin_base.dune
index de9053f1a0f2..a13524bb52b0 100644
--- a/plugins/ssr/plugin_base.dune
+++ b/plugins/ssr/plugin_base.dune
@@ -3,4 +3,5 @@
  (public_name coq.plugins.ssreflect)
  (synopsis "Coq's ssreflect plugin")
  (modules_without_implementation ssrast)
+ (flags :standard -open Gramlib)
  (libraries coq.plugins.ssrmatching))
diff --git a/plugins/ssrmatching/plugin_base.dune b/plugins/ssrmatching/plugin_base.dune
index 06f67c377458..1450a94de1c4 100644
--- a/plugins/ssrmatching/plugin_base.dune
+++ b/plugins/ssrmatching/plugin_base.dune
@@ -2,4 +2,5 @@
  (name ssrmatching_plugin)
  (public_name coq.plugins.ssrmatching)
  (synopsis "Coq ssrmatching plugin")
+ (flags :standard -open Gramlib)
  (libraries coq.plugins.ltac))
diff --git a/pretyping/dune b/pretyping/dune
index 89977cb94645..14bce92de10c 100644
--- a/pretyping/dune
+++ b/pretyping/dune
@@ -3,4 +3,4 @@
  (synopsis "Coq's Type Inference Component (Pretyper)")
  (public_name coq.pretyping)
  (wrapped false)
- (libraries coq.gramlib engine))
+ (libraries engine))
diff --git a/printing/dune b/printing/dune
index 339234216556..837ac4800993 100644
--- a/printing/dune
+++ b/printing/dune
@@ -2,5 +2,6 @@
  (name printing)
  (synopsis "Coq's Term Pretty Printing Library")
  (public_name coq.printing)
+ (flags :standard -open Gramlib)
  (wrapped false)
  (libraries parsing proofs))
diff --git a/toplevel/dune b/toplevel/dune
index f51e50aaa3cd..c2f9cd662ef9 100644
--- a/toplevel/dune
+++ b/toplevel/dune
@@ -3,6 +3,7 @@
  (public_name coq.toplevel)
  (synopsis "Coq's Interactive Shell [terminal-based]")
  (wrapped false)
+ (flags :standard -open Gramlib)
  (libraries num coq.stm))
 ; Coqlevel provides the `Num` library to plugins, we could also use
 ; -linkall in the plugins file, to be discussed.
diff --git a/vernac/dune b/vernac/dune
index 45b567d631aa..467325100216 100644
--- a/vernac/dune
+++ b/vernac/dune
@@ -3,6 +3,7 @@
  (synopsis "Coq's Vernacular Language")
  (public_name coq.vernac)
  (wrapped false)
+ (flags :standard -open Gramlib)
  (libraries tactics parsing))
 
 (rule