* Makefile.in (depend): Bfd.h keeps moving, keep up with it.

	* alldeps.mak, depend:  Update to latest automatically built
	versions.

1 files changed, 130 insertions, 131 deletions

diff --git a/gdb/depend b/gdb/depend
index 0992711..f7839f6 100755
--- a/gdb/depend
+++ b/gdb/depend
@@ -7,37 +7,36 @@ udr.o : ${srcdir}/29k-share/udi/udr.c ${srcdir}/29k-share/udi/udiproc.h ${srcdir
   ${srcdir}/29k-share/udi/udisoc.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/29k-share/udi/udr.c
 a29k-pinsn.o : ${srcdir}/a29k-pinsn.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
-  $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(INCLUDE_DIR)/dis-asm.h $(INCLUDE_DIR)/bfd.h ../bfd/bfd.h \
-  $(INCLUDE_DIR)/obstack.h 
+  $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(INCLUDE_DIR)/dis-asm.h $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/obstack.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/a29k-pinsn.c
 a29k-tdep.o : ${srcdir}/a29k-tdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
-  tm.h config.status ${srcdir}/gdbcore.h ../bfd/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/frame.h ${srcdir}/value.h \
+  tm.h config.status ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/frame.h ${srcdir}/value.h \
   ${srcdir}/symtab.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/inferior.h ${srcdir}/breakpoint.h ${srcdir}/gdbcmd.h \
   ${srcdir}/command.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/a29k-tdep.c
 a68v-nat.o : ${srcdir}/a68v-nat.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h ${srcdir}/frame.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h ../bfd/bfd.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/a68v-nat.c
 altos-xdep.o : ${srcdir}/altos-xdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h \
-  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h ../bfd/bfd.h 
+  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/altos-xdep.c
 arm-pinsn.o : ${srcdir}/arm-pinsn.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h $(INCLUDE_DIR)/opcode/arm.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/arm-pinsn.c
 blockframe.o : ${srcdir}/blockframe.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
-  $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ../bfd/bfd.h \
+  $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h $(BFD_OBJ_DIR)/../include/bfd.h \
   ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h ${srcdir}/objfiles.h ${srcdir}/frame.h ${srcdir}/gdbcore.h ${srcdir}/value.h \
   ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h ${srcdir}/inferior.h ${srcdir}/breakpoint.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/blockframe.c
 breakpoint.o : ${srcdir}/breakpoint.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/frame.h \
-  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h ../bfd/bfd.h \
+  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h \
   ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/inferior.h ${srcdir}/target.h ${srcdir}/language.h $(INCLUDE_DIR)/demangle.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/breakpoint.c
 buildsym.o : ${srcdir}/buildsym.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
-  tm.h config.status ../bfd/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/symtab.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
+  tm.h config.status $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/symtab.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
   ${srcdir}/objfiles.h ${srcdir}/complaints.h ${srcdir}/buildsym.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/buildsym.c
 c-lang.o : ${srcdir}/c-lang.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
@@ -45,7 +44,7 @@ c-lang.o : ${srcdir}/c-lang.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h co
   ${srcdir}/language.h ${srcdir}/c-lang.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/c-lang.c
 c-typeprint.o : ${srcdir}/c-typeprint.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
-  $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(INCLUDE_DIR)/obstack.h ../bfd/bfd.h ${srcdir}/symtab.h \
+  $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(INCLUDE_DIR)/obstack.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/symtab.h \
   ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/value.h ${srcdir}/gdbcore.h ${srcdir}/target.h ${srcdir}/command.h ${srcdir}/gdbcmd.h \
   ${srcdir}/language.h $(INCLUDE_DIR)/demangle.h ${srcdir}/c-lang.h ${srcdir}/typeprint.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/c-typeprint.c
@@ -58,7 +57,7 @@ ch-lang.o : ${srcdir}/ch-lang.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h
   ${srcdir}/language.h ${srcdir}/ch-lang.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/ch-lang.c
 ch-typeprint.o : ${srcdir}/ch-typeprint.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
-  $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(INCLUDE_DIR)/obstack.h ../bfd/bfd.h ${srcdir}/symtab.h \
+  $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(INCLUDE_DIR)/obstack.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/symtab.h \
   ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/value.h ${srcdir}/gdbcore.h ${srcdir}/target.h ${srcdir}/command.h ${srcdir}/gdbcmd.h \
   ${srcdir}/language.h $(INCLUDE_DIR)/demangle.h ${srcdir}/ch-lang.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/ch-typeprint.c
@@ -68,7 +67,7 @@ ch-valprint.o : ${srcdir}/ch-valprint.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/ch-valprint.c
 coffread.o : ${srcdir}/coffread.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h ${srcdir}/breakpoint.h ${srcdir}/frame.h \
-  ${srcdir}/value.h ${srcdir}/expression.h ../bfd/bfd.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
+  ${srcdir}/value.h ${srcdir}/expression.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
   ${srcdir}/objfiles.h ${srcdir}/buildsym.h ${srcdir}/complaints.h $(BFD_SRC_DIR)/libbfd.h $(INCLUDE_DIR)/coff/internal.h \
   $(BFD_SRC_DIR)/libcoff.h 
 	${CC} -c ${INTERNAL_CFLAGS}  -I${BFD_SRC_DIR} -I${BFD_OBJ_DIR} ${srcdir}/coffread.c
@@ -85,29 +84,29 @@ convex-pinsn.o : ${srcdir}/convex-pinsn.c ${srcdir}/defs.h $(INCLUDE_DIR)/anside
 convex-tdep.o : ${srcdir}/convex-tdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/command.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h \
   ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/breakpoint.h \
-  $(INCLUDE_DIR)/wait.h ${srcdir}/gdbcore.h ../bfd/bfd.h ${srcdir}/gdbcmd.h 
+  $(INCLUDE_DIR)/wait.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/gdbcmd.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/convex-tdep.c
 convex-xdep.o : ${srcdir}/convex-xdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/command.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h \
   ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/breakpoint.h \
-  $(INCLUDE_DIR)/wait.h ${srcdir}/gdbcore.h ../bfd/bfd.h ${srcdir}/gdbcmd.h 
+  $(INCLUDE_DIR)/wait.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/gdbcmd.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/convex-xdep.c
 core-svr4.o : ${srcdir}/core-svr4.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h ${srcdir}/frame.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h ../bfd/bfd.h ${srcdir}/command.h \
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/command.h \
   ${srcdir}/gdbcore.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/core-svr4.c
 core.o : ${srcdir}/core.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/command.h ../bfd/bfd.h ${srcdir}/target.h \
-  ${srcdir}/gdbcore.h $(INCLUDE_DIR)/dis-asm.h $(INCLUDE_DIR)/bfd.h ../bfd/bfd.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/command.h ${srcdir}/gdbcmd.h $(BFD_OBJ_DIR)/../include/bfd.h \
+  ${srcdir}/target.h ${srcdir}/gdbcore.h $(INCLUDE_DIR)/dis-asm.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/core.c
 coredep.o : ${srcdir}/coredep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
-  tm.h config.status ${srcdir}/gdbcore.h ../bfd/bfd.h $(INCLUDE_DIR)/obstack.h 
+  tm.h config.status ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/obstack.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/coredep.c
 corelow.o : ${srcdir}/corelow.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/command.h ../bfd/bfd.h ${srcdir}/target.h \
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/command.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/target.h \
   ${srcdir}/gdbcore.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/corelow.c
 cp-valprint.o : ${srcdir}/cp-valprint.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
@@ -116,7 +115,7 @@ cp-valprint.o : ${srcdir}/cp-valprint.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/cp-valprint.c
 dbxread.o : ${srcdir}/dbxread.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/symtab.h ${srcdir}/breakpoint.h ${srcdir}/frame.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h \
-  ${srcdir}/command.h ${srcdir}/target.h ../bfd/bfd.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/libbfd.h $(BFD_SRC_DIR)/libaout.h \
+  ${srcdir}/command.h ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/libbfd.h $(BFD_SRC_DIR)/libaout.h \
   ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h ${srcdir}/objfiles.h ${srcdir}/buildsym.h ${srcdir}/stabsread.h \
   ${srcdir}/gdb-stabs.h ${srcdir}/language.h ${srcdir}/complaints.h $(INCLUDE_DIR)/aout/aout64.h $(INCLUDE_DIR)/aout/stab_gnu.h \
   $(INCLUDE_DIR)/aout/stab.def ${srcdir}/partial-stab.h 
@@ -125,12 +124,12 @@ demangle.o : ${srcdir}/demangle.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.
   tm.h config.status ${srcdir}/command.h ${srcdir}/gdbcmd.h $(INCLUDE_DIR)/demangle.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/demangle.c
 dwarfread.o : ${srcdir}/dwarfread.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
-  tm.h config.status ../bfd/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/symtab.h ${srcdir}/gdbtypes.h ${srcdir}/symfile.h \
+  tm.h config.status $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/symtab.h ${srcdir}/gdbtypes.h ${srcdir}/symfile.h \
   $(INCLUDE_DIR)/demangle.h ${srcdir}/objfiles.h $(BFD_SRC_DIR)/libbfd.h $(INCLUDE_DIR)/elf/dwarf.h \
   ${srcdir}/buildsym.h ${srcdir}/expression.h ${srcdir}/language.h ${srcdir}/complaints.h 
 	${CC} -c ${INTERNAL_CFLAGS}  -I${BFD_SRC_DIR} -I${BFD_OBJ_DIR} ${srcdir}/dwarfread.c
 elfread.o : ${srcdir}/elfread.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
-  tm.h config.status ../bfd/bfd.h $(INCLUDE_DIR)/obstack.h $(BFD_SRC_DIR)/libbfd.h $(BFD_SRC_DIR)/libelf.h \
+  tm.h config.status $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/obstack.h $(BFD_SRC_DIR)/libbfd.h $(BFD_SRC_DIR)/libelf.h \
   $(INCLUDE_DIR)/elf/common.h $(INCLUDE_DIR)/elf/internal.h $(INCLUDE_DIR)/elf/external.h \
   ${srcdir}/symtab.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h ${srcdir}/objfiles.h ${srcdir}/buildsym.h ${srcdir}/gdb-stabs.h \
   ${srcdir}/complaints.h 
@@ -140,12 +139,12 @@ environ.o : ${srcdir}/environ.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/environ.c
 eval.o : ${srcdir}/eval.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h ${srcdir}/value.h ${srcdir}/expression.h \
-  ${srcdir}/target.h ../bfd/bfd.h ${srcdir}/frame.h ${srcdir}/language.h 
+  ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/frame.h ${srcdir}/language.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/eval.c
 exec.o : ${srcdir}/exec.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h ../bfd/bfd.h ${srcdir}/gdbcmd.h ${srcdir}/command.h \
-  ${srcdir}/gdbcore.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/gdbcmd.h \
+  ${srcdir}/command.h ${srcdir}/gdbcore.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/exec.c
 expprint.o : ${srcdir}/expprint.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/value.h \
@@ -153,26 +152,26 @@ expprint.o : ${srcdir}/expprint.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/expprint.c
 findvar.o : ${srcdir}/findvar.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h ${srcdir}/frame.h ${srcdir}/value.h ${srcdir}/expression.h \
-  ${srcdir}/gdbcore.h ../bfd/bfd.h ${srcdir}/inferior.h ${srcdir}/breakpoint.h ${srcdir}/target.h 
+  ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/inferior.h ${srcdir}/breakpoint.h ${srcdir}/target.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/findvar.c
 fork-child.o : ${srcdir}/fork-child.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h \
-  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h ../bfd/bfd.h \
+  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h \
   $(INCLUDE_DIR)/wait.h ${srcdir}/gdbcore.h ${srcdir}/terminal.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/fork-child.c
 gdbtypes.o : ${srcdir}/gdbtypes.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
-  tm.h config.status ../bfd/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/symtab.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
+  tm.h config.status $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/symtab.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
   ${srcdir}/objfiles.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/language.h ${srcdir}/target.h ${srcdir}/value.h ${srcdir}/complaints.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/gdbtypes.c
 go32-xdep.o : ${srcdir}/go32-xdep.c 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/go32-xdep.c
 gould-pinsn.o : ${srcdir}/gould-pinsn.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/frame.h \
-  ${srcdir}/gdbcore.h ../bfd/bfd.h $(INCLUDE_DIR)/opcode/np1.h 
+  ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/opcode/np1.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/gould-pinsn.c
 gould-xdep.o : ${srcdir}/gould-xdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h \
-  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h ../bfd/bfd.h 
+  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/gould-xdep.c
 h8300-tdep.o : ${srcdir}/h8300-tdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/frame.h $(INCLUDE_DIR)/obstack.h ${srcdir}/symtab.h 
@@ -180,46 +179,45 @@ h8300-tdep.o : ${srcdir}/h8300-tdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h
 h8500-tdep.o : ${srcdir}/h8500-tdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/frame.h $(INCLUDE_DIR)/obstack.h ${srcdir}/symtab.h \
   ${srcdir}/gdbtypes.h ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/value.h ${srcdir}/expression.h $(INCLUDE_DIR)/dis-asm.h \
-  $(INCLUDE_DIR)/bfd.h ../bfd/bfd.h ${srcdir}/../opcodes/h8500-opc.h 
+  $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/../opcodes/h8500-opc.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/h8500-tdep.c
 hp300ux-nat.o : ${srcdir}/hp300ux-nat.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h \
-  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h ../bfd/bfd.h 
+  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/hp300ux-nat.c
 hppa-pinsn.o : ${srcdir}/hppa-pinsn.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
-  $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h $(INCLUDE_DIR)/opcode/hppa.h 
+  $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(INCLUDE_DIR)/dis-asm.h $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/obstack.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/hppa-pinsn.c
 hppa-tdep.o : ${srcdir}/hppa-tdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h $(INCLUDE_DIR)/wait.h ${srcdir}/gdbcore.h ../bfd/bfd.h \
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h $(INCLUDE_DIR)/wait.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h \
   ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/target.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h ${srcdir}/objfiles.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/hppa-tdep.c
 hppab-nat.o : ${srcdir}/hppab-nat.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h ${srcdir}/frame.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h ../bfd/bfd.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/hppab-nat.c
 hppah-nat.o : ${srcdir}/hppah-nat.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h ${srcdir}/frame.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h ../bfd/bfd.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/hppah-nat.c
 i386-pinsn.o : ${srcdir}/i386-pinsn.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
-  $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(INCLUDE_DIR)/dis-asm.h $(INCLUDE_DIR)/bfd.h ../bfd/bfd.h \
-  $(INCLUDE_DIR)/obstack.h 
+  $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(INCLUDE_DIR)/dis-asm.h $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/obstack.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/i386-pinsn.c
 i386-tdep.o : ${srcdir}/i386-tdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h ../bfd/bfd.h ${srcdir}/target.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/target.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/i386-tdep.c
 i386b-nat.o : ${srcdir}/i386b-nat.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/i386b-nat.c
 i386mach-nat.o : ${srcdir}/i386mach-nat.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h \
-  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h ../bfd/bfd.h 
+  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/i386mach-nat.c
 i386v-nat.o : ${srcdir}/i386v-nat.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/language.h ${srcdir}/gdbcore.h ../bfd/bfd.h \
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/language.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h \
   $(INCLUDE_DIR)/ieee-float.h ${srcdir}/target.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/i386v-nat.c
 i386v4-nat.o : ${srcdir}/i386v4-nat.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
@@ -227,12 +225,11 @@ i386v4-nat.o : ${srcdir}/i386v4-nat.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/i386v4-nat.c
 i387-tdep.o : ${srcdir}/i387-tdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/language.h ${srcdir}/gdbcore.h ../bfd/bfd.h \
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/language.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h \
   $(INCLUDE_DIR)/ieee-float.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/i387-tdep.c
 i960-pinsn.o : ${srcdir}/i960-pinsn.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
-  $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(INCLUDE_DIR)/dis-asm.h $(INCLUDE_DIR)/bfd.h ../bfd/bfd.h \
-  $(INCLUDE_DIR)/obstack.h 
+  $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(INCLUDE_DIR)/dis-asm.h $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/obstack.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/i960-pinsn.c
 i960-tdep.o : ${srcdir}/i960-tdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h \
@@ -241,41 +238,44 @@ i960-tdep.o : ${srcdir}/i960-tdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h x
 infcmd.o : ${srcdir}/infcmd.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h ${srcdir}/frame.h ${srcdir}/inferior.h \
   ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/expression.h ${srcdir}/environ.h ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/gdbcore.h \
-  ../bfd/bfd.h ${srcdir}/target.h 
+  $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/target.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/infcmd.c
 inflow.o : ${srcdir}/inflow.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h \
   ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/command.h ${srcdir}/signals.h ${srcdir}/terminal.h ${srcdir}/target.h \
-  ../bfd/bfd.h 
+  $(BFD_OBJ_DIR)/../include/bfd.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/inflow.c
 infptrace.o : ${srcdir}/infptrace.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h ../bfd/bfd.h ${srcdir}/gdbcore.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/gdbcore.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/infptrace.c
 infrun.o : ${srcdir}/infrun.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/breakpoint.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h $(INCLUDE_DIR)/wait.h ${srcdir}/gdbcore.h ../bfd/bfd.h \
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h $(INCLUDE_DIR)/wait.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h \
   ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/target.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/infrun.c
 inftarg.o : ${srcdir}/inftarg.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h ../bfd/bfd.h $(INCLUDE_DIR)/wait.h \
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/wait.h \
   ${srcdir}/gdbcore.h ${srcdir}/terminal.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/inftarg.c
 irix4-nat.o : ${srcdir}/irix4-nat.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h ${srcdir}/frame.h \
   ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/irix4-nat.c
+isi-xdep.o : ${srcdir}/isi-xdep.c 
+	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/isi-xdep.c
 language.o : ${srcdir}/language.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h ${srcdir}/value.h ${srcdir}/expression.h \
-  ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/frame.h ${srcdir}/language.h ${srcdir}/target.h ../bfd/bfd.h ${srcdir}/parser-defs.h 
+  ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/frame.h ${srcdir}/language.h ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h \
+  ${srcdir}/parser-defs.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/language.c
 m2-lang.o : ${srcdir}/m2-lang.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/parser-defs.h \
   ${srcdir}/language.h ${srcdir}/m2-lang.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/m2-lang.c
 m2-typeprint.o : ${srcdir}/m2-typeprint.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
-  $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(INCLUDE_DIR)/obstack.h ../bfd/bfd.h ${srcdir}/symtab.h \
+  $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(INCLUDE_DIR)/obstack.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/symtab.h \
   ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/value.h ${srcdir}/gdbcore.h ${srcdir}/target.h ${srcdir}/command.h ${srcdir}/gdbcmd.h \
   ${srcdir}/language.h $(INCLUDE_DIR)/demangle.h ${srcdir}/m2-lang.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/m2-typeprint.c
@@ -284,28 +284,27 @@ m2-valprint.o : ${srcdir}/m2-valprint.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl
   ${srcdir}/valprint.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/m2-valprint.c
 m68k-pinsn.o : ${srcdir}/m68k-pinsn.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
-  $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(INCLUDE_DIR)/dis-asm.h $(INCLUDE_DIR)/bfd.h ../bfd/bfd.h \
-  $(INCLUDE_DIR)/obstack.h 
+  $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(INCLUDE_DIR)/dis-asm.h $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/obstack.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/m68k-pinsn.c
 m68k-tdep.o : ${srcdir}/m68k-tdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/frame.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/m68k-tdep.c
 m88k-nat.o : ${srcdir}/m88k-nat.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h ../bfd/bfd.h /usr/include/setjmp.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h /usr/include/setjmp.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/m88k-nat.c
 m88k-pinsn.o : ${srcdir}/m88k-pinsn.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(INCLUDE_DIR)/opcode/m88k.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/m88k-pinsn.c
 m88k-tdep.o : ${srcdir}/m88k-tdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h ../bfd/bfd.h /usr/include/setjmp.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h /usr/include/setjmp.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/m88k-tdep.c
 main.o : ${srcdir}/main.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/call-cmds.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h \
   ${srcdir}/inferior.h ${srcdir}/breakpoint.h ${srcdir}/frame.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h \
-  ${srcdir}/signals.h ${srcdir}/target.h ../bfd/bfd.h ${srcdir}/language.h $(INCLUDE_DIR)/getopt.h $(READLINE_DIR)/readline.h \
-  $(READLINE_DIR)/keymaps.h $(READLINE_DIR)/chardefs.h $(READLINE_DIR)/history.h 
+  ${srcdir}/signals.h ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/language.h $(INCLUDE_DIR)/getopt.h \
+  $(READLINE_DIR)/readline.h $(READLINE_DIR)/keymaps.h $(READLINE_DIR)/chardefs.h $(READLINE_DIR)/history.h 
 	${CC} -c ${INTERNAL_CFLAGS}  -I${READLINE_DIR} ${srcdir}/main.c
 maint.o : ${srcdir}/maint.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/command.h ${srcdir}/gdbcmd.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h \
@@ -315,24 +314,23 @@ mem-break.o : ${srcdir}/mem-break.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h x
   tm.h config.status 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/mem-break.c
 minsyms.o : ${srcdir}/minsyms.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
-  tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ../bfd/bfd.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
+  tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
   ${srcdir}/objfiles.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/minsyms.c
 mips-nat.o : ${srcdir}/mips-nat.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h ${srcdir}/frame.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h ../bfd/bfd.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/mips-nat.c
 mips-pinsn.o : ${srcdir}/mips-pinsn.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
-  $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(INCLUDE_DIR)/dis-asm.h $(INCLUDE_DIR)/bfd.h ../bfd/bfd.h \
-  $(INCLUDE_DIR)/obstack.h 
+  $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(INCLUDE_DIR)/dis-asm.h $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/obstack.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/mips-pinsn.c
 mips-tdep.o : ${srcdir}/mips-tdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h \
   ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/language.h ${srcdir}/gdbcore.h \
-  ../bfd/bfd.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h ${srcdir}/objfiles.h 
+  $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h ${srcdir}/objfiles.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/mips-tdep.c
 mipsread.o : ${srcdir}/mipsread.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
-  tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h ${srcdir}/gdbcore.h ../bfd/bfd.h \
+  tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h \
   ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h ${srcdir}/objfiles.h ${srcdir}/buildsym.h ${srcdir}/stabsread.h \
   ${srcdir}/complaints.h $(INCLUDE_DIR)/coff/sym.h $(INCLUDE_DIR)/coff/symconst.h ${srcdir}/gdb-stabs.h \
   $(INCLUDE_DIR)/coff/internal.h $(INCLUDE_DIR)/coff/mips.h $(INCLUDE_DIR)/coff/ecoff-ext.h \
@@ -356,14 +354,14 @@ nindy-tdep.o : ${srcdir}/nindy-tdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/nindy-tdep.c
 ns32k-pinsn.o : ${srcdir}/ns32k-pinsn.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/ns32k-opcode.h \
-  ${srcdir}/gdbcore.h ../bfd/bfd.h 
+  ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/ns32k-pinsn.c
 objfiles.o : ${srcdir}/objfiles.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
-  tm.h config.status ../bfd/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/symtab.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
+  tm.h config.status $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/symtab.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
   ${srcdir}/objfiles.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/objfiles.c
 paread.o : ${srcdir}/paread.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
-  tm.h config.status ../bfd/bfd.h $(INCLUDE_DIR)/obstack.h $(BFD_SRC_DIR)/libbfd.h $(BFD_SRC_DIR)/libhppa.h \
+  tm.h config.status $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/obstack.h $(BFD_SRC_DIR)/libbfd.h $(BFD_SRC_DIR)/libhppa.h \
   $(BFD_SRC_DIR)/sysdep.h $(BFD_SRC_DIR)/hosts/std-host.h ${srcdir}/symtab.h ${srcdir}/symfile.h \
   $(INCLUDE_DIR)/demangle.h ${srcdir}/objfiles.h ${srcdir}/buildsym.h ${srcdir}/gdb-stabs.h ${srcdir}/complaints.h \
   $(INCLUDE_DIR)/aout/aout64.h 
@@ -374,109 +372,111 @@ parse.o : ${srcdir}/parse.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h conf
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/parse.c
 printcmd.o : ${srcdir}/printcmd.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/frame.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h ${srcdir}/value.h ${srcdir}/expression.h \
-  ${srcdir}/language.h ${srcdir}/gdbcore.h ../bfd/bfd.h ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/target.h ${srcdir}/breakpoint.h \
-  $(INCLUDE_DIR)/demangle.h ${srcdir}/symfile.h ${srcdir}/objfiles.h 
+  ${srcdir}/language.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/target.h \
+  ${srcdir}/breakpoint.h $(INCLUDE_DIR)/demangle.h ${srcdir}/symfile.h ${srcdir}/objfiles.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/printcmd.c
 procfs.o : ${srcdir}/procfs.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h ${srcdir}/frame.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h ../bfd/bfd.h ${srcdir}/command.h \
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/command.h \
   ${srcdir}/gdbcore.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/procfs.c
 putenv.o : ${srcdir}/putenv.c 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/putenv.c
 pyr-pinsn.o : ${srcdir}/pyr-pinsn.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h $(INCLUDE_DIR)/opcode/pyr.h ${srcdir}/gdbcore.h \
-  ../bfd/bfd.h 
+  $(BFD_OBJ_DIR)/../include/bfd.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/pyr-pinsn.c
 pyr-tdep.o : ${srcdir}/pyr-tdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/pyr-tdep.c
 pyr-xdep.o : ${srcdir}/pyr-xdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h ../bfd/bfd.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/pyr-xdep.c
 remote-adapt.o : ${srcdir}/remote-adapt.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h \
   ${srcdir}/breakpoint.h ${srcdir}/frame.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h $(INCLUDE_DIR)/wait.h \
-  ${srcdir}/terminal.h ${srcdir}/target.h ../bfd/bfd.h ${srcdir}/gdbcore.h 
+  ${srcdir}/terminal.h ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/gdbcore.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/remote-adapt.c
 remote-eb.o : ${srcdir}/remote-eb.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   ${srcdir}/config/a29k/tm-a29k.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h \
-  ${srcdir}/frame.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h $(INCLUDE_DIR)/wait.h ${srcdir}/terminal.h \
-  ${srcdir}/target.h ../bfd/bfd.h ${srcdir}/gdbcore.h 
+  ${srcdir}/frame.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/symfile.h \
+  $(INCLUDE_DIR)/demangle.h $(INCLUDE_DIR)/wait.h ${srcdir}/terminal.h ${srcdir}/target.h ${srcdir}/gdbcore.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/remote-eb.c
-remote-es1800.o : ${srcdir}/remote-es1800.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status \
-  nm.h config.status $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h \
-  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h ../bfd/bfd.h \
-  $(INCLUDE_DIR)/wait.h ${srcdir}/terminal.h ${srcdir}/command.h 
-	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/remote-es1800.c
+remote-es.o : ${srcdir}/remote-es.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
+  tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h \
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/wait.h \
+  ${srcdir}/terminal.h ${srcdir}/command.h 
+	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/remote-es.c
 remote-hms.o : ${srcdir}/remote-hms.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h \
   ${srcdir}/breakpoint.h ${srcdir}/frame.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h $(INCLUDE_DIR)/wait.h \
-  ${srcdir}/terminal.h ${srcdir}/target.h ../bfd/bfd.h ${srcdir}/gdbcore.h ${srcdir}/serial.h 
+  ${srcdir}/terminal.h ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/gdbcore.h ${srcdir}/serial.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/remote-hms.c
 remote-mips.o : ${srcdir}/remote-mips.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h \
-  ${srcdir}/breakpoint.h ${srcdir}/frame.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ../bfd/bfd.h \
-  $(INCLUDE_DIR)/wait.h ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/gdbcore.h ${srcdir}/serial.h ${srcdir}/target.h 
+  ${srcdir}/breakpoint.h ${srcdir}/frame.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
+  $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/wait.h ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/gdbcore.h ${srcdir}/serial.h \
+  ${srcdir}/target.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/remote-mips.c
 remote-mm.o : ${srcdir}/remote-mm.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h ${srcdir}/frame.h \
   ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h $(INCLUDE_DIR)/wait.h ${srcdir}/terminal.h ${srcdir}/minimon.h \
-  ${srcdir}/target.h ../bfd/bfd.h 
+  ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/remote-mm.c
 remote-monitor.o : ${srcdir}/remote-monitor.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status \
-  nm.h config.status $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/gdbcore.h ../bfd/bfd.h $(INCLUDE_DIR)/obstack.h \
+  nm.h config.status $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/obstack.h \
   ${srcdir}/target.h $(INCLUDE_DIR)/wait.h ${srcdir}/command.h ${srcdir}/serial.h ${srcdir}/monitor.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/remote-monitor.c
 remote-nindy.o : ${srcdir}/remote-nindy.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h \
-  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h ../bfd/bfd.h \
-  ${srcdir}/gdbcore.h ${srcdir}/command.h $(INCLUDE_DIR)/ieee-float.h $(INCLUDE_DIR)/wait.h ${srcdir}/nindy-share/ttycntl.h \
-  ${srcdir}/nindy-share/demux.h ${srcdir}/nindy-share/env.h ${srcdir}/nindy-share/stop.h 
+  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
+  ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/gdbcore.h ${srcdir}/command.h $(INCLUDE_DIR)/ieee-float.h \
+  $(INCLUDE_DIR)/wait.h ${srcdir}/nindy-share/ttycntl.h ${srcdir}/nindy-share/demux.h ${srcdir}/nindy-share/env.h \
+  ${srcdir}/nindy-share/stop.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/remote-nindy.c
 remote-sim.o : ${srcdir}/remote-sim.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h \
   ${srcdir}/breakpoint.h ${srcdir}/frame.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h $(INCLUDE_DIR)/wait.h \
-  ${srcdir}/terminal.h ${srcdir}/target.h ../bfd/bfd.h ${srcdir}/gdbcore.h 
+  ${srcdir}/terminal.h ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/gdbcore.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/remote-sim.c
-remote-st2000.o : ${srcdir}/remote-st2000.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status \
-  nm.h config.status $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/gdbcore.h ../bfd/bfd.h $(INCLUDE_DIR)/obstack.h \
-  ${srcdir}/target.h $(INCLUDE_DIR)/wait.h ${srcdir}/serial.h 
-	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/remote-st2000.c
+remote-st.o : ${srcdir}/remote-st.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
+  tm.h config.status ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/target.h $(INCLUDE_DIR)/wait.h \
+  ${srcdir}/serial.h 
+	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/remote-st.c
 remote-udi.o : ${srcdir}/remote-udi.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h \
   ${srcdir}/breakpoint.h ${srcdir}/frame.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h $(INCLUDE_DIR)/wait.h \
-  ${srcdir}/terminal.h ${srcdir}/target.h ../bfd/bfd.h ${srcdir}/29k-share/udi/udiproc.h ${srcdir}/29k-share/udi/udiphcfg.h \
+  ${srcdir}/terminal.h ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/29k-share/udi/udiproc.h ${srcdir}/29k-share/udi/udiphcfg.h \
   ${srcdir}/29k-share/udi/udiphunix.h ${srcdir}/29k-share/udi/udiptcfg.h ${srcdir}/29k-share/udi/udipt29k.h \
   ${srcdir}/gdbcmd.h ${srcdir}/command.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/remote-udi.c
 remote-vx.o : ${srcdir}/remote-vx.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h $(INCLUDE_DIR)/wait.h ${srcdir}/target.h ../bfd/bfd.h \
-  ${srcdir}/gdbcore.h ${srcdir}/command.h ${srcdir}/complaints.h ${srcdir}/vx-share/ptrace.h ${srcdir}/vx-share/xdr_ptrace.h \
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h $(INCLUDE_DIR)/wait.h ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h \
+  ${srcdir}/gdbcore.h ${srcdir}/command.h ${srcdir}/complaints.h ${srcdir}/gdbcmd.h ${srcdir}/vx-share/ptrace.h ${srcdir}/vx-share/xdr_ptrace.h \
   ${srcdir}/vx-share/xdr_ld.h ${srcdir}/vx-share/xdr_rdb.h ${srcdir}/vx-share/dbgRpcLib.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/remote-vx.c
 remote-z8k.o : ${srcdir}/remote-z8k.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h \
   ${srcdir}/breakpoint.h ${srcdir}/frame.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h $(INCLUDE_DIR)/wait.h \
-  ${srcdir}/terminal.h ${srcdir}/target.h ../bfd/bfd.h ${srcdir}/gdbcore.h ${srcdir}/../sim/z8k/sim.h 
+  ${srcdir}/terminal.h ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/gdbcore.h ${srcdir}/../sim/z8k/sim.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/remote-z8k.c
 remote.o : ${srcdir}/remote.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h ../bfd/bfd.h $(INCLUDE_DIR)/wait.h \
-  ${srcdir}/terminal.h ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/serial.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
+  ${srcdir}/target.h $(INCLUDE_DIR)/wait.h ${srcdir}/terminal.h ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/serial.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/remote.c
 rs6000-nat.o : ${srcdir}/rs6000-nat.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h \
-  ${srcdir}/breakpoint.h ${srcdir}/frame.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h ../bfd/bfd.h 
+  ${srcdir}/breakpoint.h ${srcdir}/frame.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/rs6000-nat.c
 rs6000-pinsn.o : ${srcdir}/rs6000-pinsn.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(INCLUDE_DIR)/opcode/rs6k.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/rs6000-pinsn.c
 rs6000-tdep.o : ${srcdir}/rs6000-tdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h \
-  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h ../bfd/bfd.h \
+  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h \
   ${srcdir}/gdbcore.h ${srcdir}/xcoffsolib.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/rs6000-tdep.c
 ser-go32.o : ${srcdir}/ser-go32.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
@@ -493,68 +493,66 @@ serial.o : ${srcdir}/serial.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h co
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/serial.c
 sh-tdep.o : ${srcdir}/sh-tdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/frame.h $(INCLUDE_DIR)/obstack.h ${srcdir}/symtab.h ${srcdir}/gdbtypes.h ${srcdir}/gdbcmd.h ${srcdir}/command.h \
-  ${srcdir}/value.h ${srcdir}/expression.h $(INCLUDE_DIR)/dis-asm.h $(INCLUDE_DIR)/bfd.h ../bfd/bfd.h \
-  ${srcdir}/../opcodes/sh-opc.h 
+  ${srcdir}/value.h ${srcdir}/expression.h $(INCLUDE_DIR)/dis-asm.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/../opcodes/sh-opc.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/sh-tdep.c
 solib.o : ${srcdir}/solib.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
-  tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ../bfd/bfd.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
+  tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
   ${srcdir}/objfiles.h ${srcdir}/gdbcore.h ${srcdir}/command.h ${srcdir}/target.h ${srcdir}/frame.h ${srcdir}/regex.h ${srcdir}/inferior.h \
   ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/solib.c
 source.o : ${srcdir}/source.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/expression.h ${srcdir}/language.h ${srcdir}/command.h \
-  ${srcdir}/gdbcmd.h ${srcdir}/frame.h ${srcdir}/gdbcore.h ../bfd/bfd.h ${srcdir}/regex.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
+  ${srcdir}/gdbcmd.h ${srcdir}/frame.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/regex.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
   ${srcdir}/objfiles.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/source.c
 sparc-nat.o : ${srcdir}/sparc-nat.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h ${srcdir}/frame.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h ../bfd/bfd.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/sparc-nat.c
 sparc-pinsn.o : ${srcdir}/sparc-pinsn.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
-  $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(INCLUDE_DIR)/dis-asm.h $(INCLUDE_DIR)/bfd.h ../bfd/bfd.h \
-  $(INCLUDE_DIR)/obstack.h 
+  $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(INCLUDE_DIR)/dis-asm.h $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/obstack.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/sparc-pinsn.c
 sparc-tdep.o : ${srcdir}/sparc-tdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h \
-  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h ../bfd/bfd.h \
+  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h \
   $(INCLUDE_DIR)/ieee-float.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h ${srcdir}/objfiles.h ${srcdir}/gdbcore.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/sparc-tdep.c
 stabsread.o : ${srcdir}/stabsread.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
-  tm.h config.status ../bfd/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/symtab.h ${srcdir}/gdbtypes.h ${srcdir}/symfile.h \
+  tm.h config.status $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/symtab.h ${srcdir}/gdbtypes.h ${srcdir}/symfile.h \
   $(INCLUDE_DIR)/demangle.h ${srcdir}/objfiles.h $(INCLUDE_DIR)/aout/stab_gnu.h $(INCLUDE_DIR)/aout/stab.def \
   ${srcdir}/buildsym.h ${srcdir}/complaints.h ${srcdir}/stabsread.h 
 	${CC} -c ${INTERNAL_CFLAGS}  -I${BFD_SRC_DIR} -I${BFD_OBJ_DIR} ${srcdir}/stabsread.c
 stack.o : ${srcdir}/stack.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/value.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h \
-  ${srcdir}/language.h ${srcdir}/frame.h ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/gdbcore.h ../bfd/bfd.h ${srcdir}/target.h \
-  ${srcdir}/breakpoint.h $(INCLUDE_DIR)/demangle.h ${srcdir}/inferior.h 
+  ${srcdir}/language.h ${srcdir}/frame.h ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h \
+  ${srcdir}/target.h ${srcdir}/breakpoint.h $(INCLUDE_DIR)/demangle.h ${srcdir}/inferior.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/stack.c
 sun3-nat.o : ${srcdir}/sun3-nat.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h ${srcdir}/frame.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h ../bfd/bfd.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/sun3-nat.c
 sun386-nat.o : ${srcdir}/sun386-nat.c 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/sun386-nat.c
 symfile.o : ${srcdir}/symfile.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
-  tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h ${srcdir}/gdbcore.h ../bfd/bfd.h \
+  tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h \
   ${srcdir}/frame.h ${srcdir}/target.h ${srcdir}/value.h ${srcdir}/expression.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
   ${srcdir}/objfiles.h ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/breakpoint.h ${srcdir}/language.h ${srcdir}/complaints.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/symfile.c
 symm-tdep.o : ${srcdir}/symm-tdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h ../bfd/bfd.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/symm-tdep.c
 symm-xdep.o : ${srcdir}/symm-xdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h ../bfd/bfd.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/symm-xdep.c
 symmisc.o : ${srcdir}/symmisc.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
-  tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h ../bfd/bfd.h ${srcdir}/symfile.h \
+  tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/symfile.h \
   $(INCLUDE_DIR)/demangle.h ${srcdir}/objfiles.h ${srcdir}/breakpoint.h ${srcdir}/frame.h ${srcdir}/value.h ${srcdir}/expression.h \
   ${srcdir}/command.h ${srcdir}/language.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/symmisc.c
 symtab.o : ${srcdir}/symtab.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
-  tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h ${srcdir}/gdbcore.h ../bfd/bfd.h \
+  tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h \
   ${srcdir}/frame.h ${srcdir}/target.h ${srcdir}/value.h ${srcdir}/expression.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
   ${srcdir}/objfiles.h ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/call-cmds.h ${srcdir}/regex.h ${srcdir}/language.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/symtab.c
@@ -562,46 +560,47 @@ tahoe-pinsn.o : ${srcdir}/tahoe-pinsn.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h $(INCLUDE_DIR)/opcode/tahoe.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/tahoe-pinsn.c
 target.o : ${srcdir}/target.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
-  tm.h config.status ${srcdir}/target.h ../bfd/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbcmd.h ${srcdir}/command.h \
+  tm.h config.status ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbcmd.h ${srcdir}/command.h \
   ${srcdir}/symtab.h ${srcdir}/inferior.h ${srcdir}/breakpoint.h ${srcdir}/frame.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h \
   ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h ${srcdir}/objfiles.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/target.c
 typeprint.o : ${srcdir}/typeprint.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
-  tm.h config.status $(INCLUDE_DIR)/obstack.h ../bfd/bfd.h ${srcdir}/symtab.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h \
+  tm.h config.status $(INCLUDE_DIR)/obstack.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/symtab.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h \
   ${srcdir}/value.h ${srcdir}/gdbcore.h ${srcdir}/command.h ${srcdir}/gdbcmd.h ${srcdir}/target.h ${srcdir}/language.h $(INCLUDE_DIR)/demangle.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/typeprint.c
 ultra3-nat.o : ${srcdir}/ultra3-nat.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h \
-  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h ../bfd/bfd.h 
+  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/ultra3-nat.c
 ultra3-xdep.o : ${srcdir}/ultra3-xdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
   $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h \
-  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h ../bfd/bfd.h 
+  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/ultra3-xdep.c
 umax-xdep.o : ${srcdir}/umax-xdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h ../bfd/bfd.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/umax-xdep.c
 utils.o : ${srcdir}/utils.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
-  tm.h config.status ${srcdir}/signals.h ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/terminal.h ../bfd/bfd.h $(INCLUDE_DIR)/obstack.h \
+  tm.h config.status ${srcdir}/signals.h ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/terminal.h $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/obstack.h \
   ${srcdir}/target.h $(INCLUDE_DIR)/demangle.h ${srcdir}/expression.h ${srcdir}/language.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/utils.c
 valarith.o : ${srcdir}/valarith.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/value.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h \
-  ${srcdir}/target.h ../bfd/bfd.h ${srcdir}/language.h 
+  ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/language.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/valarith.c
 valops.o : ${srcdir}/valops.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h ${srcdir}/value.h ${srcdir}/expression.h \
-  ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/breakpoint.h ${srcdir}/gdbcore.h ../bfd/bfd.h ${srcdir}/target.h \
+  ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/breakpoint.h ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/target.h \
   $(INCLUDE_DIR)/demangle.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/valops.c
 valprint.o : ${srcdir}/valprint.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h ${srcdir}/value.h ${srcdir}/expression.h \
-  ${srcdir}/gdbcore.h ../bfd/bfd.h ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/target.h ${srcdir}/language.h $(INCLUDE_DIR)/demangle.h 
+  ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/target.h ${srcdir}/language.h \
+  $(INCLUDE_DIR)/demangle.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/valprint.c
 values.o : ${srcdir}/values.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h ${srcdir}/value.h ${srcdir}/expression.h \
-  ${srcdir}/gdbcore.h ../bfd/bfd.h ${srcdir}/frame.h ${srcdir}/command.h ${srcdir}/gdbcmd.h ${srcdir}/target.h $(INCLUDE_DIR)/demangle.h 
+  ${srcdir}/gdbcore.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/frame.h ${srcdir}/command.h ${srcdir}/gdbcmd.h ${srcdir}/target.h $(INCLUDE_DIR)/demangle.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/values.c
 vax-pinsn.o : ${srcdir}/vax-pinsn.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h $(INCLUDE_DIR)/opcode/vax.h 
@@ -619,22 +618,22 @@ xdr_rdb.o : ${srcdir}/vx-share/xdr_rdb.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidec
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/vx-share/xdr_rdb.c
 xcoffexec.o : ${srcdir}/xcoffexec.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/breakpoint.h \
-  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h ../bfd/bfd.h ${srcdir}/gdbcmd.h ${srcdir}/command.h \
-  ${srcdir}/gdbcore.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h ${srcdir}/objfiles.h $(BFD_SRC_DIR)/libbfd.h \
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_OBJ_DIR)/../include/bfd.h ${srcdir}/gdbcmd.h \
+  ${srcdir}/command.h ${srcdir}/gdbcore.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h ${srcdir}/objfiles.h $(BFD_SRC_DIR)/libbfd.h \
   ${srcdir}/xcoffsolib.h 
 	${CC} -c ${INTERNAL_CFLAGS}  -I${BFD_SRC_DIR} -I${BFD_OBJ_DIR} ${srcdir}/xcoffexec.c
 xcoffread.o : ${srcdir}/xcoffread.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
-  tm.h config.status ../bfd/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/symtab.h ${srcdir}/gdbtypes.h ${srcdir}/symfile.h \
+  tm.h config.status $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/symtab.h ${srcdir}/gdbtypes.h ${srcdir}/symfile.h \
   $(INCLUDE_DIR)/demangle.h ${srcdir}/objfiles.h ${srcdir}/buildsym.h ${srcdir}/stabsread.h ${srcdir}/complaints.h \
   $(INCLUDE_DIR)/coff/internal.h $(BFD_SRC_DIR)/libcoff.h $(INCLUDE_DIR)/coff/rs6000.h $(INCLUDE_DIR)/aout/stab_gnu.h \
   $(INCLUDE_DIR)/aout/stab.def 
 	${CC} -c ${INTERNAL_CFLAGS}  -I${BFD_SRC_DIR} -I${BFD_OBJ_DIR} ${srcdir}/xcoffread.c
 xcoffsolib.o : ${srcdir}/xcoffsolib.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status \
-  $(INCLUDE_DIR)/fopen-same.h tm.h config.status ../bfd/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/xcoffsolib.h 
+  $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(BFD_OBJ_DIR)/../include/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/xcoffsolib.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/xcoffsolib.c
 z8k-tdep.o : ${srcdir}/z8k-tdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/frame.h $(INCLUDE_DIR)/obstack.h ${srcdir}/symtab.h ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/gdbtypes.h \
-  $(INCLUDE_DIR)/dis-asm.h $(INCLUDE_DIR)/bfd.h ../bfd/bfd.h 
+  $(INCLUDE_DIR)/dis-asm.h $(BFD_OBJ_DIR)/../include/bfd.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/z8k-tdep.c
 c-exp.tab.o : c-exp.tab.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.h config.status nm.h config.status $(INCLUDE_DIR)/fopen-same.h \
   tm.h config.status ${srcdir}/expression.h ${srcdir}/parser-defs.h ${srcdir}/value.h ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h \