correctly depend on dispatch.h

[riscv-isa-sim.git] / riscv / riscv.mk.in

diff --git a/riscv/riscv.mk.in b/riscv/riscv.mk.in
index 5405ba19968221674dc254459e3c83f62e5984f9..42679d039e1ddb25b96d280f9d104b727b2821c0 100644 (file)
--- a/riscv/riscv.mk.in
+++ b/riscv/riscv.mk.in
@@ -2,7 +2,7 @@ riscv_subproject_deps = \
        softfloat_riscv \
        softfloat \
 
-repo_hdrs := \
+riscv_hdrs := \
        htif.h \
        common.h \
        decode.h \
@@ -14,13 +14,9 @@ repo_hdrs := \
        insn_header.h \
        cachesim.h \
        memtracer.h \
+       dispatch.h \
 
-riscv_hdrs := \
-       $(repo_hdrs) \
-       dispatch.h
-
-
-NDISPATCH := 10
+NDISPATCH := 9
 DISPATCH_SRCS := \
        dispatch0.cc \
        dispatch1.cc \
@@ -32,12 +28,11 @@ DISPATCH_SRCS := \
        dispatch7.cc \
        dispatch8.cc \
        dispatch9.cc \
-       dispatch10.cc \
 
-$(DISPATCH_SRCS): %.cc: dispatch $(wildcard insns/*.h) $(riscv_hdrs) 
+$(DISPATCH_SRCS): %.cc: dispatch $(wildcard insns/*.h) opcodes.h
        $< $(subst dispatch,,$(subst .cc,,$@)) $(NDISPATCH) 1024 < $(src_dir)/riscv/opcodes.h > $@
 
-dispatch.h: %.h: dispatch $(repo_hdrs)
+$(src_dir)/riscv/dispatch.h: %.h: dispatch opcodes.h
        $< $(NDISPATCH) 1024 < $(src_dir)/riscv/opcodes.h > $@
 
 riscv_srcs = \