ERET -> xRET; new memory map

[riscv-tests.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 002426c2f4e0e7661042bda1c5e69cb82567ef1c..9129d56b469cf9850681ec6a5101c21c0063f86c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,18 +7,22 @@ isa_src_dir     := $(abs_top_src_dir)/isa
 all: benchmarks isa
 
 install: all
-       install -d $(instbasedir)/share/riscv-tests
-       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)
 
 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)
 
 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