* Makefile.in (SIM_EXTRA_DEPS): Add sh-desc.h sh-opc.h.

	(sh-desc.o): New rule.
	(sh-desc.h,sh-desc.c,sh-opc.h): Replaces rule for desc.h.
	(all generated file rules): Specify generated file with full path.

2 files changed, 23 insertions, 10 deletions

diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog
index 12ce416..e3a0a7f 100644
--- a/sim/sh64/ChangeLog
+++ b/sim/sh64/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-03  Doug Evans  <dje@sebabeach.org>
+
+	* Makefile.in (SIM_EXTRA_DEPS): Add sh-desc.h sh-opc.h.
+	(sh-desc.o): New rule.
+	(sh-desc.h,sh-desc.c,sh-opc.h): Replaces rule for desc.h.
+	(all generated file rules): Specify generated file with full path.
+
 2009-10-24  Doug Evans  <dje@sebabeach.org>
 
 	* sh-desc.h: Regenerate.
diff --git a/sim/sh64/Makefile.in b/sim/sh64/Makefile.in
index 41c7dbd..9e053b0 100644
--- a/sim/sh64/Makefile.in
+++ b/sim/sh64/Makefile.in
@@ -40,7 +40,7 @@ SIM_OBJS = \
 # Extra headers included by sim-main.h.
 SIM_EXTRA_DEPS = \
 	$(CGEN_INCLUDE_DEPS) \
-	arch.h cpuall.h sh64-sim.h
+	arch.h cpuall.h sh64-sim.h sh-desc.h sh-opc.h
 
 SIM_EXTRA_CFLAGS =
 
@@ -55,6 +55,8 @@ sim-if.o: sim-if.c $(SIM_MAIN_DEPS) $(srcdir)/../common/sim-core.h
 
 arch.o: arch.c $(SIM_MAIN_DEPS)
 
+sh-desc.o: sh-desc.c $(SIM_MAIN_DEPS)
+
 devices.o: devices.c $(SIM_MAIN_DEPS)
 
 # SH64 objs
@@ -73,7 +75,7 @@ mloop-compact.o: mloop-compact.c sem-compact-switch.c $(SH64_INCLUDE_DEPS)
 mloop-media.o: mloop-media.c sem-media-switch.c $(SH64_INCLUDE_DEPS)
 	$(CC) -c $(srcdir)/mloop-media.c $(ALL_CFLAGS) -DWANT_ISA_MEDIA
 
-cpu.o: cpu.c $(SH64_INCLUDE_DEPS)
+cpu.o: $(srcdir)/cpu.c $(SH64_INCLUDE_DEPS)
 
 decode-compact.o: decode-compact.c $(SH64_INCLUDE_DEPS)
 	$(CC) -c $(srcdir)/decode-compact.c $(ALL_CFLAGS) -DWANT_ISA_COMPACT
@@ -97,23 +99,27 @@ CGEN_MAINT = ; @true
 # The following line is commented in or out depending upon --enable-cgen-maint.
 @CGEN_MAINT@CGEN_MAINT =
 
+# Utility rules for humans.
 .PHONY: stamp-all stamp-decode stamp-defs
-
 stamp-all: stamp-arch stamp-desc stamp-cpu stamp-decode stamp-defs
 stamp-decode: stamp-decode-compact stamp-decode-media
 stamp-defs: stamp-defs-compact stamp-defs-media
 
+# NOTE: Generated source files are specified as full paths,
+# e.g. $(srcdir)/arch.c, because make may decide the files live
+# in objdir otherwise.
+
 stamp-arch: $(CGEN_READ_SCM) $(CGEN_ARCH_SCM) $(CGEN_CPU_DIR)/sh.cpu $(CGEN_CPU_DIR)/sh.opc $(CGEN_CPU_DIR)/sh64-media.cpu $(CGEN_CPU_DIR)/sh64-compact.cpu $(CGEN_CPU_DIR)/sh-sim.cpu Makefile
 	$(MAKE) cgen-arch $(CGEN_FLAGS_TO_PASS) mach=all isa=compact,media archfile=$(CGEN_CPU_DIR)/sh.cpu \
 	  FLAGS="with-scache"
 	touch $@
-arch.h ${srcdir}/arch.c cpuall.h: $(CGEN_MAINT) stamp-arch
+$(srcdir)/arch.h $(srcdir)/arch.c $(srcdir)/cpuall.h: $(CGEN_MAINT) stamp-arch
 	@true
 
 stamp-desc: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_CPU_DIR)/sh.cpu $(CGEN_CPU_DIR)/sh.opc $(CGEN_CPU_DIR)/sh64-compact.cpu $(CGEN_CPU_DIR)/sh64-media.cpu $(CGEN_CPU_DIR)/sh-sim.cpu Makefile
 	$(MAKE) cgen-desc $(CGEN_FLAGS_TO_PASS) cpu=sh64 mach=all isa=compact,media archfile=$(CGEN_CPU_DIR)/sh.cpu 
 	touch $@
-desc.h: $(CGEN_MAINT) stamp-desc
+$(srcdir)/sh-desc.h $(srcdir)/sh-desc.c $(srcdir)/sh-opc.h: $(CGEN_MAINT) stamp-desc
 	@true
 
 stamp-cpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_CPU_DIR)/sh.cpu $(CGEN_CPU_DIR)/sh.opc $(CGEN_CPU_DIR)/sh64-compact.cpu $(CGEN_CPU_DIR)/sh64-media.cpu $(CGEN_CPU_DIR)/sh-sim.cpu Makefile
@@ -121,28 +127,28 @@ stamp-cpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_CPU_DIR)/sh.cpu $(CGEN_CPU_DI
 	  cpu=sh64 mach=sh4,sh5 isa=compact,media FLAGS="with-multiple-isa with-scache" archfile=$(CGEN_CPU_DIR)/sh.cpu 
 	rm -f $(srcdir)/model.c
 	touch $@
-cpu.h: $(CGEN_MAINT) stamp-cpu
+$(srcdir)/cpu.h $(srcdir)/cpu.c: $(CGEN_MAINT) stamp-cpu
 	@true
 
 stamp-defs-compact: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_CPU_DIR)/sh.cpu $(CGEN_CPU_DIR)/sh.opc $(CGEN_CPU_DIR)/sh64-compact.cpu $(CGEN_CPU_DIR)/sh-sim.cpu Makefile
 	$(MAKE) cgen-defs $(CGEN_FLAGS_TO_PASS) \
 	  cpu=sh64 mach=sh5 isa=compact FLAGS="with-scache" SUFFIX="-compact" archfile=$(CGEN_CPU_DIR)/sh.cpu 
 	touch $@
-defs-compact.h: $(CGEN_MAINT) stamp-defs-compact
+$(srcdir)/defs-compact.h: $(CGEN_MAINT) stamp-defs-compact
 	@true
 
 stamp-defs-media: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_CPU_DIR)/sh.cpu $(CGEN_CPU_DIR)/sh.opc $(CGEN_CPU_DIR)/sh64-media.cpu $(CGEN_CPU_DIR)/sh-sim.cpu Makefile
 	$(MAKE) cgen-defs $(CGEN_FLAGS_TO_PASS) \
 	  cpu=sh64 mach=sh5 isa=media FLAGS="with-scache" SUFFIX="-media" archfile=$(CGEN_CPU_DIR)/sh.cpu 
 	touch $@
-defs-media.h: $(CGEN_MAINT) stamp-defs-media
+$(srcdir)/defs-media.h: $(CGEN_MAINT) stamp-defs-media
 
 stamp-decode-compact: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DIR)/sh.cpu $(CGEN_CPU_DIR)/sh.opc $(CGEN_CPU_DIR)/sh64-compact.cpu $(CGEN_CPU_DIR)/sh-sim.cpu Makefile
 	$(MAKE) cgen-decode $(CGEN_FLAGS_TO_PASS) \
 	  cpu=sh64 mach=sh5 isa=compact FLAGS="with-scache" SUFFIX="-compact" EXTRAFILES="$(CGEN_CPU_SEM) $(CGEN_CPU_SEMSW)" \
 	  archfile=$(CGEN_CPU_DIR)/sh.cpu
 	touch $@
-sem-compact.c sem-compact-switch.c decode-compact.c decode-compact.h: $(CGEN_MAINT) stamp-decode-compact
+$(srcdir)/sem-compact.c $(srcdir)/sem-compact-switch.c $(srcdir)/decode-compact.c $(srcdir)/decode-compact.h: $(CGEN_MAINT) stamp-decode-compact
 	@true
 
 stamp-decode-media: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DIR)/sh.cpu $(CGEN_CPU_DIR)/sh.opc $(CGEN_CPU_DIR)/sh64-media.cpu $(CGEN_CPU_DIR)/sh-sim.cpu Makefile
@@ -150,5 +156,5 @@ stamp-decode-media: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_C
 	  cpu=sh64 mach=sh5 isa=media FLAGS="with-scache" SUFFIX="-media" EXTRAFILES="$(CGEN_CPU_SEM) $(CGEN_CPU_SEMSW)" \
 	  archfile=$(CGEN_CPU_DIR)/sh.cpu
 	touch $@
-sem-media.c sem-media-switch.c decode-media.c decode-media.h: $(CGEN_MAINT) stamp-decode-media
+$(srcdir)/sem-media.c $(srcdir)/sem-media-switch.c $(srcdir)/decode-media.c $(srcdir)/decode-media.h: $(CGEN_MAINT) stamp-decode-media
 	@true