Merge pull request #90 from AeneasVerif/son/makefile

Update the Makefile to automatically reformat the code

2 files changed, 13 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index 8b9c8392..c7cd7f55 100644
--- a/Makefile
+++ b/Makefile
@@ -49,13 +49,17 @@ SUBDIR :=
 # The rules
 ####################################
 
+# Build the compiler, after formatting the code
+.PHONY: build
+build: format build-dev
+
 # Build the project, test it and verify the generated files
 .PHONY: build-tests-verify
 build-tests-verify: build tests verify
 
-# Build the project
-.PHONY: build
-build: build-bin build-lib build-bin-dir doc
+# Build the project, without formatting the code
+.PHONY: build-dev
+build-dev: build-bin build-lib build-bin-dir doc
 
 .PHONY: build-bin
 build-bin:
@@ -84,8 +88,8 @@ clean:
 	cd compiler && dune clean
 
 # Test the project by translating test files to F*
-.PHONY: tests
-tests: test-no_nested_borrows test-paper \
+.PHONY: test
+test: test-no_nested_borrows test-paper \
 	test-hashmap test-hashmap_main \
 	test-external test-constants \
 	testp-polonius_list testp-betree_main \
diff --git a/README.md b/README.md
index 82ff3944..812773b5 100644
--- a/README.md
+++ b/README.md
@@ -60,11 +60,11 @@ if [ -e charon ]; then echo "valid"; else echo "invalid"; fi
 Finally, building the project simply requires to run `make` in the top
 directory.
 
-You can also use `make tests` and `make verify` to run the tests, and check
-the generated files. As `make tests` will run tests which use the Charon tests,
+You can also use `make test` and `make verify` to run the tests, and check
+the generated files. As `make test` will run tests which use the Charon tests,
 you will need to regenerate the `.llbc` files. You have the following options:
-- run `make tests` in the Charon repository
-- run `REGEN_LLBC=1 make tests` in the Aeneas repository
+- run `make test` in the Charon repository
+- run `REGEN_LLBC=1 make test` in the Aeneas repository
 
 ## Documentation