diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 747d5439f8..667a3be8cb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,18 @@
+2000-10-30  Michael Snyder  <msnyder@cleaver.cygnus.com>
+
+	* config/m68k/linux.mh: Remove solib.c, solib-svr4.c from NATDEPFILES.
+	* config/powerpc/linux.mh: ditto.
+	* config/ia64/linux.mh: ditto.
+	* config/i386/linux.mh: ditto.
+	* config/alpha/alpha-linux.mh: ditto.
+	* config/arm/linux.mh: ditto.
+	* config/m68k/linux.mt: Add solib.c, solib-svr4.c to TDEPFILES.
+	* config/powerpc/linux.mt: ditto.
+	* config/ia64/linux.mt: ditto.
+	* config/i386/linux.mt: ditto.
+	* config/alpha/alpha-linux.mt: ditto.
+	* config/arm/linux.mt: ditto.
+
 2000-10-30  J.T. Conklin  <jtc@redback.com>
 
 	* gdbarch.sh, hp-psymtab-read.c, hpread.c, m3-nat.c, mcore-tdep.c, 
diff --git a/gdb/config/alpha/alpha-linux.mh b/gdb/config/alpha/alpha-linux.mh
index 8792f5518e..c7575ae2cd 100644
--- a/gdb/config/alpha/alpha-linux.mh
+++ b/gdb/config/alpha/alpha-linux.mh
@@ -3,7 +3,7 @@ XDEPFILES=
 XM_FILE= xm-alphalinux.h
 NAT_FILE= nm-linux.h
 NATDEPFILES= infptrace.o inftarg.o corelow.o alpha-nat.o \
-	fork-child.o solib.o solib-svr4.o linux-thread.o lin-thread.o 
+	fork-child.o linux-thread.o lin-thread.o 
 
 LOADLIBES = -ldl -rdynamic
 
diff --git a/gdb/config/alpha/alpha-linux.mt b/gdb/config/alpha/alpha-linux.mt
index 7789252daf..a48790771f 100644
--- a/gdb/config/alpha/alpha-linux.mt
+++ b/gdb/config/alpha/alpha-linux.mt
@@ -1,3 +1,3 @@
 # Target: Little-endian Alpha
-TDEPFILES= alpha-tdep.o
+TDEPFILES= alpha-tdep.o solib.o solib-svr4.o 
 TM_FILE= tm-alphalinux.h
diff --git a/gdb/config/i386/linux.mh b/gdb/config/i386/linux.mh
index 43f5277cf5..9b329be767 100644
--- a/gdb/config/i386/linux.mh
+++ b/gdb/config/i386/linux.mh
@@ -4,7 +4,7 @@ XM_FILE= xm-linux.h
 XDEPFILES=
 
 NAT_FILE= nm-linux.h
-NATDEPFILES= infptrace.o solib.o solib-svr4.o inftarg.o fork-child.o corelow.o \
+NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o \
 	core-aout.o i386v-nat.o i386-linux-nat.o i387-nat.o \
 	proc-service.o thread-db.o lin-lwp.o
 
diff --git a/gdb/config/i386/linux.mt b/gdb/config/i386/linux.mt
index df17b18436..17218270a0 100644
--- a/gdb/config/i386/linux.mt
+++ b/gdb/config/i386/linux.mt
@@ -1,5 +1,5 @@
 # Target: Intel 386 running GNU/Linux
-TDEPFILES= i386-tdep.o i386-linux-tdep.o i387-tdep.o
+TDEPFILES= i386-tdep.o i386-linux-tdep.o i387-tdep.o solib.o solib-svr4.o 
 TM_FILE= tm-linux.h
 
 GDBSERVER_DEPFILES= low-linux.o
diff --git a/gdb/config/ia64/linux.mh b/gdb/config/ia64/linux.mh
index f47013ccf1..5f10b09273 100644
--- a/gdb/config/ia64/linux.mh
+++ b/gdb/config/ia64/linux.mh
@@ -4,7 +4,7 @@ XM_FILE= xm-linux.h
 XDEPFILES=
 
 NAT_FILE= nm-linux.h
-NATDEPFILES= infptrace.o solib.o solib-svr4.o inftarg.o fork-child.o corelow.o \
+NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o \
 	core-aout.o core-regset.o ia64-linux-nat.o linux-thread.o lin-thread.o
 
 LOADLIBES = -ldl -rdynamic
diff --git a/gdb/config/ia64/linux.mt b/gdb/config/ia64/linux.mt
index 8e5b91000b..441055dc1b 100644
--- a/gdb/config/ia64/linux.mt
+++ b/gdb/config/ia64/linux.mt
@@ -1,5 +1,5 @@
 # Target: Intel IA-64 running GNU/Linux
-TDEPFILES= ia64-tdep.o ia64-linux-tdep.o
+TDEPFILES= ia64-tdep.o ia64-linux-tdep.o solib.o solib-svr4.o 
 TM_FILE= tm-linux.h
 
 GDBSERVER_DEPFILES= low-linux.o
diff --git a/gdb/config/m68k/linux.mh b/gdb/config/m68k/linux.mh
index 21a89455e0..20c1330141 100644
--- a/gdb/config/m68k/linux.mh
+++ b/gdb/config/m68k/linux.mh
@@ -4,7 +4,7 @@ XM_FILE= xm-linux.h
 XDEPFILES=
 
 NAT_FILE= nm-linux.h
-NATDEPFILES= infptrace.o solib.o solib-svr4.o inftarg.o fork-child.o \
+NATDEPFILES= infptrace.o inftarg.o fork-child.o \
 	corelow.o core-aout.o core-regset.o m68klinux-nat.o linux-thread.o
 
 GDBSERVER_DEPFILES= low-linux.o
diff --git a/gdb/config/m68k/linux.mt b/gdb/config/m68k/linux.mt
index 0c0a149ccc..6c4abff189 100644
--- a/gdb/config/m68k/linux.mt
+++ b/gdb/config/m68k/linux.mt
@@ -1,3 +1,3 @@
 # Target: Motorola m68k with a.out and ELF
-TDEPFILES= m68k-tdep.o
+TDEPFILES= m68k-tdep.o solib.o solib-svr4.o 
 TM_FILE= tm-linux.h
diff --git a/gdb/config/powerpc/linux.mh b/gdb/config/powerpc/linux.mh
index 318af18b89..6890357ee6 100644
--- a/gdb/config/powerpc/linux.mh
+++ b/gdb/config/powerpc/linux.mh
@@ -5,7 +5,7 @@ XDEPFILES=
 XM_CLIBS=
 
 NAT_FILE= nm-linux.h
-NATDEPFILES= infptrace.o solib.o solib-svr4.o inftarg.o fork-child.o corelow.o \
+NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o \
 core-aout.o core-regset.o ppc-linux-nat.o proc-service.o thread-db.o lin-lwp.o
 
 LOADLIBES = -ldl -rdynamic
diff --git a/gdb/config/powerpc/linux.mt b/gdb/config/powerpc/linux.mt
index a7c1bedcee..b809a6e3d3 100644
--- a/gdb/config/powerpc/linux.mt
+++ b/gdb/config/powerpc/linux.mt
@@ -1,3 +1,3 @@
 # Target: Motorola PPC on Linux
-TDEPFILES= rs6000-tdep.o ppc-linux-tdep.o
+TDEPFILES= rs6000-tdep.o ppc-linux-tdep.o solib.o solib-svr4.o 
 TM_FILE= tm-linux.h