fix make issue

diff --git a/Makefile.in b/Makefile.in
index 74bebeb8c290db9c7a420c05def8c693d8d83a11..97543efc61ba16e8311519805be16217cad1e669 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -197,7 +197,7 @@ $(2)_objs := $$(patsubst %.cc, %.o, $$($(2)_srcs))
 $(2)_c_objs := $$(patsubst %.c, %.o, $$($(2)_c_srcs))
 $(2)_deps := $$(patsubst %.o, %.d, $$($(2)_objs))
 $(2)_c_deps := $$(patsubst %.o, %.d, $$($(2)_c_objs))
-$$($(2)_objs) : %.o : %.cc $(2)_gen_hdrs
+$$($(2)_objs) : %.o : %.cc $$($(2)_gen_hdrs)
        $(COMPILE) -c $$<
 $$($(2)_c_objs) : %.o : %.c
        $(COMPILE_C) -c $$<
@@ -298,13 +298,13 @@ clean-$(1) :
 libs += lib$(1).a
 objs += $$($(2)_objs)
 srcs += $$(addprefix $(src_dir)/$(1)/, $$($(2)_srcs)) 
-hdrs += $$(addprefix $(src_dir)/$(1)/, $$($(2)_hdrs) $$($(2)_gen_hdrs))
+hdrs += $$(addprefix $(src_dir)/$(1)/, $$($(2)_hdrs)) $$($(2)_gen_hdrs)
 junk += $$($(2)_junk)
 deps += $$($(2)_deps)
 
 test_outs += $$($(2)_test_outs)
 
-install_hdrs += $$(addprefix $(src_dir)/$(1)/, $$($(2)_hdrs) $$($(2)_gen_hdrs))
+install_hdrs += $$(addprefix $(src_dir)/$(1)/, $$($(2)_hdrs)) $$($(2)_gen_hdrs)
 install_libs += lib$(1).a
 install_exes += $$($(2)_install_prog_exes)
 

diff --git a/riscv/riscv.mk.in b/riscv/riscv.mk.in
index 9a4ef57505c6f89cc7f10a00ddfcddcae3050f25..ae9e8eb780d70aa94ce96a1cc73895dc8f7a8848 100644 (file)
--- a/riscv/riscv.mk.in
+++ b/riscv/riscv.mk.in
@@ -5,7 +5,7 @@ riscv_subproject_deps = \
 riscv_install_prog_srcs = \
        spike.cc \
 
-riscv_hdrs := \
+riscv_hdrs = \
        htif.h \
        common.h \
        decode.h \
@@ -31,10 +31,10 @@ riscv_srcs = \
 
 riscv_test_srcs =
 
-riscv_gen_hdrs: \
+riscv_gen_hdrs = \
        dispatch.h \
 
-NDISPATCH := 9
+NDISPATCH = 9
 DISPATCH_SRCS = $(addsuffix .cc,$(addprefix dispatch,$(call range,0,$(NDISPATCH))))
 
 $(DISPATCH_SRCS): %.cc: dispatch $(wildcard insns/*.h) opcodes.h