New RDCYCLE encoding

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

diff --git a/Makefile.in b/Makefile.in
index b6c01877cdc275a31a9656fcaf7b49b0c57b7f8f..19e6805971a9fc25cf0bd549dae41617e476af98 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -119,16 +119,6 @@ INSTALL_LIB   := $(INSTALL) -m 644
 INSTALL_EXE   := $(INSTALL) -m 555
 STOW          := @stow@
 
-#-------------------------------------------------------------------------
-# Range helper function.  $(call range,3,6) generates the string 3 4 5
-#-------------------------------------------------------------------------
-
-range = $(shell _i=$(1); \
-  while [[ $$_i -lt $(2) ]]; do \
-    echo -n "$$_i "; \
-    ((_i = _i + 1)); \
-  done)
-
 #-------------------------------------------------------------------------
 # Include subproject makefile fragments
 #-------------------------------------------------------------------------
@@ -197,9 +187,9 @@ $(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
+$$($(2)_c_objs) : %.o : %.c $$($(2)_gen_hdrs)
        $(COMPILE_C) -c $$<
 
 $(2)_junk += $$($(2)_objs) $$($(2)_c_objs) $$($(2)_deps) $$($(2)_c_deps)
@@ -270,7 +260,7 @@ $(2)_install_prog_objs := $$(patsubst %.cc, %.o, $$($(2)_install_prog_srcs))
 $(2)_install_prog_deps := $$(patsubst %.o, %.d, $$($(2)_install_prog_objs))
 $(2)_install_prog_exes := $$(patsubst %.cc, %, $$($(2)_install_prog_srcs))
 
-$$($(2)_install_prog_objs) : %.o : %.cc
+$$($(2)_install_prog_objs) : %.o : %.cc $$($(2)_gen_hdrs)
        $(COMPILE) -c $$<
 
 $$($(2)_install_prog_exes) : % : %.o $$($(2)_prog_libnames)
@@ -298,13 +288,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)