More robust build system

2 files changed, 14 insertions, 9 deletions

diff --git a/src/Makefile b/src/Makefile
index 92ca2246..22f3beb2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,17 +1,22 @@
-.PHONY: all test clean doc lib test_power test_idempotence
+.PHONY: all sail test clean doc lib power test_power test_idempotence
 
-all: lib doc
-	ocamlbuild -classic-display sail.native test/run_tests.native
+all: sail test lib power doc
 
-test: all
+sail:
+	ocamlbuild sail.native
+
+test: sail
+	ocamlbuild test/run_tests.native
 	./run_tests.native
 
-test_power:
+power: sail
+	ocamlbuild test/run_power.native
+
+test_power: power
 	#../../../rsem/idl/power/binary/run.sh
-	ocamlbuild -classic-display sail.native test/run_power.native
 	./run_power.native --file ../../../rsem/idl/power/binary/main.bin
 
-test_idempotence:
+test_idempotence: sail
 	@cd test; for file in *.sail; do \
 		./idempotence.sh $$file; echo ;\
 	done
diff --git a/src/demo.sh b/src/demo.sh
index af737867..1c8f2e30 100755
--- a/src/demo.sh
+++ b/src/demo.sh
@@ -26,7 +26,7 @@ while getopts ":r" opt; do
 done
 
 rebuild () {
-  run "Building Sail" "ocamlbuild sail.native"
+  run "Building Sail" "make clean sail lib"
 
   run "Generating the Sail interpreter from Power ISA (restricted to: $MNEMO)" \
     "make -C $POWERISA clean extract EXPORT_MNEMO=$MNEMO"
@@ -36,7 +36,7 @@ rebuild () {
     "cp $POWERISA/generated/extract-full.sail test/power.sail"
   #git diff test/power.sail
 
-  run  "Translating Power model from Sail to OCaml via Lem" "ocamlbuild test/run_power.native"
+  run  "Translating Power model from Sail to OCaml via Lem" "make power"
 }
 
 DEMO="./run_power.native --interactive --file test/main.bin"