Blob Blame History Raw
From 0b38a22d9813de27eab5caafafeabd945f298b5e Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <me@rgrinberg.com>
Date: Mon, 29 Mar 2021 17:30:46 -0700
Subject: [PATCH 4/4] Fix dune rules

* Add gsl_include.sexp when running do_sf.exe
* Fix formatting of dune rules
* Simplify rules by removing explicit dependency on exe's. Dune adds
this dependency automatically when using `run`.

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
---
 src/dune | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/dune b/src/dune
index c05e494..bd5adfa 100644
--- a/src/dune
+++ b/src/dune
@@ -54,29 +54,23 @@
       ; NOTE: for limiting excessive warning about unused parameters
       -Wno-unused-parameter))
   (c_library_flags (:include c_library_flags.sexp))
-  (libraries bigarray)
-)
+  (libraries bigarray))
 
 (rule
   (targets c_flags.sexp c_library_flags.sexp gsl_include.sexp)
-  (deps (:discover config/discover.exe))
-  (action (run %{discover}))
-)
+  (action (run config/discover.exe)))
 
 (rule
   (targets cdf.mli cdf.ml mlgsl_cdf.c)
-  (deps config/do_cdf.exe gsl_include.sexp)
-  (action (run config/do_cdf.exe))
-)
+  (deps gsl_include.sexp)
+  (action (run config/do_cdf.exe)))
 
 (rule
   (targets const.mli const.ml)
-  (deps config/do_const.exe gsl_include.sexp)
-  (action (run config/do_const.exe))
-)
+  (deps gsl_include.sexp)
+  (action (run config/do_const.exe)))
 
 (rule
   (targets sf.mli sf.ml)
-  (deps config/do_sf.exe sf.mli.q)
-  (action (run config/do_sf.exe))
-)
+  (deps gsl_include.sexp sf.mli.q)
+  (action (run config/do_sf.exe)))
-- 
2.41.0