* config/h8300/h8300.mt: Renamed from h8300hms.mt.

	* config/h8500/h8500.mt: Renamed from h8500hms.mt.
	* config/z8k/z8k.mt: Renamed from z8ksim.mt.
	* configure, configure.in: Update to reflect renamings.

	* remote-sim.c (sim): New command, passes commands to simulator.
	(simulator_command): New function.
	(gdbsim_ops): Clean up.
	* remote-sim.h (sim_do_command): Declare.
	* sh-tdep.c (memory_size): Remove command.

	* Makefile.in (SIM, SIM_OBS): New variables.
	(CLIBS, CDEPS): Add value of SIM.
	(DEPFILES): Add value of SIM_OBS

	* config/arm/arm.mt, config/h8300/h8300.mt, config/h8500/h8500.mt,
	config/sh/sh.mt, config/sparc/sp64sim.mt, config/w65/w65.mt,
	config/z8k/z8k.mt: Remove simulator files from TDEPFILES,
	define in SIM_OBS and SIM.
	config/sparc/sp64sim.mt (SIMFILES): Remove.

	* remote-z8k.c: Remove, was superseded by remote-sim.c
	* Makefile.in, mpw-make.in: Remove references to remote-z8k.c.

10 files changed, 37 insertions, 25 deletions

diff --git a/gdb/config/arm/arm.mt b/gdb/config/arm/arm.mt
index b0e4dbe..fd951ea 100644
--- a/gdb/config/arm/arm.mt
+++ b/gdb/config/arm/arm.mt
@@ -1,3 +1,6 @@
-# Target: Acorn RISC machine running RISCiX (4.3bsd)
-TDEPFILES= arm-tdep.o remote-sim.o ../sim/arm/libsim.a
+# Target: Acorn RISC machine (ARM) with simulator
+TDEPFILES= arm-tdep.o
 TM_FILE= tm-arm.h
+
+SIM_OBS = remote-sim.o
+SIM = ../sim/arm/libsim.a
diff --git a/gdb/config/h8300/h8300.mt b/gdb/config/h8300/h8300.mt
new file mode 100644
index 0000000..80386f3
--- /dev/null
+++ b/gdb/config/h8300/h8300.mt
@@ -0,0 +1,6 @@
+# Target: H8300 with HMS monitor, E7000 ICE and H8 simulator
+TDEPFILES= h8300-tdep.o remote-e7000.o ser-e7kpc.o monitor.o remote-hms.o
+TM_FILE= tm-h8300.h
+
+SIM_OBS = remote-sim.o
+SIM = ../sim/h8300/compile.o
diff --git a/gdb/config/h8300/h8300hms.mt b/gdb/config/h8300/h8300hms.mt
deleted file mode 100644
index 7e1b19e..0000000
--- a/gdb/config/h8300/h8300hms.mt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Target: H8300 with HMS monitor, E7000 ICE and H8 simulator
-TDEPFILES= h8300-tdep.o ser-e7kpc.o remote-e7000.o monitor.o remote-hms.o remote-sim.o ../sim/h8300/compile.o
-TM_FILE= tm-h8300.h
diff --git a/gdb/config/h8500/h8500.mt b/gdb/config/h8500/h8500.mt
new file mode 100644
index 0000000..e8c6f5c
--- /dev/null
+++ b/gdb/config/h8500/h8500.mt
@@ -0,0 +1,6 @@
+# Target: H8500 with HMS monitor and H8 simulator
+TDEPFILES= h8500-tdep.o remote-hms.o
+TM_FILE= tm-h8500.h
+
+SIM_OBS = remote-sim.o
+SIM = ../sim/h8500/compile.o
diff --git a/gdb/config/h8500/h8500hms.mt b/gdb/config/h8500/h8500hms.mt
deleted file mode 100644
index 68154cb..0000000
--- a/gdb/config/h8500/h8500hms.mt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Target: H8500 with HMS monitor and H8 simulator
-TDEPFILES= h8500-tdep.o  remote-hms.o remote-sim.o ../sim/h8500/compile.o
-TM_FILE= tm-h8500.h
diff --git a/gdb/config/sh/sh.mt b/gdb/config/sh/sh.mt
index 0581244..c1a0f7c 100644
--- a/gdb/config/sh/sh.mt
+++ b/gdb/config/sh/sh.mt
@@ -1,5 +1,6 @@
-# Target: Hitachi Super-H ICE and simulator
-TDEPFILES=  sh-tdep.o remote-sim.o ../sim/sh/libsim.a remote-e7000.o  ser-e7kpc.o
-over: all
-
+# Target: Hitachi Super-H with ICE and simulator
+TDEPFILES= sh-tdep.o remote-e7000.o ser-e7kpc.o
 TM_FILE= tm-sh.h
+
+SIM_OBS = remote-sim.o
+SIM = ../sim/sh/libsim.a
diff --git a/gdb/config/sparc/sp64sim.mt b/gdb/config/sparc/sp64sim.mt
index b748180..6613284 100644
--- a/gdb/config/sparc/sp64sim.mt
+++ b/gdb/config/sparc/sp64sim.mt
@@ -2,14 +2,15 @@
 # solib.o and procfs.o taken out for now.  We don't have shared libraries yet,
 # and the elf version requires procfs.o but the a.out version doesn't.
 # Then again, having procfs.o in a target makefile fragment seems wrong.
-TDEPFILES = sparc-tdep.o $(SIMFILES)
+TDEPFILES = sparc-tdep.o
 TM_FILE= tm-sp64.h
 
 # Need gcc for long long support.
 CC = gcc
 
 MH_CFLAGS = -I${srcdir}/../sim/sp64
-SIMFILES = remote-sim.o ../sim/sp64/libsim.a
+SIM_OBS = remote-sim.o
+SIM = ../sim/sp64/libsim.a
 
 # The simulator uses the sqrt() function.
 TM_CLIBS = -lm
diff --git a/gdb/config/w65/w65.mt b/gdb/config/w65/w65.mt
index 0d61dcc..06d2325 100755
--- a/gdb/config/w65/w65.mt
+++ b/gdb/config/w65/w65.mt
@@ -1,11 +1,8 @@
-# Target: WDC 65816 simulator
-TDEPFILES=  w65-tdep.o remote-sim.o libsim.a
-
-other:all
+# Target: WDC 65816 with simulator
+TDEPFILES= w65-tdep.o
+TM_FILE= tm-w65.h
 
-libsim.a:
-	cp ../sim/w65/libsim.a .
-	ranlib libsim.a
+SIM_OBS = remote-sim.o
+SIM = ../sim/w65/libsim.a
 
 
-TM_FILE= tm-w65.h
diff --git a/gdb/config/z8k/z8k.mt b/gdb/config/z8k/z8k.mt
new file mode 100644
index 0000000..cb8d043
--- /dev/null
+++ b/gdb/config/z8k/z8k.mt
@@ -0,0 +1,7 @@
+# Target: Z8000 with simulator
+TDEPFILES= z8k-tdep.o
+TM_FILE= tm-z8k.h
+
+SIM_OBS = remote-sim.o
+SIM = ../sim/z8k/libsim.a
+
diff --git a/gdb/config/z8k/z8ksim.mt b/gdb/config/z8k/z8ksim.mt
deleted file mode 100644
index 744470c..0000000
--- a/gdb/config/z8k/z8ksim.mt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Target: Z8000 simulator
-TDEPFILES= z8k-tdep.o remote-sim.o ../sim/z8k/libsim.a
-TM_FILE= tm-z8k.h