From 4ee8310e9ccadd17ca0f3f7c36ddb0a1aa14baae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C3=ABl=20Gu=C3=A9neau?= <armael.gueneau@ens-lyon.org>
Date: Sun, 16 Oct 2022 10:07:43 +0200
Subject: [PATCH] Makefile: update wrt ocaml extraction

---
 src/Makefile   | 17 +++++++----------
 src/mlbin/dune |  8 ++++++--
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 7079c59d..5d67c41b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,8 +1,3 @@
-OCAMLBUILD := env OCAMLPATH=$(shell pwd) ocamlbuild \
-	      -tag thread -tag debug -use-ocamlfind \
-	      -lib str -lib nums \
-	      -I codegen -I mllib \
-	      -package extunix -package zarith -package ocamlfuse
 MODULES    := Lock Nomega Word WordAuto WordZ Bytes Rounding \
 				Mem AsyncDisk Pred Prog ProgMonad PredCrash Hoare \
 				OperationalSemantics \
@@ -50,10 +45,11 @@ HSLIB_POST := hslib/Disk.hs hslib/Interpreter.hs
 
 all: fscq mkfs
 
-%: %.ml $(VS_ML) $(wildcard */*.ml)
-	rm -f $@
-	$(OCAMLBUILD) -no-links $@.native
-	ln -s $(CURDIR)/_build/$@.native $@
+mlbin/mkfs.exe: mlbin/mkfs.ml $(VS_ML) $(wildcard mllib/*.ml)
+	dune build $@
+
+mlbin/fscqfuse.exe: mlbin/fscqfuse.ml $(VS_ML) $(wildcard mllib/*.ml)
+	dune build $@
 
 hscgen/%.hs: hslib/%.hsc
 	@mkdir -p $(@D)
@@ -118,6 +114,7 @@ hslib/libopfuse.a: hslib/opqueue.o hslib/opfuse.o
 clean:
 	rm -rf codegen coqbuild _build fstest hstest gotest disk.img \
 	       fscq mkfs *.o *.hi \
-	       hslib/*.o hscgen
+	       hslib/*.o hscgen \
+	       mlbin/*.exe
 
 .PRECIOUS: hscgen/%.hs %_stubs.c
diff --git a/src/mlbin/dune b/src/mlbin/dune
index 64c53c75..ebfcc248 100644
--- a/src/mlbin/dune
+++ b/src/mlbin/dune
@@ -1,9 +1,13 @@
 (executable
  (name mkfs)
  (libraries fscq zarith)
- (modules mkfs))
+ (modules mkfs)
+ (promote (until-clean))
+)
 
 (executable
  (name fscqfuse)
  (libraries fscq fuse fpath)
- (modules fscqfuse))
+ (modules fscqfuse)
+ (promote (until-clean))
+)