From 3e0f94ac02fac8f4693e51b6656f9448b4b50921 Mon Sep 17 00:00:00 2001
From: Pierre Letouzey
Date: Wed, 15 Jun 2016 12:48:26 +0200
Subject: ocamllibdep + coqdep : simpler deps concerning .mllib and .mlpack

 Since we already have a rule %.cmxs:%.cmxa and the .cmxa depends
 already on all the .cmx inside it, no need to state explicitely
 that the .cmxs depends on these inner .cmx. Same thing concerning
 .cmxs built out of a single .cmx.
---
 tools/coqdep_common.ml | 4 ++--
 tools/ocamllibdep.mll  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/coqdep_common.ml b/tools/coqdep_common.ml
index 0f7937d729..cc63c13d7b 100644
--- a/tools/coqdep_common.ml
+++ b/tools/coqdep_common.ml
@@ -445,7 +445,7 @@ let mL_dependencies () =
        let efullname = escape fullname in
        printf "%s_MLLIB_DEPENDENCIES:=%s\n" efullname dep;
        printf "%s.cma:$(addsuffix .cmo,$(%s_MLLIB_DEPENDENCIES))\n" efullname efullname;
-       printf "%s.cmxa %s.cmxs:$(addsuffix .cmx,$(%s_MLLIB_DEPENDENCIES))\n" efullname efullname efullname;
+       printf "%s.cmxa:$(addsuffix .cmx,$(%s_MLLIB_DEPENDENCIES))\n" efullname efullname;
        flush stdout)
     (List.rev !mllibAccu);
   List.iter
@@ -455,7 +455,7 @@ let mL_dependencies () =
        let efullname = escape fullname in
        printf "%s_MLPACK_DEPENDENCIES:=%s\n" efullname dep;
        printf "%s.cmo:$(addsuffix .cmo,$(%s_MLPACK_DEPENDENCIES))\n" efullname efullname;
-       printf "%s.cmx %s.cmxs:$(addsuffix .cmx,$(%s_MLPACK_DEPENDENCIES))\n" efullname efullname efullname;
+       printf "%s.cmx:$(addsuffix .cmx,$(%s_MLPACK_DEPENDENCIES))\n" efullname efullname;
        flush stdout)
     (List.rev !mlpackAccu)
 
diff --git a/tools/ocamllibdep.mll b/tools/ocamllibdep.mll
index 57fcd5dd21..bf82be09f1 100644
--- a/tools/ocamllibdep.mll
+++ b/tools/ocamllibdep.mll
@@ -176,8 +176,8 @@ let mllib_dependencies () =
        printf "%s_MLLIB_DEPENDENCIES:=%s\n" efullname sdeps;
        printf "%s.cma:$(addsuffix .cmo,$(%s_MLLIB_DEPENDENCIES))\n"
          efullname efullname;
-       printf "%s.cmxa %s.cmxs:$(addsuffix .cmx,$(%s_MLLIB_DEPENDENCIES))\n"
-         efullname efullname efullname;
+       printf "%s.cmxa:$(addsuffix .cmx,$(%s_MLLIB_DEPENDENCIES))\n"
+         efullname efullname;
        flush Pervasives.stdout)
     (List.rev !mllibAccu)
 
@@ -193,8 +193,8 @@ let mlpack_dependencies () =
        List.iter (fun d -> printf "%s_FORPACK:= -for-pack %s\n" d modname) deps;
        printf "%s.cmo:$(addsuffix .cmo,$(%s_MLPACK_DEPENDENCIES))\n"
          efullname efullname;
-       printf "%s.cmx %s.cmxs:$(addsuffix .cmx,$(%s_MLPACK_DEPENDENCIES))\n"
-         efullname efullname efullname;
+       printf "%s.cmx:$(addsuffix .cmx,$(%s_MLPACK_DEPENDENCIES))\n"
+         efullname efullname;
        flush Pervasives.stdout)
     (List.rev !mlpackAccu)
 
-- 
cgit v1.2.3