sim: common: simplify hw-config.h deps

Now that all ports (other than ppc) build in the top-level, we don't
need to expand all the hw-config.h targets as a recursive dep.  Each
port depends on their respective header now, and the ppc port doesn't
use it at all.

diff --git a/sim/Makefile.in b/sim/Makefile.in
index c2669fd150514d318c2eecee4cb6d24970d4e625..24ad2915ac49bbc584de80f5837aa361ee027780 100644 (file)
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -1761,8 +1761,8 @@ CLEANFILES = common/version.c common/version.c-stamp \
        testsuite/common/bits64m63.c
 DISTCLEANFILES = $(am__append_93)
 MOSTLYCLEANFILES = core $(SIM_ENABLED_ARCHES:%=%/*.o) \
-       $(common_HW_CONFIG_H_TARGETS) $(patsubst \
-       %,%/stamp-hw,$(SIM_ENABLED_ARCHES)) \
+       $(SIM_ENABLED_ARCHES:%=%/hw-config.h) \
+       $(SIM_ENABLED_ARCHES:%=%/stamp-hw) \
        $(common_GEN_MODULES_C_TARGETS) $(patsubst \
        %,%/stamp-modules,$(SIM_ENABLED_ARCHES)) $(am__append_6) \
        site-sim-config.exp testrun.log testrun.sum $(am__append_19) \
@@ -1786,13 +1786,12 @@ AM_CPPFLAGS_FOR_BUILD = -I$(srcroot)/include $(SIM_HW_CFLAGS) \
 COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(AM_CPPFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
 LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
 SIM_ALL_RECURSIVE_DEPS = common/libcommon.a \
-       $(common_HW_CONFIG_H_TARGETS) $(common_GEN_MODULES_C_TARGETS) \
-       $(am__append_3) $(am__append_18) $(am__append_23) \
-       $(am__append_30) $(am__append_35) $(am__append_47) \
-       $(am__append_56) $(am__append_61) $(am__append_65) \
-       $(am__append_71) $(am__append_75) $(am__append_91) \
-       $(am__append_97) $(am__append_106) $(am__append_120) \
-       $(am__append_126)
+       $(common_GEN_MODULES_C_TARGETS) $(am__append_3) \
+       $(am__append_18) $(am__append_23) $(am__append_30) \
+       $(am__append_35) $(am__append_47) $(am__append_56) \
+       $(am__append_61) $(am__append_65) $(am__append_71) \
+       $(am__append_75) $(am__append_91) $(am__append_97) \
+       $(am__append_106) $(am__append_120) $(am__append_126)
 SIM_INSTALL_DATA_LOCAL_DEPS = 
 SIM_INSTALL_EXEC_LOCAL_DEPS = $(am__append_40)
 SIM_UNINSTALL_LOCAL_DEPS = $(am__append_41)
@@ -1833,7 +1832,6 @@ SIM_NEW_COMMON_OBJS = sim-arange.o sim-bits.o sim-close.o \
        sim-signal.o sim-stop.o sim-syscall.o sim-trace.o sim-utils.o \
        sim-watch.o $(am__append_2)
 SIM_HW_DEVICES = cfi core pal glue
-common_HW_CONFIG_H_TARGETS = $(patsubst %,%/hw-config.h,$(SIM_ENABLED_ARCHES))
 am_arch_d = $(subst -,_,$(@D))
 GEN_MODULES_C_SRCS = \
        $(wildcard \

diff --git a/sim/common/local.mk b/sim/common/local.mk
index 2c68f668d37cc291d9eccdb7408fbc5303213b2d..0ce790149733a08f9984cbb5882fbd310e7b925a 100644 (file)
--- a/sim/common/local.mk
+++ b/sim/common/local.mk
@@ -131,9 +131,7 @@ endif
        touch $@
 .PRECIOUS: %/stamp-hw
 
-%C%_HW_CONFIG_H_TARGETS = $(patsubst %,%/hw-config.h,$(SIM_ENABLED_ARCHES))
-MOSTLYCLEANFILES += $(%C%_HW_CONFIG_H_TARGETS) $(patsubst %,%/stamp-hw,$(SIM_ENABLED_ARCHES))
-SIM_ALL_RECURSIVE_DEPS += $(%C%_HW_CONFIG_H_TARGETS)
+MOSTLYCLEANFILES += $(SIM_ENABLED_ARCHES:%=%/hw-config.h) $(SIM_ENABLED_ARCHES:%=%/stamp-hw)
 
 ## See sim_pre_argv_init and sim_module_install in sim-module.c for more details.
 ## TODO: Switch this to xxx_SOURCES once projects build objects in local.mk.