Remove deprecated uarch counters; support RVC for benchmarks

[riscv-tests.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 541263b6925f9fc7ad3cd98ac01d925c7a8d564d..9129d56b469cf9850681ec6a5101c21c0063f86c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,20 +9,20 @@ all: benchmarks isa
 install: all
        install -d $(instbasedir)/share/riscv-tests/isa
        install -d $(instbasedir)/share/riscv-tests/benchmarks
-       install -p -m 644 isa/* $(instbasedir)/share/riscv-tests/isa
-       install -p -m 644 benchmarks/* $(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:
        mkdir -p benchmarks
-       $(MAKE) -C benchmarks -f $(bmarkdir)/Makefile bmarkdir=$(bmarkdir)
+       $(MAKE) -C benchmarks -f $(bmarkdir)/Makefile src_dir=$(bmarkdir)
 
 isa:
        mkdir -p isa
-       $(MAKE) -C isa -f $(isa_src_dir)/Makefile isa_src_dir=$(isa_src_dir)
+       $(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