From: Doug Evans <dje@google.com>
Date: Mon, 25 Jan 2010 00:48:17 +0000 (+0000)
Subject: 	* Make-common.in (CGEN_SIM_DEPS): Define.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=80532737986a54ba841f5aabbc290d0de7c5cf70;p=binutils-gdb.git

	* 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 dfe328c7dba..2f62553d915 100644
--- 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 44574773935..9dd79ab0a93 100644
--- 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)