From 944a46fe61018e2b4266f19297daa822b41cf9e7 Mon Sep 17 00:00:00 2001
From: Son Ho
Date: Wed, 3 Apr 2024 17:23:31 +0200
Subject: Improve the Makefile

---
 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 98172fda..3b44e0e6 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,10 @@ REGEN_LLBC ?=
 # The path to Charon
 CHARON_HOME ?= ../charon
 
+ifeq (,$(wildcard $(CHARON_HOME)))
+  $(error The directory $$CHARON_HOME does not exist$(newline)(CHARON_HOME=$(CHARON_HOME)).)
+endif
+
 # The paths to the test directories in Charon (Aeneas will look for the .llbc
 # files in there).
 CHARON_TESTS_REGULAR_DIR ?= $(CHARON_HOME)/tests
@@ -89,7 +93,7 @@ clean:
 
 # Test the project by translating test files to F*
 .PHONY: test
-test: test-no_nested_borrows test-paper \
+test: build-dev test-no_nested_borrows test-paper \
 	test-hashmap test-hashmap_main \
 	test-external test-constants \
 	testp-polonius_list testp-betree_main \
-- 
cgit v1.2.3


From 3fdb4ca62155b6d913bceb7797ee9e10263cb087 Mon Sep 17 00:00:00 2001
From: Son Ho
Date: Wed, 3 Apr 2024 17:36:05 +0200
Subject: Remove the check for CHARON_HOME

---
 Makefile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Makefile b/Makefile
index 3b44e0e6..1266e631 100644
--- a/Makefile
+++ b/Makefile
@@ -20,10 +20,6 @@ REGEN_LLBC ?=
 # The path to Charon
 CHARON_HOME ?= ../charon
 
-ifeq (,$(wildcard $(CHARON_HOME)))
-  $(error The directory $$CHARON_HOME does not exist$(newline)(CHARON_HOME=$(CHARON_HOME)).)
-endif
-
 # The paths to the test directories in Charon (Aeneas will look for the .llbc
 # files in there).
 CHARON_TESTS_REGULAR_DIR ?= $(CHARON_HOME)/tests
-- 
cgit v1.2.3