From 51aee26f3fa7697cbff98fef635085dbcc821f3b Mon Sep 17 00:00:00 2001 From: Nick Roberts Date: Fri, 8 Nov 2024 16:12:54 -0500 Subject: [PATCH] Make more compatible with opam (#114) --- src/frontend/dune | 1 + src/ocaml/compression/dune | 4 ---- src/ocaml/compression/ocaml_compression.ml | 3 --- src/ocaml/typing/dune | 2 +- 4 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 src/ocaml/compression/dune delete mode 100644 src/ocaml/compression/ocaml_compression.ml diff --git a/src/frontend/dune b/src/frontend/dune index 7fb6e9866..a671f96b0 100644 --- a/src/frontend/dune +++ b/src/frontend/dune @@ -21,6 +21,7 @@ -open Merlin_analysis -open Merlin_kernel) (libraries + merlin_extend merlin_utils merlin_kernel ocaml_utils diff --git a/src/ocaml/compression/dune b/src/ocaml/compression/dune deleted file mode 100644 index 86c7f0210..000000000 --- a/src/ocaml/compression/dune +++ /dev/null @@ -1,4 +0,0 @@ -(library - (name ocaml_compression) - (public_name merlin-lib.ocaml_compression) - (libraries compiler-libs.common)) diff --git a/src/ocaml/compression/ocaml_compression.ml b/src/ocaml/compression/ocaml_compression.ml deleted file mode 100644 index 464aa32bd..000000000 --- a/src/ocaml/compression/ocaml_compression.ml +++ /dev/null @@ -1,3 +0,0 @@ - -(** We rely on [compiler-libs] for compression *) -include Compression diff --git a/src/ocaml/typing/dune b/src/ocaml/typing/dune index 4850e1193..09b5c2642 100644 --- a/src/ocaml/typing/dune +++ b/src/ocaml/typing/dune @@ -7,4 +7,4 @@ -open Merlin_utils (:standard -w -9)) (modules_without_implementation annot outcometree mode_intf solver_intf value_rec_types) - (libraries merlin_utils ocaml_compression ocaml_parsing ocaml_utils)) + (libraries merlin_utils ocaml_parsing ocaml_utils))