X-Git-Url: https://git.libre-soc.org/?p=riscv-tests.git;a=blobdiff_plain;f=Makefile.in;h=62a95b24bab9bdbdba5099b9206bc19d0d6130fb;hp=f81b39424a8972cc7684539910d96911425a5b8b;hb=2088d1bce6558a101c42861dc578f4c7d7f4f6b4;hpb=5b13eb6cd5aa3e73fb477414f1866e7b9cbeaf3f

diff --git a/Makefile.in b/Makefile.in
index f81b394..62a95b2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,6 @@
 prefix          := @prefix@
 abs_top_src_dir := @abs_top_srcdir@
+XLEN            := @XLEN@
 instbasedir     := $(DESTDIR)$(prefix)
 bmarkdir        := $(abs_top_src_dir)/benchmarks
 isa_src_dir     := $(abs_top_src_dir)/isa
@@ -7,12 +8,22 @@ isa_src_dir     := $(abs_top_src_dir)/isa
 all: benchmarks isa
 
 install: all
-	install -p -m 644 *.hex $(instbasedir)/share/riscv-tests
+	install -d $(instbasedir)/share/riscv-tests/isa
+	install -d $(instbasedir)/share/riscv-tests/benchmarks
+	install -p -m 644 `find isa -maxdepth 1 -type f` $(instbasedir)/share/riscv-tests/isa
+	install -p -m 644 `find benchmarks -maxdepth 1 -type f` $(instbasedir)/share/riscv-tests/benchmarks
 
 benchmarks:
-	$(MAKE) -f $(bmarkdir)/Makefile bmarkdir=$(bmarkdir)
+	mkdir -p benchmarks
+	$(MAKE) -C benchmarks -f $(bmarkdir)/Makefile src_dir=$(bmarkdir) XLEN=$(XLEN)
 
 isa:
-	$(MAKE) -f $(isa_src_dir)/Makefile isa_src_dir=$(isa_src_dir)
+	mkdir -p isa
+	$(MAKE) -C isa -f $(isa_src_dir)/Makefile src_dir=$(isa_src_dir) XLEN=$(XLEN)
+
+clean:
+	$(MAKE) -C isa -f $(isa_src_dir)/Makefile src_dir=$(isa_src_dir) clean
+	$(MAKE) -C benchmarks -f $(bmarkdir)/Makefile src_dir=$(bmarkdir) clean
+
+.PHONY: benchmarks isa clean
 
-.PHONY: benchmarks isa