diff mbox series

[70/83] sim: move arch-specific file compilation of common/ files to top-level

Message ID 20230103075605.13606-71-vapier@gentoo.org
State Committed
Headers
Series sim: merge subdir makefiles into top-level |

Commit Message

Mike Frysinger Jan. 3, 2023, 7:55 a.m. UTC 
  ---
 sim/Makefile.am              |   8 +++
 sim/Makefile.in              | 129 ++++++++++++++++++-----------------
 sim/aarch64/local.mk         |   4 +-
 sim/arm/local.mk             |   4 +-
 sim/avr/local.mk             |   4 +-
 sim/bfin/local.mk            |   4 +-
 sim/bpf/local.mk             |   4 +-
 sim/cr16/local.mk            |   4 +-
 sim/cris/local.mk            |   4 +-
 sim/d10v/local.mk            |   4 +-
 sim/erc32/local.mk           |   4 +-
 sim/example-synacor/local.mk |   4 +-
 sim/frv/local.mk             |   4 +-
 sim/ft32/local.mk            |   4 +-
 sim/h8300/local.mk           |   4 +-
 sim/iq2000/local.mk          |   4 +-
 sim/lm32/local.mk            |   4 +-
 sim/m32c/local.mk            |   4 +-
 sim/m32r/local.mk            |   4 +-
 sim/m68hc11/local.mk         |   4 +-
 sim/mcore/local.mk           |   4 +-
 sim/microblaze/local.mk      |   4 +-
 sim/mips/local.mk            |   4 +-
 sim/mn10300/local.mk         |   4 +-
 sim/moxie/local.mk           |   4 +-
 sim/msp430/local.mk          |   4 +-
 sim/or1k/local.mk            |   4 +-
 sim/pru/local.mk             |   4 +-
 sim/riscv/local.mk           |   4 +-
 sim/rl78/local.mk            |   4 +-
 sim/rx/local.mk              |   4 +-
 sim/sh/local.mk              |   4 +-
 sim/v850/local.mk            |   4 +-
 33 files changed, 137 insertions(+), 124 deletions(-)
diff mbox series

Patch

diff --git a/sim/Makefile.am b/sim/Makefile.am
index 3c46925976f3..fa646ab1b051 100644
--- a/sim/Makefile.am
+++ b/sim/Makefile.am
@@ -93,6 +93,14 @@  pkginclude_HEADERS += \
 	$(srcroot)/include/sim/sim.h
 endif
 
+## Used for our custom rules to calculate the dependency output base name.
+## This form aligns with Automake's default rules.
+SIM_DEPBASE = $(@D)/$(DEPDIR)/$(@F:.o=)
+## Actual full compile command like Automake's default rules.
+SIM_COMPILE = \
+	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(SIM_DEPBASE).Tpo -c -o $@ $< && \
+	$(am__mv) $(SIM_DEPBASE).Tpo $(SIM_DEPBASE).Po
+
 include common/local.mk
 if SIM_ENABLE_IGEN
 include igen/local.mk
diff --git a/sim/aarch64/local.mk b/sim/aarch64/local.mk
index bbd832de19d8..10e814b49f90 100644
--- a/sim/aarch64/local.mk
+++ b/sim/aarch64/local.mk
@@ -31,8 +31,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/arm/local.mk b/sim/arm/local.mk
index 68a56e616920..c172b5f26824 100644
--- a/sim/arm/local.mk
+++ b/sim/arm/local.mk
@@ -33,8 +33,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/avr/local.mk b/sim/avr/local.mk
index 327a87f0a762..3cae5bf8483b 100644
--- a/sim/avr/local.mk
+++ b/sim/avr/local.mk
@@ -27,8 +27,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/bfin/local.mk b/sim/bfin/local.mk
index d3c5b17a82b9..90b697e9dcb0 100644
--- a/sim/bfin/local.mk
+++ b/sim/bfin/local.mk
@@ -35,8 +35,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/bpf/local.mk b/sim/bpf/local.mk
index 580f744520c8..5f559c93a02e 100644
--- a/sim/bpf/local.mk
+++ b/sim/bpf/local.mk
@@ -52,8 +52,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/cr16/local.mk b/sim/cr16/local.mk
index 7cdfc3fe67f1..8d8d27f82e67 100644
--- a/sim/cr16/local.mk
+++ b/sim/cr16/local.mk
@@ -30,8 +30,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/cris/local.mk b/sim/cris/local.mk
index 3950baed7a10..78f40e03ec49 100644
--- a/sim/cris/local.mk
+++ b/sim/cris/local.mk
@@ -47,8 +47,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/d10v/local.mk b/sim/d10v/local.mk
index eb769bc0d9bf..04dd763f57c0 100644
--- a/sim/d10v/local.mk
+++ b/sim/d10v/local.mk
@@ -31,8 +31,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/erc32/local.mk b/sim/erc32/local.mk
index 12aced4bafa4..2361cf2eafc8 100644
--- a/sim/erc32/local.mk
+++ b/sim/erc32/local.mk
@@ -39,8 +39,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/example-synacor/local.mk b/sim/example-synacor/local.mk
index f1d4974be2a2..37999807ba32 100644
--- a/sim/example-synacor/local.mk
+++ b/sim/example-synacor/local.mk
@@ -29,8 +29,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/frv/local.mk b/sim/frv/local.mk
index a060a46ffa8f..8c2a61588429 100644
--- a/sim/frv/local.mk
+++ b/sim/frv/local.mk
@@ -63,8 +63,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/ft32/local.mk b/sim/ft32/local.mk
index b3eca03be7b1..36081effabec 100644
--- a/sim/ft32/local.mk
+++ b/sim/ft32/local.mk
@@ -28,8 +28,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/h8300/local.mk b/sim/h8300/local.mk
index af4ecc197bf7..dca8084763d0 100644
--- a/sim/h8300/local.mk
+++ b/sim/h8300/local.mk
@@ -28,8 +28,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/iq2000/local.mk b/sim/iq2000/local.mk
index abc8b31a8ab5..34589dbad885 100644
--- a/sim/iq2000/local.mk
+++ b/sim/iq2000/local.mk
@@ -41,8 +41,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/lm32/local.mk b/sim/lm32/local.mk
index d61566ecb4e9..f3e0567d73bf 100644
--- a/sim/lm32/local.mk
+++ b/sim/lm32/local.mk
@@ -44,8 +44,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/m32c/local.mk b/sim/m32c/local.mk
index e992b01d3067..ad047f17b783 100644
--- a/sim/m32c/local.mk
+++ b/sim/m32c/local.mk
@@ -37,8 +37,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/m32r/local.mk b/sim/m32r/local.mk
index 3ccfce79b095..31178a3b034e 100644
--- a/sim/m32r/local.mk
+++ b/sim/m32r/local.mk
@@ -70,8 +70,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/m68hc11/local.mk b/sim/m68hc11/local.mk
index 79350c8fc270..da4c25913d8f 100644
--- a/sim/m68hc11/local.mk
+++ b/sim/m68hc11/local.mk
@@ -45,8 +45,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/mcore/local.mk b/sim/mcore/local.mk
index 69cb043df967..dff8a684ef44 100644
--- a/sim/mcore/local.mk
+++ b/sim/mcore/local.mk
@@ -28,8 +28,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/microblaze/local.mk b/sim/microblaze/local.mk
index 69cb043df967..dff8a684ef44 100644
--- a/sim/microblaze/local.mk
+++ b/sim/microblaze/local.mk
@@ -28,8 +28,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/mips/local.mk b/sim/mips/local.mk
index c25e50b1d65f..136eebaacafa 100644
--- a/sim/mips/local.mk
+++ b/sim/mips/local.mk
@@ -74,8 +74,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/mn10300/local.mk b/sim/mn10300/local.mk
index 527d580804e7..61c7f9188eaf 100644
--- a/sim/mn10300/local.mk
+++ b/sim/mn10300/local.mk
@@ -41,8 +41,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/moxie/local.mk b/sim/moxie/local.mk
index b75f0a9a8e31..4b7d2984f16e 100644
--- a/sim/moxie/local.mk
+++ b/sim/moxie/local.mk
@@ -30,8 +30,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/msp430/local.mk b/sim/msp430/local.mk
index 0d9e8c2147f0..bb7afd304705 100644
--- a/sim/msp430/local.mk
+++ b/sim/msp430/local.mk
@@ -28,8 +28,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/or1k/local.mk b/sim/or1k/local.mk
index 1294986a6d8b..2a3b129c9fb9 100644
--- a/sim/or1k/local.mk
+++ b/sim/or1k/local.mk
@@ -45,8 +45,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/pru/local.mk b/sim/pru/local.mk
index 75f842a4689c..0048199f6d3e 100644
--- a/sim/pru/local.mk
+++ b/sim/pru/local.mk
@@ -28,8 +28,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/riscv/local.mk b/sim/riscv/local.mk
index a77f6f74317d..a3f232eea5ec 100644
--- a/sim/riscv/local.mk
+++ b/sim/riscv/local.mk
@@ -32,8 +32,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/rl78/local.mk b/sim/rl78/local.mk
index 13962a9e3024..56161eae25a2 100644
--- a/sim/rl78/local.mk
+++ b/sim/rl78/local.mk
@@ -30,8 +30,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/rx/local.mk b/sim/rx/local.mk
index 7115286a9b50..3b1e199e68b8 100644
--- a/sim/rx/local.mk
+++ b/sim/rx/local.mk
@@ -36,8 +36,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/sh/local.mk b/sim/sh/local.mk
index 8bfbc0fa2835..558a747d2661 100644
--- a/sim/sh/local.mk
+++ b/sim/sh/local.mk
@@ -28,8 +28,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \
diff --git a/sim/v850/local.mk b/sim/v850/local.mk
index b044db1638f8..62d3e82ff76a 100644
--- a/sim/v850/local.mk
+++ b/sim/v850/local.mk
@@ -38,8 +38,8 @@  $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
 
 noinst_LIBRARIES += %D%/libsim.a
 
-%D%/%.o: common/%.c
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+%D%/%.o: common/%.c ; $(SIM_COMPILE)
+-@am__include@ %D%/$(DEPDIR)/*.Po
 
 %C%_run_SOURCES =
 %C%_run_LDADD = \