From 2d59fb2af4c578589e2986815e98b457055905a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Loi=CC=88c=20Correnson?= <loic.correnson@cea.fr>
Date: Wed, 5 Apr 2023 14:38:01 +0200
Subject: [PATCH] [ivette] makefile targets and binary at toplevel

---
 .gitignore        |  1 +
 Makefile          | 12 ++++++++++++
 ivette/.gitignore |  1 -
 ivette/Makefile   |  4 ++--
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2b4f54f21d9..993b9c8b211 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,7 @@ _build
 /dev/fc-time
 /dev/fc-memuse
 /bin/ocamldep_transitive_closure
+/bin/ivette
 
 #share
 /share/Makefile.config
diff --git a/Makefile b/Makefile
index 9d94325ae42..cccd90e1305 100644
--- a/Makefile
+++ b/Makefile
@@ -73,6 +73,18 @@ endif
 	dune clean
 	rm -rf _build .merlin
 
+##############################################################################
+# IVETTE
+################################
+
+.PHONY: ivette ivette-dev
+
+ivette:
+	@$(MAKE) -C ivette
+
+ivette-dev:
+	@$(MAKE) -C ivette dev
+
 ##############################################################################
 # HELP
 ################################
diff --git a/ivette/.gitignore b/ivette/.gitignore
index 5137465dd35..08b3cc95e60 100644
--- a/ivette/.gitignore
+++ b/ivette/.gitignore
@@ -9,7 +9,6 @@
 .eslint-cache
 node_modules
 yarn-error.log
-/bin
 /dist
 /doc/html
 /src/renderer/loader.ts
diff --git a/ivette/Makefile b/ivette/Makefile
index 84dc2b6ad5a..c038ba8aca7 100644
--- a/ivette/Makefile
+++ b/ivette/Makefile
@@ -23,9 +23,9 @@
 # --------------------------------------------------------------------------
 APP=Ivette
 DOME=./src/dome
-DOME_ARGS=--command $$(dirname $$0)/../../bin/frama-c
+DOME_ARGS=--command $$(dirname $$0)/frama-c
 DOME_DEV=-server-debug 1
-DOME_CLI=./bin/ivette
+DOME_CLI=../bin/ivette
 DOME_API=./src/frama-c
 DOME_CUSTOM_ENTRIES= yes
 COPYRIGHT=CEA LIST / LSL
-- 
GitLab