From f261333bd389db094cf3bcbf8e68b2a8d72f79d8 Mon Sep 17 00:00:00 2001
From: Jim Kingdon <jkingdon@engr.sgi.com>
Date: Thu, 22 Jul 1993 22:47:34 +0000
Subject: [PATCH] 	* Makefile.in: Use REMOTE_O macro not remote.o. 
 * config/i960/{nindy960,vxworks960}: Don't use remote.o.

---
 gdb/ChangeLog                 | 5 +++++
 gdb/Makefile.in               | 6 +++++-
 gdb/config/i960/nindy960.mt   | 3 +++
 gdb/config/i960/vxworks960.mt | 3 +++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3c4fb3643e..82e301b191 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 22 15:41:09 1993  Jim Kingdon  (kingdon@deneb.cygnus.com)
+
+	* Makefile.in: Use REMOTE_O macro not remote.o.
+	* config/i960/{nindy960,vxworks960}: Don't use remote.o.
+
 Thu Jul 22 12:43:25 1993  Ian Lance Taylor  (ian@cygnus.com)
 
 	* coredep.c: If NEED_SYS_CORE_H defined, include <sys/core.h>
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 6af47c02a9..a36dd6bea4 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -187,6 +187,10 @@ RUNTESTFLAGS=
 # besides ser-unix.o
 SER_HARDWIRE=ser-unix.o
 
+# The `remote' debugging target is supported for most architectures,
+# but not all (e.g. 960)
+REMOTE_O=remote.o
+
 # Host and target-dependent makefile fragments come in here.
 ####
 # End of host and target-dependent makefile fragments
@@ -386,7 +390,7 @@ TARDIRS = doc sparclite
 # variables analogous to SER_HARDWIRE which get defaulted in this
 # Makefile.in
 
-DEPFILES = $(TDEPFILES) $(XDEPFILES) $(SER_HARDWIRE) $(NATDEPFILES)
+DEPFILES = $(TDEPFILES) $(XDEPFILES) $(SER_HARDWIRE) $(NATDEPFILES) $(REMOTE_O)
 
 SOURCES = $(SFILES) $(ALLDEPFILES) $(YYFILES)
 # Don't include YYFILES (*.tab.c) because we already include *.y in SFILES,
diff --git a/gdb/config/i960/nindy960.mt b/gdb/config/i960/nindy960.mt
index fc1234813d..a8bc818da6 100644
--- a/gdb/config/i960/nindy960.mt
+++ b/gdb/config/i960/nindy960.mt
@@ -1,3 +1,6 @@
 # Target: Intel 80960, in an embedded system under the NINDY monitor
 TDEPFILES= exec.o i960-pinsn.o i960-tdep.o nindy-tdep.o remote-nindy.o nindy.o Onindy.o ttybreak.o ttyflush.o
 TM_FILE= tm-nindy960.h
+# Don't use remote.o; it doesn't compile (and won't work) due to lack of
+# BREAKPOINT.
+REMOTE_O=
diff --git a/gdb/config/i960/vxworks960.mt b/gdb/config/i960/vxworks960.mt
index 287d1850bb..12f1032941 100644
--- a/gdb/config/i960/vxworks960.mt
+++ b/gdb/config/i960/vxworks960.mt
@@ -3,3 +3,6 @@ TDEPFILES= exec.o i960-pinsn.o i960-tdep.o remote-vx.o xdr_ld.o xdr_ptrace.o xdr
 TM_FILE= tm-vx960.h
 # Define this for the vx-share routines, which don't see param.h.
 MT_CFLAGS= -DI80960
+# Don't use remote.o; it doesn't compile (and won't work) due to lack of
+# BREAKPOINT.
+REMOTE_O=
-- 
2.34.1