* Make-common.in (CGEN_SIM_DEPS): Define.

	(CGEN_INCLUDE_DEPS): Use it.
	(CGEN_MAIN_CPU_DEPS): Simplify.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index dfe328c7dbaf1da364b5cfbac36fd7941f2f4616..2f62553d9159d747799a9350c63c2664386a1a5a 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-24  Doug Evans  <dje@sebabeach.org>
+
+       * Make-common.in (CGEN_SIM_DEPS): Define.
+       (CGEN_INCLUDE_DEPS): Use it.
+       (CGEN_MAIN_CPU_DEPS): Simplify.
+
 2010-01-22  Doug Evans  <dje@sebabeach.org>
 
        * cgen-ops.h (SUBWORDXFSI): Fix word ordering.

diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 4457477393564c89a516356a3249c5587c06454a..9dd79ab0a9344b1a975bc768e8cec09cf2f55f82 100644 (file)
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -181,14 +181,21 @@ SIM_NEW_COMMON_OBJS = \
        \
        $(SIM_HW_OBJS) \
 
-# Add this to SIM_EXTRA_DEPS.
-CGEN_INCLUDE_DEPS = \
-       $(srccom)/cgen-cpu.h \
+# cgen-sim.h and the headers it includes
+CGEN_SIM_DEPS = \
+       $(srccom)/cgen-sim.h \
        $(srccom)/cgen-defs.h \
-       $(srccom)/cgen-engine.h \
        $(srccom)/cgen-scache.h \
-       $(srccom)/cgen-sim.h \
+       $(srccom)/cgen-fpu.h \
+       $(srccom)/cgen-par.h \
+       $(srccom)/cgen-cpu.h \
        $(srccom)/cgen-trace.h \
+       cpuall.h
+
+# Add this to SIM_EXTRA_DEPS.
+CGEN_INCLUDE_DEPS = \
+       $(CGEN_SIM_DEPS) \
+       $(srccom)/cgen-engine.h \
        $(srccom)/cgen-types.h \
        $(srcdir)/../../include/opcode/cgen.h
 
@@ -590,11 +597,8 @@ nrun.o: $(srccom)/nrun.c config.h tconfig.h $(remote_sim_h) $(callback_h) \
 # For use in Makefile.in for cpu-specific files.
 CGEN_MAIN_CPU_DEPS = \
        $(SIM_MAIN_DEPS) \
-       $(CGEN_INCLUDE_DEPS) \
        $(srccom)/cgen-ops.h \
-       $(srccom)/cgen-mem.h \
-       $(srccom)/cgen-par.h \
-       $(srccom)/cgen-fpu.h
+       $(srccom)/cgen-mem.h
 
 cgen-run.o: $(srccom)/cgen-run.c $(sim_main_headers)
        $(CC) -c $(srccom)/cgen-run.c $(ALL_CFLAGS)