Remove XDEPFILES from GDB.

89 files changed, 110 insertions, 100 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bf90a41..c77455a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,96 @@
 2002-01-17  Andrew Cagney  <ac131313@redhat.com>
 
+	* config/alpha/alpha-osf3.mh (XDEPFILES): Delete.
+	* config/alpha/alpha-osf2.mh (XDEPFILES): Delete.
+	* config/alpha/alpha-osf1.mh (XDEPFILES): Delete.
+	* config/alpha/alpha-linux.mh (XDEPFILES): Delete.
+	* config/alpha/fbsd.mh (XDEPFILES): Delete.
+	* config/arm/linux.mh (XDEPFILES): Delete.
+	* config/arm/nbsd.mh (XDEPFILES): Delete.
+	* config/i386/i386dgux.mh (XDEPFILES): Delete.
+	* config/i386/i386sol2.mh (XDEPFILES): Delete.
+	* config/i386/i386m3.mh (XDEPFILES): Delete.
+	(NATDEPFILES): Move i387-tdep.o and core-aout.o to here.
+	* config/i386/i386gnu.mh (XDEPFILES): Delete.
+	* config/i386/fbsd.mh (XDEPFILES): Delete.
+	* config/i386/i386bsd.mh (XDEPFILES): Delete.
+	* config/i386/i386sco5.mh (XDEPFILES): Delete.
+	* config/i386/i386v4.mh (XDEPFILES): Delete.
+	* config/i386/i386v42mp.mh (XDEPFILES): Delete.
+	* config/i386/i386sco4.mh (XDEPFILES): Delete.
+	* config/i386/i386aix.mh (XDEPFILES): Delete.
+	* config/i386/go32.mh (XDEPFILES): Delete.
+	* config/i386/cygwin.mh (XDEPFILES): Delete.
+	* config/i386/i386lynx.mh (XDEPFILES): Delete.
+	* config/i386/i386mach.mh (XDEPFILES): Delete.
+	* config/i386/i386v32.mh (XDEPFILES): Delete.
+	* config/i386/linux.mh (XDEPFILES): Delete.
+	* config/i386/nbsdelf.mh (XDEPFILES): Delete.
+	* config/i386/ncr3000.mh (XDEPFILES): Delete.
+	* config/i386/i386mk.mh (NATDEPFILES): Rename XDEPFILES.
+	* config/i386/i386sco.mh (XDEPFILES): Delete.
+	* config/i386/i386v.mh (XDEPFILES): Delete.
+	* config/i386/nbsd.mh (XDEPFILES): Delete.
+	* config/i386/ptx.mh (NATDEPFILES): Rename XDEPFILES.
+	* config/i386/ptx4.mh (NATDEPFILES): Rename XDEPFILES.
+	* config/i386/symmetry.mh (XDEPFILES): Delete.
+	* config/i386/obsd.mh (XDEPFILES): Delete.
+	* config/i386/x86-64linux.mh (XDEPFILES): Delete.
+	* config/ia64/linux.mh (XDEPFILES): Delete.
+	* config/ia64/aix.mh (XDEPFILES): Delete.
+	* config/m68k/apollo68b.mh (XDEPFILES): Delete.
+	* config/m68k/dpx2.mh (XDEPFILES): Delete.
+	* config/m68k/3b1.mh (NATDEPFILES): Rename XDEPFILES.
+	* config/m68k/apollo68v.mh (XDEPFILES): Delete.
+	* config/m68k/hp300bsd.mh (XDEPFILES): Delete.
+	* config/m68k/linux.mh (XDEPFILES): Delete.
+	* config/m68k/m68klynx.mh (XDEPFILES): Delete.
+	* config/m68k/m68kv4.mh (XDEPFILES): Delete.
+	* config/m68k/nbsd.mh (XDEPFILES): Delete.
+	* config/m68k/sun2os3.mh (XDEPFILES): Delete.
+	* config/m68k/sun2os4.mh (XDEPFILES): Delete.
+	* config/m68k/sun3os3.mh (XDEPFILES): Delete.
+	* config/m68k/sun3os4.mh (XDEPFILES): Delete.
+	* config/m88k/delta88.mh (XDEPFILES): Delete.
+	* config/m88k/delta88v4.mh (XDEPFILES): Delete.
+	* config/m88k/m88k.mh (XDEPFILES): Delete.
+	* config/mips/littlemips.mh (NATDEPFILES): Rename XDEPFILES.
+	* config/mips/linux.mh (XDEPFILES): Delete.
+	* config/mips/irix6.mh (XDEPFILES): Delete.
+	* config/mips/irix5.mh (XDEPFILES): Delete.
+	* config/mips/irix4.mh (XDEPFILES): Delete.
+	* config/mips/irix3.mh (XDEPFILES): Delete.
+	* config/mips/decstation.mh (XDEPFILES): Delete.
+	* config/mips/mipsm3.mh (XDEPFILES): Delete.
+	(NATDEPFILES): Move core-aout.o to here.
+	* config/ns32k/nbsd.mh (XDEPFILES): Delete.
+	* config/pa/hpux1020.mh (XDEPFILES): Delete.
+	* config/pa/hppabsd.mh (XDEPFILES): Delete.
+	* config/pa/hppahpux.mh (XDEPFILES): Delete.
+	* config/pa/hpux11w.mh (XDEPFILES): Delete.
+	* config/pa/hppaosf.mh (XDEPFILES): Delete.
+	* config/pa/hpux11.mh (XDEPFILES): Delete.
+	* config/powerpc/aix.mh (XDEPFILES): Delete.
+	* config/powerpc/nbsd.mh (XDEPFILES): Delete.
+	* config/powerpc/linux.mh (XDEPFILES): Delete.
+	* config/romp/rtbsd.mh: Rename XDEPFILES.
+	* config/rs6000/rs6000lynx.mh (XDEPFILES): Delete.
+	* config/rs6000/aix4.mh (XDEPFILES): Delete.
+	* config/rs6000/rs6000.mh (XDEPFILES): Delete.
+	* config/s390/s390.mh (XDEPFILES): Delete.
+	* config/vax/vaxbsd.mh (NATDEPFILES): Rename XDEPFILES.
+	* config/sparc/sun4sol2.mh (XDEPFILES): Delete.
+	* config/sparc/sun4os4.mh (XDEPFILES): Delete.
+	* config/sparc/sparclynx.mh (XDEPFILES): Delete.
+	* config/sparc/nbsdelf.mh (XDEPFILES): Delete.
+	* config/sparc/nbsd.mh (XDEPFILES): Delete.
+	* config/sparc/linux.mh (XDEPFILES): Delete.
+	* config/vax/vaxult.mh (XDEPFILES): Delete.
+	* config/vax/vaxult2.mh (XDEPFILES): Delete.
+	* Makefile.in (DEPFILES): Remove XDEPFILES.
+
+2002-01-17  Andrew Cagney  <ac131313@redhat.com>
+
 	* utils.c (internal_verror): Fix comments, default is yes not no.
 	Update queries to match.  Default to quit and dump core.
 
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 0c92c1e..4e4e548 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -691,7 +691,7 @@ REMOTE_EXAMPLES = m68k-stub.c i386-stub.c sparc-stub.c rem-multi.shar
 # variables analogous to SER_HARDWIRE which get defaulted in this
 # Makefile.in
 
-DEPFILES = $(TDEPFILES) $(XDEPFILES) $(SER_HARDWIRE) $(NATDEPFILES) \
+DEPFILES = $(TDEPFILES) $(SER_HARDWIRE) $(NATDEPFILES) \
 	   $(REMOTE_OBS) $(SIM_OBS) $(CONFIG_LIB_OBS)
 
 SOURCES = $(SFILES) $(ALLDEPFILES) $(YYFILES) $(CONFIG_SRCS)
diff --git a/gdb/config/alpha/alpha-linux.mh b/gdb/config/alpha/alpha-linux.mh
index 1aad944..39f3532 100644
--- a/gdb/config/alpha/alpha-linux.mh
+++ b/gdb/config/alpha/alpha-linux.mh
@@ -1,5 +1,4 @@
 # Host: Little-endian Alpha running Linux
-XDEPFILES=
 XM_FILE= xm-alphalinux.h
 NAT_FILE= nm-linux.h
 NATDEPFILES= infptrace.o inftarg.o corelow.o alpha-nat.o linux-proc.o \
diff --git a/gdb/config/alpha/alpha-osf1.mh b/gdb/config/alpha/alpha-osf1.mh
index 62654e8..6d53b44 100644
--- a/gdb/config/alpha/alpha-osf1.mh
+++ b/gdb/config/alpha/alpha-osf1.mh
@@ -1,5 +1,4 @@
 # Host: Little-endian Alpha running OSF/1-1.x
-XDEPFILES= 
 XM_FILE= xm-alphaosf.h
 NAT_FILE= nm-osf.h
 NATDEPFILES= infptrace.o inftarg.o corelow.o alpha-nat.o fork-child.o \
diff --git a/gdb/config/alpha/alpha-osf2.mh b/gdb/config/alpha/alpha-osf2.mh
index 8b4d841..b853ebb 100644
--- a/gdb/config/alpha/alpha-osf2.mh
+++ b/gdb/config/alpha/alpha-osf2.mh
@@ -1,5 +1,4 @@
 # Host: Little-endian Alpha running OSF/1-2.x using procfs
-XDEPFILES= 
 XM_FILE= xm-alphaosf.h
 NAT_FILE= nm-osf2.h
 NATDEPFILES= infptrace.o inftarg.o corelow.o alpha-nat.o fork-child.o \
diff --git a/gdb/config/alpha/alpha-osf3.mh b/gdb/config/alpha/alpha-osf3.mh
index 1ad2085..f074444 100644
--- a/gdb/config/alpha/alpha-osf3.mh
+++ b/gdb/config/alpha/alpha-osf3.mh
@@ -1,5 +1,4 @@
 # Host: Little-endian Alpha running OSF/1-3.x and higher using procfs
-XDEPFILES=
 XM_FILE= xm-alphaosf.h
 NAT_FILE= nm-osf3.h
 NATDEPFILES= infptrace.o inftarg.o corelow.o alpha-nat.o fork-child.o \
diff --git a/gdb/config/alpha/fbsd.mh b/gdb/config/alpha/fbsd.mh
index f59bca5..8db2fa6 100644
--- a/gdb/config/alpha/fbsd.mh
+++ b/gdb/config/alpha/fbsd.mh
@@ -1,5 +1,4 @@
 # Host: FreeBSD/Alpha
-XDEPFILES=
 NATDEPFILES= fork-child.o infptrace.o inftarg.o \
 	solib.o solib-svr4.o solib-legacy.o \
 	corelow.o core-regset.o alphabsd-nat.o
diff --git a/gdb/config/arm/linux.mh b/gdb/config/arm/linux.mh
index 8c9f530..fa1eb63 100644
--- a/gdb/config/arm/linux.mh
+++ b/gdb/config/arm/linux.mh
@@ -1,7 +1,6 @@
 # Host: ARM based machine running GNU/Linux
 
 XM_FILE= xm-linux.h
-XDEPFILES=
 
 NAT_FILE= nm-linux.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o	\
diff --git a/gdb/config/arm/nbsd.mh b/gdb/config/arm/nbsd.mh
index 2fccc3b..481d5cc 100644
--- a/gdb/config/arm/nbsd.mh
+++ b/gdb/config/arm/nbsd.mh
@@ -1,5 +1,4 @@
 # Host ARM running NetBSD
-XDEPFILES=
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o armnbsd-nat.o
 XM_FILE=xm-nbsd.h
 NAT_FILE=nm-nbsd.h
diff --git a/gdb/config/i386/cygwin.mh b/gdb/config/i386/cygwin.mh
index 454f489..3680fc7 100644
--- a/gdb/config/i386/cygwin.mh
+++ b/gdb/config/i386/cygwin.mh
@@ -1,6 +1,5 @@
 MH_CFLAGS=
 XM_FILE=xm-cygwin.h
-XDEPFILES=
 NATDEPFILES= win32-nat.o corelow.o
 NAT_FILE=../none/nm-none.h
 XM_CLIBS=
diff --git a/gdb/config/i386/fbsd.mh b/gdb/config/i386/fbsd.mh
index 8698d45..364dfa6 100644
--- a/gdb/config/i386/fbsd.mh
+++ b/gdb/config/i386/fbsd.mh
@@ -1,7 +1,6 @@
 # Host: Intel 386 running FreeBSD
 
 XM_FILE= xm-i386.h
-XDEPFILES=
 
 NAT_FILE= nm-fbsd.h
 # NOTE: Do not spread NATDEPFILES over several lines - it hurts BSD make.
diff --git a/gdb/config/i386/go32.mh b/gdb/config/i386/go32.mh
index 9534447..3d3bdfd 100644
--- a/gdb/config/i386/go32.mh
+++ b/gdb/config/i386/go32.mh
@@ -5,7 +5,6 @@ MMALLOC=
 MMALLOC_CFLAGS=
 
 XM_FILE= xm-go32.h
-XDEPFILES=
 
 NAT_FILE= nm-go32.h
 NATDEPFILES= go32-nat.o i386-nat.o i387-nat.o
diff --git a/gdb/config/i386/i386aix.mh b/gdb/config/i386/i386aix.mh
index cea05f0..af88729 100644
--- a/gdb/config/i386/i386aix.mh
+++ b/gdb/config/i386/i386aix.mh
@@ -1,7 +1,6 @@
 # Host: IBM PS/2 (i386) running AIX PS/2
 
 XM_FILE= xm-i386aix.h
-XDEPFILES= 
 
 NAT_FILE= nm-i386aix.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o i386aix-nat.o
diff --git a/gdb/config/i386/i386bsd.mh b/gdb/config/i386/i386bsd.mh
index f95c6ed..01457d4 100644
--- a/gdb/config/i386/i386bsd.mh
+++ b/gdb/config/i386/i386bsd.mh
@@ -1,7 +1,6 @@
 # Host: Intel 386 running 386BSD
 
 XM_FILE= xm-i386bsd.h
-XDEPFILES= 
 
 NAT_FILE= nm-i386bsd.h
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o core-aout.o i386b-nat.o
diff --git a/gdb/config/i386/i386dgux.mh b/gdb/config/i386/i386dgux.mh
index bbf9f91..fd7f56c 100644
--- a/gdb/config/i386/i386dgux.mh
+++ b/gdb/config/i386/i386dgux.mh
@@ -1,7 +1,6 @@
 # Host: Intel 386 running DGUX, cloned from SVR4
 
 XM_FILE= xm-i386v4.h
-XDEPFILES=
 # for network communication
 XM_CLIBS= -lsocket -lnsl
 
diff --git a/gdb/config/i386/i386gnu.mh b/gdb/config/i386/i386gnu.mh
index a250a28..252b2e5 100644
--- a/gdb/config/i386/i386gnu.mh
+++ b/gdb/config/i386/i386gnu.mh
@@ -1,5 +1,4 @@
 # Host: Intel 386 running the GNU Hurd
-XDEPFILES=
 NATDEPFILES= i386gnu-nat.o i387-nat.o gnu-nat.o fork-child.o solib.o solib-svr4.o solib-legacy.o corelow.o notify_S.o process_reply_S.o msg_reply_S.o msg_U.o exc_request_U.o exc_request_S.o
 XM_FILE= xm-i386gnu.h
 NAT_FILE= nm-gnu.h
diff --git a/gdb/config/i386/i386lynx.mh b/gdb/config/i386/i386lynx.mh
index 6fe9d95..13ffe08 100644
--- a/gdb/config/i386/i386lynx.mh
+++ b/gdb/config/i386/i386lynx.mh
@@ -2,7 +2,6 @@
 
 XM_FILE= xm-i386lynx.h
 XM_CLIBS= -lbsd
-XDEPFILES=
 
 NAT_FILE= nm-i386lynx.h
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o lynx-nat.o
diff --git a/gdb/config/i386/i386m3.mh b/gdb/config/i386/i386m3.mh
index 0a83ebf..41ea30c 100644
--- a/gdb/config/i386/i386m3.mh
+++ b/gdb/config/i386/i386m3.mh
@@ -1,7 +1,6 @@
 # Host: Intel 386 running Mach3
 
-XDEPFILES= i387-tdep.o core-aout.o
-NATDEPFILES= i386m3-nat.o m3-nat.o fork-child.o
+NATDEPFILES= i386m3-nat.o m3-nat.o fork-child.o i387-tdep.o core-aout.o
 NAT_CLIBS= -lmachid -lnetname -lmach
 XM_FILE= xm-i386m3.h
 NAT_FILE= nm-m3.h
diff --git a/gdb/config/i386/i386mach.mh b/gdb/config/i386/i386mach.mh
index 44766c5..90dbdf4 100644
--- a/gdb/config/i386/i386mach.mh
+++ b/gdb/config/i386/i386mach.mh
@@ -4,7 +4,6 @@
 # host and native, not target).  Once we get the mach3 stuff working,
 # I think it can go away.
 
-XDEPFILES= 
 XM_FILE= xm-i386mach.h
 NAT_FILE= nm-i386mach.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o i386mach-nat.o
diff --git a/gdb/config/i386/i386mk.mh b/gdb/config/i386/i386mk.mh
index 849677c..0c119be 100644
--- a/gdb/config/i386/i386mk.mh
+++ b/gdb/config/i386/i386mk.mh
@@ -1,4 +1,4 @@
 # Host: Intel 386 running Mach3 with OSF 1/MK
 
-XDEPFILES= os-mach3.o i386mach3-xdep.o i387-tdep.o
+NATDEPFILES= os-mach3.o i386mach3-xdep.o i387-tdep.o
 XM_FILE= xm-i386osf1mk.h
diff --git a/gdb/config/i386/i386sco.mh b/gdb/config/i386/i386sco.mh
index 69076b5..d039944 100644
--- a/gdb/config/i386/i386sco.mh
+++ b/gdb/config/i386/i386sco.mh
@@ -1,7 +1,6 @@
 # Host: Intel 386 running SCO Unix (pre-SVR4)
 
 XM_FILE= xm-i386sco.h
-XDEPFILES= 
 XM_CLIBS= -lPW
 
 NAT_FILE= nm-i386sco.h
diff --git a/gdb/config/i386/i386sco4.mh b/gdb/config/i386/i386sco4.mh
index a13f993..2507e07 100644
--- a/gdb/config/i386/i386sco4.mh
+++ b/gdb/config/i386/i386sco4.mh
@@ -1,7 +1,6 @@
 # Host: Intel 386 running SCO Unix 3.2v4
 
 XM_FILE= xm-i386sco.h
-XDEPFILES= 
 XM_CLIBS= -lPW
 
 NAT_FILE= nm-i386sco4.h
diff --git a/gdb/config/i386/i386sco5.mh b/gdb/config/i386/i386sco5.mh
index be71e77..7b8b827 100644
--- a/gdb/config/i386/i386sco5.mh
+++ b/gdb/config/i386/i386sco5.mh
@@ -8,7 +8,6 @@ XM_FILE= xm-i386sco.h
 # runtime, but all come with the development system, so we always
 # have socket(), gethostbyname(), and friends.
 #
-XDEPFILES=
 XM_CLIBS= -lPW -lsocket
 
 NAT_FILE= nm-i386sco5.h
diff --git a/gdb/config/i386/i386sol2.mh b/gdb/config/i386/i386sol2.mh
index 1b8169d..f230356 100644
--- a/gdb/config/i386/i386sol2.mh
+++ b/gdb/config/i386/i386sol2.mh
@@ -1,7 +1,6 @@
 # Host: Intel 386 running Solaris 2 (SVR4)
 
 XM_FILE= xm-i386v4.h
-XDEPFILES= 
 XM_CLIBS= -lsocket -lnsl
 
 NAT_FILE= nm-i386sol2.h
diff --git a/gdb/config/i386/i386v.mh b/gdb/config/i386/i386v.mh
index d67a30f..7f0ea6e 100644
--- a/gdb/config/i386/i386v.mh
+++ b/gdb/config/i386/i386v.mh
@@ -1,7 +1,6 @@
 # Host: Intel 386 running System V
 
 XM_FILE= xm-i386v.h
-XDEPFILES= 
 XM_CLIBS= -lPW
 
 NAT_FILE= nm-i386v.h
diff --git a/gdb/config/i386/i386v32.mh b/gdb/config/i386/i386v32.mh
index 5b4175f..f394372 100644
--- a/gdb/config/i386/i386v32.mh
+++ b/gdb/config/i386/i386v32.mh
@@ -1,7 +1,6 @@
 # Host: Intel 386 running System V release 3.2
 
 XM_FILE= xm-i386v32.h
-XDEPFILES= 
 XM_CLIBS= -lPW
 
 NAT_FILE= nm-i386v.h
diff --git a/gdb/config/i386/i386v4.mh b/gdb/config/i386/i386v4.mh
index 50347ab..a3952bc 100644
--- a/gdb/config/i386/i386v4.mh
+++ b/gdb/config/i386/i386v4.mh
@@ -1,7 +1,6 @@
 # Host: Intel 386 running SVR4
 
 XM_FILE= xm-i386v4.h
-XDEPFILES= 
 # for network communication
 XM_CLIBS= -lsocket -lnsl
 
diff --git a/gdb/config/i386/i386v42mp.mh b/gdb/config/i386/i386v42mp.mh
index f5da730..1165949 100644
--- a/gdb/config/i386/i386v42mp.mh
+++ b/gdb/config/i386/i386v42mp.mh
@@ -1,7 +1,6 @@
 # Host: Intel 386 running SVR4
 
 XM_FILE= xm-i386v4.h
-XDEPFILES= 
 # for network communication
 XM_CLIBS= -lsocket -lnsl
 
diff --git a/gdb/config/i386/linux.mh b/gdb/config/i386/linux.mh
index e3fb5ed..cc645e9 100644
--- a/gdb/config/i386/linux.mh
+++ b/gdb/config/i386/linux.mh
@@ -1,7 +1,6 @@
 # Host: Intel 386 running GNU/Linux.
 
 XM_FILE= xm-i386.h
-XDEPFILES=
 
 NAT_FILE= nm-linux.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o linux-proc.o \
diff --git a/gdb/config/i386/nbsd.mh b/gdb/config/i386/nbsd.mh
index 27fa189..66f4561 100644
--- a/gdb/config/i386/nbsd.mh
+++ b/gdb/config/i386/nbsd.mh
@@ -1,5 +1,4 @@
 # Host: Intel 386 running NetBSD
-XDEPFILES=
 
 # NATDEPFILES must remain entirely on one line for *BSD.  When
 # building a cross debugger, configure will cause this line to be
diff --git a/gdb/config/i386/nbsdelf.mh b/gdb/config/i386/nbsdelf.mh
index efa13ae..f25a406 100644
--- a/gdb/config/i386/nbsdelf.mh
+++ b/gdb/config/i386/nbsdelf.mh
@@ -1,5 +1,4 @@
 # Host: Intel 386 running NetBSD
-XDEPFILES=
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o i387-nat.o i386bsd-nat.o i386nbsd-nat.o solib.o solib-svr4.o solib-legacy.o
 XM_FILE= xm-nbsd.h
 NAT_FILE= nm-nbsdelf.h
diff --git a/gdb/config/i386/ncr3000.mh b/gdb/config/i386/ncr3000.mh
index 553c42c..4e669ba 100644
--- a/gdb/config/i386/ncr3000.mh
+++ b/gdb/config/i386/ncr3000.mh
@@ -10,7 +10,6 @@ CC = /usr/ccs/ATT/cc
 CFLAGS =
 
 XM_FILE= xm-i386v4.h
-XDEPFILES= 
 
 NAT_FILE= nm-i386v4.h
 NATDEPFILES= corelow.o core-regset.o fork-child.o i386v4-nat.o procfs.o \
diff --git a/gdb/config/i386/obsd.mh b/gdb/config/i386/obsd.mh
index e3f5f45..2bfd732 100644
--- a/gdb/config/i386/obsd.mh
+++ b/gdb/config/i386/obsd.mh
@@ -1,7 +1,6 @@
 # Host: Intel 386 running OpenBSD
 
 XM_FILE= xm-i386.h
-XDEPFILES=
 
 NAT_FILE= nm-obsd.h
 # NOTE: Do not spread NATDEPFILES over several lines - it hurts BSD make.
diff --git a/gdb/config/i386/ptx.mh b/gdb/config/i386/ptx.mh
index e623538..554b411 100644
--- a/gdb/config/i386/ptx.mh
+++ b/gdb/config/i386/ptx.mh
@@ -1,7 +1,7 @@
 # Host: Sequent Symmetry running ptx 1.3, with Weitek 1167 or i387
 
 XM_FILE= xm-ptx.h
-XDEPFILES= inftarg.o fork-child.o symm-nat.o corelow.o core-aout.o
+NATDEPFILES= inftarg.o fork-child.o symm-nat.o corelow.o core-aout.o
 XM_CLIBS= -lPW -lseq
 
 NAT_FILE= nm-symmetry.h
diff --git a/gdb/config/i386/ptx4.mh b/gdb/config/i386/ptx4.mh
index 8650063..e4aa55e 100644
--- a/gdb/config/i386/ptx4.mh
+++ b/gdb/config/i386/ptx4.mh
@@ -1,7 +1,7 @@
 # Host: Sequent Symmetry running ptx 1.3, with Weitek 1167 or i387
 
 XM_FILE= xm-ptx4.h
-XDEPFILES= inftarg.o fork-child.o symm-nat.o corelow.o core-aout.o \
+NATDEPFILES= inftarg.o fork-child.o symm-nat.o corelow.o core-aout.o \
 	core-regset.o solib.o solib-svr4.o solib-legacy.o
 XM_CLIBS= -lseq
 
diff --git a/gdb/config/i386/symmetry.mh b/gdb/config/i386/symmetry.mh
index 69c05bc..486a2fb 100644
--- a/gdb/config/i386/symmetry.mh
+++ b/gdb/config/i386/symmetry.mh
@@ -1,5 +1,4 @@
 # Host: Sequent Symmetry running Dynix 3.0, with Weitek 1167 or i387.
-XDEPFILES=
 XM_FILE= xm-symmetry.h
 NAT_FILE= nm-symmetry.h
 NATDEPFILES= inftarg.o fork-child.o corelow.o core-aout.o symm-nat.o
diff --git a/gdb/config/i386/x86-64linux.mh b/gdb/config/i386/x86-64linux.mh
index d6a8a70..d67fc34 100644
--- a/gdb/config/i386/x86-64linux.mh
+++ b/gdb/config/i386/x86-64linux.mh
@@ -1,7 +1,6 @@
 # Host: AMD x86-64 running GNU/Linux
 
 XM_FILE= xm-i386.h
-XDEPFILES=
 
 NAT_FILE= nm-x86-64.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o \
diff --git a/gdb/config/ia64/aix.mh b/gdb/config/ia64/aix.mh
index 51ba743..e180594 100644
--- a/gdb/config/ia64/aix.mh
+++ b/gdb/config/ia64/aix.mh
@@ -1,7 +1,6 @@
 # Host: Intel IA-64 running AIX
 
 XM_FILE= xm-aix.h
-XDEPFILES=
 
 NAT_FILE= nm-aix.h
 NATDEPFILES= corelow.o core-regset.o solib.o solib-aix5.o fork-child.o \
diff --git a/gdb/config/ia64/linux.mh b/gdb/config/ia64/linux.mh
index 5be4270..0405d81 100644
--- a/gdb/config/ia64/linux.mh
+++ b/gdb/config/ia64/linux.mh
@@ -1,7 +1,6 @@
 # Host: Intel IA-64 running GNU/Linux
 
 XM_FILE= xm-linux.h
-XDEPFILES=
 
 NAT_FILE= nm-linux.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o gcore.o \
diff --git a/gdb/config/m68k/3b1.mh b/gdb/config/m68k/3b1.mh
index 2516cce..e305e67 100644
--- a/gdb/config/m68k/3b1.mh
+++ b/gdb/config/m68k/3b1.mh
@@ -8,5 +8,5 @@ CC= gcc -traditional
 # know what works and what fails on the 3B1.
 #PINSN_CC= cc
 
-XDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o core-aout.o
+NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o core-aout.o
 XM_FILE= xm-3b1.h
diff --git a/gdb/config/m68k/apollo68b.mh b/gdb/config/m68k/apollo68b.mh
index 6f55497..cf2770b 100644
--- a/gdb/config/m68k/apollo68b.mh
+++ b/gdb/config/m68k/apollo68b.mh
@@ -1,6 +1,5 @@
 # Host: Apollo m68k, BSD mode.
 
 XM_FILE= xm-apollo68b.h
-XDEPFILES= 
 NAT_FILE= nm-apollo68b.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o a68v-nat.o
diff --git a/gdb/config/m68k/apollo68v.mh b/gdb/config/m68k/apollo68v.mh
index 9204f11..6610e66 100644
--- a/gdb/config/m68k/apollo68v.mh
+++ b/gdb/config/m68k/apollo68v.mh
@@ -2,7 +2,6 @@
 
 XM_FILE= xm-apollo68v.h
 XM_CLIBS= -lPW
-XDEPFILES= 
 
 NAT_FILE= nm-apollo68v.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o a68v-nat.o
diff --git a/gdb/config/m68k/dpx2.mh b/gdb/config/m68k/dpx2.mh
index 4f22ed53..25ed85e 100644
--- a/gdb/config/m68k/dpx2.mh
+++ b/gdb/config/m68k/dpx2.mh
@@ -1,7 +1,6 @@
 # Host: Bull DPX2 (68k, System V release 3)
 
 XM_FILE= xm-dpx2.h
-XDEPFILES=
 
 NAT_FILE= nm-dpx2.h
 NATDEPFILES= infptrace.o corelow.o core-aout.o inftarg.o dpx2-nat.o fork-child.o
diff --git a/gdb/config/m68k/hp300bsd.mh b/gdb/config/m68k/hp300bsd.mh
index 3ca0362..b0b186d 100644
--- a/gdb/config/m68k/hp300bsd.mh
+++ b/gdb/config/m68k/hp300bsd.mh
@@ -1,7 +1,6 @@
 # Host: Hewlett-Packard 9000 series 300, running BSD
 
 XM_FILE= xm-hp300bsd.h
-XDEPFILES= 
 
 NAT_FILE= nm-hp300bsd.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o core-aout.o
diff --git a/gdb/config/m68k/linux.mh b/gdb/config/m68k/linux.mh
index e8ea765..0c2599c 100644
--- a/gdb/config/m68k/linux.mh
+++ b/gdb/config/m68k/linux.mh
@@ -1,7 +1,6 @@
 # Host: Motorola m68k running GNU/Linux.
 
 XM_FILE= xm-linux.h
-XDEPFILES=
 
 NAT_FILE= nm-linux.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o \
diff --git a/gdb/config/m68k/m68klynx.mh b/gdb/config/m68k/m68klynx.mh
index ee0800c..685ce00 100644
--- a/gdb/config/m68k/m68klynx.mh
+++ b/gdb/config/m68k/m68klynx.mh
@@ -2,7 +2,6 @@
 
 XM_FILE= xm-m68klynx.h
 XM_CLIBS= -lbsd
-XDEPFILES=
 
 NAT_FILE= nm-m68klynx.h
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o lynx-nat.o
diff --git a/gdb/config/m68k/m68kv4.mh b/gdb/config/m68k/m68kv4.mh
index e825bee..7deb130 100644
--- a/gdb/config/m68k/m68kv4.mh
+++ b/gdb/config/m68k/m68kv4.mh
@@ -1,7 +1,6 @@
 # Host: Motorola 680x0 running SVR4 (Commodore Amiga amix or Atari TT ASV)
 
 XM_FILE= xm-m68kv4.h
-XDEPFILES=
 
 NAT_FILE= nm-sysv4.h
 NATDEPFILES= corelow.o core-regset.o solib.o solib-svr4.o solib-legacy.o \
diff --git a/gdb/config/m68k/nbsd.mh b/gdb/config/m68k/nbsd.mh
index 4aeddd1..6774ea2 100644
--- a/gdb/config/m68k/nbsd.mh
+++ b/gdb/config/m68k/nbsd.mh
@@ -1,5 +1,4 @@
 # Host: Motorola m68k running NetBSD
-XDEPFILES=
 NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o m68knbsd-nat.o solib.o solib-sunos.o
 XM_FILE= xm-nbsd.h
 NAT_FILE= nm-nbsd.h
diff --git a/gdb/config/m68k/sun2os3.mh b/gdb/config/m68k/sun2os3.mh
index a3ef627..3d868da 100644
--- a/gdb/config/m68k/sun2os3.mh
+++ b/gdb/config/m68k/sun2os3.mh
@@ -1,5 +1,4 @@
 # Host: Sun 2, running SunOS 3
-XDEPFILES= 
 XM_FILE= xm-sun2.h
 NAT_FILE= nm-sun2.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o sun3-nat.o
diff --git a/gdb/config/m68k/sun2os4.mh b/gdb/config/m68k/sun2os4.mh
index 617642d..29fe1e8 100644
--- a/gdb/config/m68k/sun2os4.mh
+++ b/gdb/config/m68k/sun2os4.mh
@@ -1,5 +1,4 @@
 # Host: Sun 2, running SunOS 4
-XDEPFILES= 
 XM_FILE= xm-sun2.h
 NAT_FILE= nm-sun2.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o sun3-nat.o
diff --git a/gdb/config/m68k/sun3os3.mh b/gdb/config/m68k/sun3os3.mh
index 1b93793..bf03622 100644
--- a/gdb/config/m68k/sun3os3.mh
+++ b/gdb/config/m68k/sun3os3.mh
@@ -1,5 +1,4 @@
 # Host: Sun 3, running SunOS 3
-XDEPFILES= 
 XM_FILE= xm-sun3.h
 NAT_FILE= nm-sun3.h
 NATDEPFILES= fork-child.o inftarg.o infptrace.o corelow.o sun3-nat.o
diff --git a/gdb/config/m68k/sun3os4.mh b/gdb/config/m68k/sun3os4.mh
index 5d1bf52..49666c9 100644
--- a/gdb/config/m68k/sun3os4.mh
+++ b/gdb/config/m68k/sun3os4.mh
@@ -1,5 +1,4 @@
 # Host: Sun 3, running SunOS 4
-XDEPFILES= 
 XM_FILE= xm-sun3os4.h
 NAT_FILE= nm-sun3.h
 NATDEPFILES= fork-child.o inftarg.o infptrace.o corelow.o sun3-nat.o
diff --git a/gdb/config/m88k/delta88.mh b/gdb/config/m88k/delta88.mh
index 824967a..13dc6c2 100644
--- a/gdb/config/m88k/delta88.mh
+++ b/gdb/config/m88k/delta88.mh
@@ -1,7 +1,6 @@
 # Host: Motorola 88k running SVR3
 
 XM_FILE= xm-delta88.h
-XDEPFILES= 
 
 NAT_FILE= nm-m88k.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o m88k-nat.o corelow.o core-aout.o
diff --git a/gdb/config/m88k/delta88v4.mh b/gdb/config/m88k/delta88v4.mh
index 4138a1a..ba3dd7b 100644
--- a/gdb/config/m88k/delta88v4.mh
+++ b/gdb/config/m88k/delta88v4.mh
@@ -1,7 +1,6 @@
 # Host: Motorola 88k running SVR4
 
 XM_FILE= xm-delta88v4.h
-XDEPFILES= 
 
 NAT_FILE= nm-delta88v4.h
 NATDEPFILES= fork-child.o m88k-nat.o corelow.o core-regset.o \
diff --git a/gdb/config/m88k/m88k.mh b/gdb/config/m88k/m88k.mh
index 6933265..5d4350b 100644
--- a/gdb/config/m88k/m88k.mh
+++ b/gdb/config/m88k/m88k.mh
@@ -1,5 +1,4 @@
 # Host: Motorola 88000 running DGUX
-XDEPFILES= 
 XM_FILE= xm-dgux.h
 NAT_FILE= nm-m88k.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o m88k-nat.o
diff --git a/gdb/config/mips/decstation.mh b/gdb/config/mips/decstation.mh
index da417b2..89ce310 100644
--- a/gdb/config/mips/decstation.mh
+++ b/gdb/config/mips/decstation.mh
@@ -1,5 +1,4 @@
 # Host: Little-endian MIPS machine such as DECstation.
-XDEPFILES= 
 XM_FILE= xm-mips.h
 NAT_FILE= nm-mips.h
 NATDEPFILES= infptrace.o inftarg.o corelow.o mips-nat.o fork-child.o
diff --git a/gdb/config/mips/irix3.mh b/gdb/config/mips/irix3.mh
index 311d697..fcb30ed 100644
--- a/gdb/config/mips/irix3.mh
+++ b/gdb/config/mips/irix3.mh
@@ -1,5 +1,4 @@
 # Host: SGI Iris running irix 3.x
-XDEPFILES= 
 XM_FILE= xm-irix3.h
 NAT_FILE= nm-irix3.h
 NATDEPFILES= fork-child.o corelow.o infptrace.o inftarg.o mips-nat.o
diff --git a/gdb/config/mips/irix4.mh b/gdb/config/mips/irix4.mh
index c54b384..4153a0e 100644
--- a/gdb/config/mips/irix4.mh
+++ b/gdb/config/mips/irix4.mh
@@ -1,5 +1,4 @@
 # Host: SGI Iris running irix 4.x
-XDEPFILES=
 XM_FILE= xm-irix4.h
 NAT_FILE= nm-irix4.h
 NATDEPFILES= fork-child.o irix4-nat.o corelow.o procfs.o \
diff --git a/gdb/config/mips/irix5.mh b/gdb/config/mips/irix5.mh
index 0d94937..12690b0 100644
--- a/gdb/config/mips/irix5.mh
+++ b/gdb/config/mips/irix5.mh
@@ -1,5 +1,4 @@
 # Host: SGI Iris running irix 5.x
-XDEPFILES=
 XM_FILE= xm-irix5.h
 NAT_FILE= nm-irix5.h
 NATDEPFILES= fork-child.o irix5-nat.o corelow.o procfs.o \
diff --git a/gdb/config/mips/irix6.mh b/gdb/config/mips/irix6.mh
index f2817a9..99b4737 100644
--- a/gdb/config/mips/irix6.mh
+++ b/gdb/config/mips/irix6.mh
@@ -1,5 +1,4 @@
 # Host: SGI Iris running irix 6.x
-XDEPFILES=
 XM_FILE= xm-irix6.h
 NAT_FILE= nm-irix6.h
 NATDEPFILES= fork-child.o solib.o irix5-nat.o corelow.o procfs.o \
diff --git a/gdb/config/mips/linux.mh b/gdb/config/mips/linux.mh
index eb3ec14..991fd6c 100644
--- a/gdb/config/mips/linux.mh
+++ b/gdb/config/mips/linux.mh
@@ -1,5 +1,4 @@
 # Host: Linux/MIPS
-XDEPFILES=
 XM_FILE= xm-linux.h
 NAT_FILE= nm-linux.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o mips-linux-nat.o \
diff --git a/gdb/config/mips/littlemips.mh b/gdb/config/mips/littlemips.mh
index 103919d..581a908 100644
--- a/gdb/config/mips/littlemips.mh
+++ b/gdb/config/mips/littlemips.mh
@@ -1,3 +1,3 @@
 # Host: Little-endian MIPS machine such as DECstation.
-XDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o core-aout.o
+NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o core-aout.o
 XM_FILE= xm-mips.h
diff --git a/gdb/config/mips/mipsm3.mh b/gdb/config/mips/mipsm3.mh
index e049d68..864ad57 100644
--- a/gdb/config/mips/mipsm3.mh
+++ b/gdb/config/mips/mipsm3.mh
@@ -1,7 +1,6 @@
 # Host: Little endian MIPS machine such as pmax
 # running Mach 3.0 operating system
 
-XDEPFILES= core-aout.o
-NATDEPFILES= mipsm3-nat.o m3-nat.o
+NATDEPFILES= mipsm3-nat.o m3-nat.o core-aout.o
 XM_FILE= xm-mipsm3.h
 NAT_FILE= ../nm-m3.h
diff --git a/gdb/config/ns32k/nbsd.mh b/gdb/config/ns32k/nbsd.mh
index 40af615..665d4e3 100644
--- a/gdb/config/ns32k/nbsd.mh
+++ b/gdb/config/ns32k/nbsd.mh
@@ -1,5 +1,4 @@
 # Host: PC532 running NetBSD
-XDEPFILES=
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o ns32knbsd-nat.o solib.o solib-sunos.o
 XM_FILE= xm-nbsd.h
 NAT_FILE= nm-nbsd.h
diff --git a/gdb/config/pa/hppabsd.mh b/gdb/config/pa/hppabsd.mh
index 38daeaa..c264db3 100644
--- a/gdb/config/pa/hppabsd.mh
+++ b/gdb/config/pa/hppabsd.mh
@@ -1,5 +1,4 @@
 # Host: Hewlett-Packard PA-RISC machine, running BSD
-XDEPFILES=
 XM_FILE= xm-hppab.h
 NAT_FILE= nm-hppab.h
 NATDEPFILES= hppab-nat.o corelow.o core-aout.o inftarg.o fork-child.o somread.o infptrace.o hp-psymtab-read.o hp-symtab-read.o somsolib.o
diff --git a/gdb/config/pa/hppahpux.mh b/gdb/config/pa/hppahpux.mh
index 16003c9..5d49f0c 100644
--- a/gdb/config/pa/hppahpux.mh
+++ b/gdb/config/pa/hppahpux.mh
@@ -1,7 +1,6 @@
 # Host: Hewlett-Packard PA-RISC machine, running HPUX
 
 XM_FILE= xm-hppah.h
-XDEPFILES=
 
 NAT_FILE= nm-hppah.h
 NATDEPFILES= hppah-nat.o corelow.o core-aout.o inftarg.o fork-child.o somread.o infptrace.o hp-psymtab-read.o hp-symtab-read.o somsolib.o
diff --git a/gdb/config/pa/hppaosf.mh b/gdb/config/pa/hppaosf.mh
index 8a38312..c2724b2 100644
--- a/gdb/config/pa/hppaosf.mh
+++ b/gdb/config/pa/hppaosf.mh
@@ -1,5 +1,4 @@
 # Host: Hewlett-Packard PA-RISC machine, running BSD
-XDEPFILES=
 XM_FILE= xm-hppab.h
 NAT_FILE= nm-hppao.h
 NATDEPFILES= fork-child.o m3-nat.o hppam3-nat.o somread.o hp-psymtab-read.o hp-symtab-read.o somsolib.o
diff --git a/gdb/config/pa/hpux1020.mh b/gdb/config/pa/hpux1020.mh
index af6ccda..9687b60 100644
--- a/gdb/config/pa/hpux1020.mh
+++ b/gdb/config/pa/hpux1020.mh
@@ -3,7 +3,6 @@
 MH_CFLAGS = -D__HP_CURSES
 
 XM_FILE= xm-hppah.h
-XDEPFILES=
 
 NAT_FILE= nm-hppah.h
 NATDEPFILES= hppah-nat.o corelow.o core-aout.o inftarg.o fork-child.o infptrace.o somread.o hp-psymtab-read.o hp-symtab-read.o somsolib.o
diff --git a/gdb/config/pa/hpux11.mh b/gdb/config/pa/hpux11.mh
index 44fe649..b9b60ac 100644
--- a/gdb/config/pa/hpux11.mh
+++ b/gdb/config/pa/hpux11.mh
@@ -3,7 +3,6 @@
 MH_CFLAGS = -D__HP_CURSES
 
 XM_FILE= xm-hppah.h
-XDEPFILES=
 
 NAT_FILE= nm-hppah11.h
 NATDEPFILES= hppah-nat.o corelow.o core-aout.o inftarg.o fork-child.o infttrace.o somread.o hp-psymtab-read.o hp-symtab-read.o somsolib.o
diff --git a/gdb/config/pa/hpux11w.mh b/gdb/config/pa/hpux11w.mh
index 0a60cd2..dad20a0 100644
--- a/gdb/config/pa/hpux11w.mh
+++ b/gdb/config/pa/hpux11w.mh
@@ -3,7 +3,6 @@
 MH_CFLAGS = -D__HP_CURSES
 
 XM_FILE= xm-hppah.h
-XDEPFILES=
 
 NAT_FILE= nm-hppah11.h
 NATDEPFILES= hppah-nat.o corelow.o core-aout.o inftarg.o fork-child.o infttrace.o hp-psymtab-read.o hp-symtab-read.o pa64solib.o
diff --git a/gdb/config/powerpc/aix.mh b/gdb/config/powerpc/aix.mh
index cda754c..d0913b7 100644
--- a/gdb/config/powerpc/aix.mh
+++ b/gdb/config/powerpc/aix.mh
@@ -1,7 +1,6 @@
 # Host: IBM PowerPC running AIX
 
 XM_FILE= xm-aix.h
-XDEPFILES= 
 
 NAT_FILE= nm-aix.h
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o rs6000-nat.o \
diff --git a/gdb/config/powerpc/linux.mh b/gdb/config/powerpc/linux.mh
index e49f700..e9daa1b 100644
--- a/gdb/config/powerpc/linux.mh
+++ b/gdb/config/powerpc/linux.mh
@@ -1,7 +1,6 @@
 # Host: PowerPC, running Linux
 
 XM_FILE= xm-linux.h
-XDEPFILES=
 XM_CLIBS=
 
 NAT_FILE= nm-linux.h
diff --git a/gdb/config/powerpc/nbsd.mh b/gdb/config/powerpc/nbsd.mh
index e0dccef..dcb0f7a 100644
--- a/gdb/config/powerpc/nbsd.mh
+++ b/gdb/config/powerpc/nbsd.mh
@@ -1,4 +1,3 @@
 # Host: PowerPC, running NetBSD
-XDEPFILES=
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o ppcnbsd-nat.o solib.o solib-svr4.o solib-legacy.o
 NAT_FILE= nm-nbsd.h
diff --git a/gdb/config/romp/rtbsd.mh b/gdb/config/romp/rtbsd.mh
index 003c42f..1efa116 100644
--- a/gdb/config/romp/rtbsd.mh
+++ b/gdb/config/romp/rtbsd.mh
@@ -2,7 +2,7 @@
 # This file contributed at NYU, where we are using the RT to remote
 # debug an a29k running unix.  No attempt, as of 7/16/91, has been made
 # to support debugging of RT executables.
-XDEPFILES corelow.o core-aout.o infptrace.o inftarg.o fork-child.o
+NATDEPFILES corelow.o core-aout.o infptrace.o inftarg.o fork-child.o
 MH_CFLAGS=-DHOSTING_ONLY	# No debugging of RT executables 
 XM_FILE= xm-rtbsd.h
 CC=gcc -traditional		# hc/pcc just can't cut it.
diff --git a/gdb/config/rs6000/aix4.mh b/gdb/config/rs6000/aix4.mh
index 8d105d9..e6253be 100644
--- a/gdb/config/rs6000/aix4.mh
+++ b/gdb/config/rs6000/aix4.mh
@@ -1,7 +1,6 @@
 # Host: IBM RS/6000 running AIX4
 
 XM_FILE= xm-aix4.h
-XDEPFILES= 
 
 NAT_FILE= nm-rs6000.h
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o rs6000-nat.o \
diff --git a/gdb/config/rs6000/rs6000.mh b/gdb/config/rs6000/rs6000.mh
index ec877e7..c57319b 100644
--- a/gdb/config/rs6000/rs6000.mh
+++ b/gdb/config/rs6000/rs6000.mh
@@ -1,7 +1,6 @@
 # Host: IBM RS/6000 running AIX
 
 XM_FILE= xm-rs6000.h
-XDEPFILES= 
 
 NAT_FILE= nm-rs6000.h
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o rs6000-nat.o \
diff --git a/gdb/config/rs6000/rs6000lynx.mh b/gdb/config/rs6000/rs6000lynx.mh
index b7f03c7..e9d770c 100644
--- a/gdb/config/rs6000/rs6000lynx.mh
+++ b/gdb/config/rs6000/rs6000lynx.mh
@@ -1,7 +1,6 @@
 # Host: RS6000 running LynxOS
 
 XM_FILE= xm-rs6000ly.h
-XDEPFILES=
 XM_CLIBS= -lbsd
 
 NAT_FILE= nm-rs6000ly.h
diff --git a/gdb/config/s390/s390.mh b/gdb/config/s390/s390.mh
index 19b38d8..28e2a1f 100644
--- a/gdb/config/s390/s390.mh
+++ b/gdb/config/s390/s390.mh
@@ -1,7 +1,6 @@
 # Host: S390, running Linux
 
 XM_FILE= xm-linux.h
-XDEPFILES= ser-tcp.o
 XM_CLIBS=
 
 NAT_FILE= nm-linux.h
diff --git a/gdb/config/sparc/linux.mh b/gdb/config/sparc/linux.mh
index 30a97a6..66b910a 100644
--- a/gdb/config/sparc/linux.mh
+++ b/gdb/config/sparc/linux.mh
@@ -1,7 +1,6 @@
 # Host: Sparcstation, running GNU/Linux.
 
 XM_FILE= xm-linux.h
-XDEPFILES=
 
 NAT_FILE= nm-linux.h
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o sparc-nat.o \
diff --git a/gdb/config/sparc/nbsd.mh b/gdb/config/sparc/nbsd.mh
index 871e19b..7e68541 100644
--- a/gdb/config/sparc/nbsd.mh
+++ b/gdb/config/sparc/nbsd.mh
@@ -1,5 +1,4 @@
 # Host: Sun 4 or Sparcstation, running NetBSD
-XDEPFILES=
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o sparc-nat.o solib.o solib-sunos.o
 XM_FILE= xm-nbsd.h
 NAT_FILE= nm-nbsd.h
diff --git a/gdb/config/sparc/nbsdelf.mh b/gdb/config/sparc/nbsdelf.mh
index 6b08691..7c5a123 100644
--- a/gdb/config/sparc/nbsdelf.mh
+++ b/gdb/config/sparc/nbsdelf.mh
@@ -1,5 +1,4 @@
 # Host: Sun 4 or Sparcstation, running NetBSD
-XDEPFILES=
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o sparc-nat.o solib.o solib-svr4.o solib-legacy.o
 XM_FILE= xm-nbsd.h
 NAT_FILE= nm-nbsdelf.h
diff --git a/gdb/config/sparc/sparclynx.mh b/gdb/config/sparc/sparclynx.mh
index 4f5bb4d..92a425c 100644
--- a/gdb/config/sparc/sparclynx.mh
+++ b/gdb/config/sparc/sparclynx.mh
@@ -1,7 +1,6 @@
 # Host: Sparc running LynxOS
 
 XM_FILE= xm-sparclynx.h
-XDEPFILES=
 XM_CLIBS= -lbsd
 
 NAT_FILE= nm-sparclynx.h
diff --git a/gdb/config/sparc/sun4os4.mh b/gdb/config/sparc/sun4os4.mh
index 4392a0c..4deba42 100644
--- a/gdb/config/sparc/sun4os4.mh
+++ b/gdb/config/sparc/sun4os4.mh
@@ -1,5 +1,4 @@
 # Host: Sun 4 or Sparcstation, running SunOS 4
-XDEPFILES=
 XM_FILE= xm-sun4os4.h
 NAT_FILE= nm-sun4os4.h
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o sparc-nat.o
diff --git a/gdb/config/sparc/sun4sol2.mh b/gdb/config/sparc/sun4sol2.mh
index edcef48..4e77b92 100644
--- a/gdb/config/sparc/sun4sol2.mh
+++ b/gdb/config/sparc/sun4sol2.mh
@@ -1,7 +1,6 @@
 # Host: Sun 4 or Sparcstation, running Solaris 2
 
 XM_FILE= xm-sun4sol2.h
-XDEPFILES=
 XM_CLIBS= -lsocket -lnsl
 
 NAT_FILE= nm-sun4sol2.h
diff --git a/gdb/config/vax/vaxbsd.mh b/gdb/config/vax/vaxbsd.mh
index 078687d..db1e1d4 100644
--- a/gdb/config/vax/vaxbsd.mh
+++ b/gdb/config/vax/vaxbsd.mh
@@ -8,6 +8,6 @@
 #msg  (but see comments in Makefile.dist about compiling with gcc).
 
 XM_FILE= xm-vaxbsd.h
-XDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o core-aout.o
+NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o core-aout.o
 
 NAT_FILE= nm-vax.h
diff --git a/gdb/config/vax/vaxult.mh b/gdb/config/vax/vaxult.mh
index 4afcbc8..f05a33f 100644
--- a/gdb/config/vax/vaxult.mh
+++ b/gdb/config/vax/vaxult.mh
@@ -1,7 +1,6 @@
 # Host: DEC VAX running Ultrix
 
 XM_FILE= xm-vaxult.h
-XDEPFILES= 
 
 NAT_FILE= nm-vax.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o core-aout.o
diff --git a/gdb/config/vax/vaxult2.mh b/gdb/config/vax/vaxult2.mh
index dac73d6..4170a84 100644
--- a/gdb/config/vax/vaxult2.mh
+++ b/gdb/config/vax/vaxult2.mh
@@ -1,7 +1,6 @@
 # Host: DEC VAX running Ultrix
 
 XM_FILE= xm-vaxult2.h
-XDEPFILES= 
 
 NAT_FILE= nm-vax.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o core-aout.o
diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index d3d5ff3..4bc20b4 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,5 +1,10 @@
 2002-01-17  Andrew Cagney  <ac131313@redhat.com>
 
+	* gdbint.texinfo (Host Definition): Remove references to XDEPFILES
+	and xyz-xdep.o.
+
+2002-01-17  Andrew Cagney  <ac131313@redhat.com>
+
 	* gdb.texinfo 	(Maintenance Commands): Add appendix.
 	(Set Breaks): Copy ``maint info breakpoint'' doco to
 	``Maintenance Commands'' appendix.  Add reference.
diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo
index bc2225e..d75375d 100644
--- a/gdb/doc/gdbint.texinfo
+++ b/gdb/doc/gdbint.texinfo
@@ -2041,26 +2041,18 @@ eventually disappear.
 Several files control @value{GDBN}'s configuration for host systems:
 
 @table @file
-@vindex XDEPFILES
 @item gdb/config/@var{arch}/@var{xyz}.mh
 Specifies Makefile fragments needed when hosting on machine @var{xyz}.
-In particular, this lists the required machine-dependent object files,
-by defining @samp{XDEPFILES=@dots{}}.  Also specifies the header file
-which describes host @var{xyz}, by defining @code{XM_FILE=
-xm-@var{xyz}.h}.  You can also define @code{CC}, @code{SYSV_DEFINE},
-@code{XM_CFLAGS}, @code{XM_ADD_FILES}, @code{XM_CLIBS}, @code{XM_CDEPS},
-etc.; see @file{Makefile.in}.
+Optionally specifies the header file which describes host @var{xyz}, by
+defining @code{XM_FILE= xm-@var{xyz}.h}.  You can also define @code{CC},
+@code{SYSV_DEFINE}, @code{XM_CFLAGS}, @code{XM_ADD_FILES},
+@code{XM_CLIBS}, @code{XM_CDEPS}, etc.; see @file{Makefile.in}.
 
 @item gdb/config/@var{arch}/xm-@var{xyz}.h
 (@file{xm.h} is a link to this file, created by @code{configure}).  Contains C
 macro definitions describing the host system environment, such as byte
 order, host C compiler and library.
 
-@item gdb/@var{xyz}-xdep.c
-Contains any miscellaneous C code required for this machine as a host.
-On most machines it doesn't exist at all.  If it does exist, put
-@file{@var{xyz}-xdep.o} into the @code{XDEPFILES} line in
-@file{gdb/config/@var{arch}/@var{xyz}.mh}.
 @end table
 
 @subheading Generic Host Support Files