diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8e8265d165..6e61906417 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+Fri Mar 14 15:44:03 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (elfread.o): Depend upon elf-bfd.h and elf/mips.h.
+
 start-sanitize-gdbtk
 Fri Mar 14 10:01:29 1997  Tom Tromey  <tromey@cygnus.com>
 
@@ -7,8 +11,8 @@ Fri Mar 14 10:01:29 1997  Tom Tromey  <tromey@cygnus.com>
 end-sanitize-gdbtk
 Thu Mar 13 22:51:00 1997  Dawn Perchik  <dawn@cygnus.com>
 
-	* utils.c(pollquit, notice_quit): If _WIN32, limit test for cntl-C 
-	to wingdb.
+	* utils.c (pollquit, notice_quit): If _WIN32, limit test for
+	cntl-C to wingdb.
 	(initialize_utils): If _WIN32, don't call ScreenRows and ScreenCols 
 	except under wingdb.  (Contributed by Martin Hunt).
 
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 1507c961d5..f24485d202 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -145,8 +145,6 @@ ENABLE_GDBTK= @ENABLE_GDBTK@
 #end-sanitize-gdbtk
 
 ENABLE_CFLAGS= @ENABLE_CFLAGS@
-ENABLE_CLIBS= @ENABLE_CLIBS@
-ENABLE_OBS= @ENABLE_OBS@
 
 # -I. for config files.
 # -I$(srcdir) for gdb internal headers and possibly for gnu-regex.h also.
@@ -201,10 +199,10 @@ REGEX1 = gnu-regex.o
 # LIBIBERTY appears twice on purpose.
 # If you have the Cygnus libraries installed,
 # you can use 'CLIBS=$(INSTALLED_LIBS)' 'CDEPS='
-INSTALLED_LIBS=-lbfd -lreadline -lopcodes -liberty $(ENABLE_CLIBS) \
+INSTALLED_LIBS=-lbfd -lreadline -lopcodes -liberty \
 	$(TERMCAP) $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) @LIBS@ \
 	-lmmalloc -liberty
-CLIBS = $(SIM) $(BFD) $(READLINE) $(OPCODES) $(LIBIBERTY) $(ENABLE_CLIBS) \
+CLIBS = $(SIM) $(BFD) $(READLINE) $(OPCODES) $(LIBIBERTY) \
 	$(TERMCAP) $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) @LIBS@ \
 	$(MMALLOC) $(LIBIBERTY)
 CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE) \
@@ -351,7 +349,7 @@ TARGET_FLAGS_TO_PASS = \
 # Links made at configuration time should not be specified here, since
 # SFILES is used in building the distribution archive.
 
-SFILES = bcache.c blockframe.c breakpoint.c buildsym.c callback.c c-exp.y \
+SFILES = bcache.c blockframe.c breakpoint.c buildsym.c c-exp.y \
 	c-lang.c c-typeprint.c c-valprint.c ch-exp.c ch-lang.c \
 	ch-typeprint.c ch-valprint.c coffread.c command.c complaints.c \
 	corefile.c cp-valprint.c \
@@ -455,7 +453,7 @@ POSSLIBS = gnu-regex.c gnu-regex.h
 # Makefile.in
 
 DEPFILES = $(TDEPFILES) $(XDEPFILES) $(SER_HARDWIRE) $(NATDEPFILES) \
-	   $(REMOTE_OBS) $(SIM_OBS) $(ENABLE_OBS) @THREAD_DB_OBS@
+	   $(REMOTE_OBS) $(SIM_OBS) @CONFIG_OBS@
 
 SOURCES = $(SFILES) $(ALLDEPFILES) $(YYFILES)
 # Don't include YYFILES (*.tab.c) because we already include *.y in SFILES,
@@ -476,7 +474,7 @@ COMMON_OBS = version.o blockframe.o breakpoint.o findvar.o stack.o thread.o \
 	scm-exp.o scm-lang.o scm-valprint.o complaints.o typeprint.o \
 	c-typeprint.o ch-typeprint.o f-typeprint.o m2-typeprint.o \
 	c-valprint.o cp-valprint.o ch-valprint.o f-valprint.o m2-valprint.o \
-	nlmread.o serial.o mdebugread.o os9kread.o top.o utils.o callback.o
+	nlmread.o serial.o mdebugread.o os9kread.o top.o utils.o
 
 OBS = $(COMMON_OBS) $(ANNOTATE_OBS) main.o
 
@@ -602,8 +600,8 @@ init.c: $(OBS) $(TSOBS)
 	    -e '/[a-z0-9A-Z_]*-exp.tab.o/d' \
 	    -e 's/\.o/.c/' \
 	    -e 's|\([^  ][^     ]*\)|$(srcdir)/\1|g' | \
-	xargs grep -s '^_initialize_[a-z_0-9A-Z]* *(' | \
-	sed -n -e 's/^.*://' -e 's/^\([a-z_0-9A-Z]*\).*/  {extern void \1 PARAMS ((void)); \1 ();}/' >>init.c-tmp
+	xargs grep '^_initialize_[a-z_0-9A-Z]* *(' | \
+	sed -e 's/^.*://' -e 's/^\([a-z_0-9A-Z]*\).*/  {extern void \1 PARAMS ((void)); \1 ();}/' >>init.c-tmp
 	@echo '}' >>init.c-tmp
 	@mv init.c-tmp init.c
 
@@ -1023,8 +1021,6 @@ breakpoint.o: breakpoint.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
 buildsym.o: buildsym.c $(bfd_h) buildsym.h complaints.h $(defs_h) \
 	objfiles.h symfile.h $(symtab_h) gdb_string.h
 
-callback.o: callback.c $(defs_h) callback.h 
-
 c-lang.o: c-lang.c c-lang.h $(defs_h) $(expression_h) $(gdbtypes_h) \
 	language.h parser-defs.h $(symtab_h)
 
@@ -1118,7 +1114,8 @@ dwarf2read.o: dwarf2read.c $(bfd_h) buildsym.h $(defs_h) \
 	$(symtab_h) gdb_string.h
 
 elfread.o: elfread.c $(bfd_h) buildsym.h complaints.h $(defs_h) \
-	gdb-stabs.h objfiles.h symfile.h $(symtab_h) gdb_string.h
+	gdb-stabs.h objfiles.h symfile.h $(symtab_h) gdb_string.h \
+	$(BFD_SRC)/elf-bfd.h $(INCLUDE_DIR)/elf/mips.h
 
 environ.o: environ.c $(defs_h) environ.h $(gdbcore_h) gdb_string.h