X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Makefile.in;h=62a95b24bab9bdbdba5099b9206bc19d0d6130fb;hb=675faf3d5e4f6e59b461dd95e1925f1bd9c4ed71;hp=62a3a6f3a239a9cc04a6887247e7c26f220b6a22;hpb=35cbc0eb62e016907152cd64657a16513a7fa658;p=riscv-tests.git

diff --git a/Makefile.in b/Makefile.in
index 62a3a6f..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,17 +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) -f $(isa_src_dir)/Makefile isa_src_dir=$(isa_src_dir) clean
-	$(MAKE) -f $(bmarkdir)/Makefile bmarkdir=$(bmarkdir) 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