From 6bee068779a17c8b86af1ee63d573ac4b793779f Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Tue, 13 May 2025 16:07:39 -0700
Subject: [PATCH] Makefile cleanup

---
 Makefile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 00c989716..ae64d7242 100644
--- a/Makefile
+++ b/Makefile
@@ -6,13 +6,13 @@ MAKEFLAGS += --output-sync --no-print-directory
 
 SIM = ${WALLY}/sim
 
-.PHONY: all riscof testfloat combined_IF_vectors zsbl coverage cvw-arch-verif sim_bp clean
+.PHONY: all riscof testfloat combined_IF_vectors zsbl coverage cvw-arch-verif sim_bp deriv clean
 
-all: riscof	testfloat combined_IF_vectors zsbl coverage sim_bp cvw-arch-verif
+all: riscof	testfloat combined_IF_vectors zsbl coverage sim_bp cvw-arch-verif deriv
 
 # riscof builds the riscv-arch-test and wally-riscv-arch-test suites
 riscof:
-	$(MAKE) -C sim
+	$(MAKE) -C tests/riscof
 
 testfloat:
 	$(MAKE) -C ${WALLY}/tests/fp vectors
@@ -26,6 +26,9 @@ zsbl:
 coverage:
 	$(MAKE) -C tests/coverage
 
+deriv:
+	derivgen.pl
+
 cvw-arch-verif:
 	$(MAKE) -C ${WALLY}/addins/cvw-arch-verif
 
@@ -40,7 +43,8 @@ breker:
 	$(MAKE) -C ${WALLY}/tests/breker
 
 clean:
-	$(MAKE) clean -C sim
+	$(MAKE) clean -C ${WALLY}/tests/riscof
 	$(MAKE) clean -C ${WALLY}/tests/fp
+	$(MAKE) clean -C ${WALLY}/fpga/zsbl
 	$(MAKE) clean -C ${WALLY}/tests/coverage
 	$(MAKE) clean -C ${WALLY}/addins/cvw-arch-verif