From b37d3f199e4521e2ae20cc96f0f2b04acc36c7cc Mon Sep 17 00:00:00 2001
From: Enrico Tassi <Enrico.Tassi@inria.fr>
Date: Fri, 22 Dec 2017 14:11:55 +0100
Subject: [API] remove large file containing duplicate interfaces

... in favor of having Public/Internal sub modules in each and
every module grouping functions according to their intended client.
---
 tools/CoqMakefile.in  |  2 +-
 tools/coq_makefile.ml | 13 +++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

(limited to 'tools')

diff --git a/tools/CoqMakefile.in b/tools/CoqMakefile.in
index 33a2f8593..de113df6a 100644
--- a/tools/CoqMakefile.in
+++ b/tools/CoqMakefile.in
@@ -176,7 +176,7 @@ COQMAKEFILE_VERSION:=@COQ_VERSION@
 
 COQSRCLIBS?= $(foreach d,$(COQ_SRC_SUBDIRS), -I "$(COQLIB)$(d)")
 
-CAMLFLAGS+=$(OCAMLLIBS) $(COQSRCLIBS) -I $(CAMLP4LIB) $(OCAML_API_FLAGS)
+CAMLFLAGS+=$(OCAMLLIBS) $(COQSRCLIBS) -I $(CAMLP4LIB)
 
 # ocamldoc fails with unknown argument otherwise
 CAMLDOCFLAGS=$(filter-out -annot, $(filter-out -bin-annot, $(CAMLFLAGS)))
diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml
index b7a62a78c..091869407 100644
--- a/tools/coq_makefile.ml
+++ b/tools/coq_makefile.ml
@@ -57,7 +57,6 @@ let usage_common () =
 \n[-install opt]: where opt is \"user\" to force install into user directory,\
 \n  \"none\" to build a makefile with no install target or\
 \n  \"global\" to force install in $COQLIB directory\
-\n[-bypass-API]: when compiling plugins, bypass Coq API\
 \n"
 
 let usage_coq_project () =
@@ -210,16 +209,10 @@ let windrive s =
   else s
 ;;
 
-let generate_conf_coq_config oc args bypass_API =
+let generate_conf_coq_config oc args =
   section oc "Coq configuration.";
-  let src_dirs = if bypass_API
-                 then Coq_config.all_src_dirs
-                 else Coq_config.api_dirs @ Coq_config.plugins_dirs in
+  let src_dirs = Coq_config.all_src_dirs in
   Envars.print_config ~prefix_var_name:"COQMF_" oc src_dirs;
-  if bypass_API then
-    Printf.fprintf oc "OCAML_API_FLAGS=\n"
-  else
-    Printf.fprintf oc "OCAML_API_FLAGS=-open API\n";
   fprintf oc "COQMF_WINDRIVE=%s\n" (windrive Coq_config.coqlib)
 ;;
 
@@ -278,7 +271,7 @@ let generate_conf oc project args  =
   fprintf oc "# %s\n\n" (String.concat " " (List.map quote args));
   generate_conf_files oc project;
   generate_conf_includes oc project;
-  generate_conf_coq_config oc args project.bypass_API;
+  generate_conf_coq_config oc args;
   generate_conf_defs oc project;
   generate_conf_doc oc project;
   generate_conf_extra_target oc project.extra_targets;
-- 
cgit v1.2.3