* Makefile.in (BFD_SRC_DIR): Renamed def and usages from BFD_DIR.

	* Makefile.in (BFD_OBJ_DIR):  New definition for the bfd build
	directory to find automatically generated header files and library.
	* Makefile.in (BFD_LIB):  Use BFD_OBJ_DIR.
	* Makefile.in (LINTFLAGS):  Include BFD_OBJ_DIR.
	* Makefile.in (saber_gdb):  Include BFD_OBJ_DIR.
	* Makefile.in (depend):  Include BFD_OBJ_DIR in gcc args.
	* Makefile.in (paread.o, xcoffexec.o):  Remove, now in depend.
	* depend, alldeps.mak:  Rebuild after Makefile.in changes.

4 files changed, 164 insertions, 141 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8de0d28..0bd04e5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,26 @@
+Mon Jun  7 16:32:05 1993  Fred Fish  (fnf@cygnus.com)
+
+	* Makefile.in (BFD_SRC_DIR):  Renamed def and usages from BFD_DIR.
+	* Makefile.in (BFD_OBJ_DIR):  New definition for the bfd build
+	directory to find automatically generated header files and library.
+	* Makefile.in (BFD_LIB):  Use BFD_OBJ_DIR.
+	* Makefile.in (LINTFLAGS):  Include BFD_OBJ_DIR.
+	* Makefile.in (saber_gdb):  Include BFD_OBJ_DIR.
+	* Makefile.in (depend):  Include BFD_OBJ_DIR in gcc args.
+	* Makefile.in (paread.o, xcoffexec.o):  Remove, now in depend.
+	* depend, alldeps.mak:  Rebuild after Makefile.in changes.
+
+Fri Jun  4 10:18:51 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in: change lynx support to CPU-*-lynxos*
+
+	* Makefile.in (subdir_do): change test from existence of directory
+	to existence of Makefile (the directory may exist but not be configured)
+
+Thu Jun  3 01:18:51 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* config/sparc/xm-sun4sol2.h: define MEM_FNS_DECLARED
+
 Fri Jun  4 10:43:33 1993  Ian Lance Taylor  (ian@cygnus.com)
 
 	* configure.in (mips-idt-ecoffl*): New target; use idtl.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index f88588a..2675df5 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -109,11 +109,11 @@ MMALLOC_LIB = ./../mmalloc${subdir}/libmmalloc.a
 #MMALLOC_CHECK = -DNO_MMALLOC_CHECK
 MMALLOC_CFLAGS = ${MMALLOC_CHECK} ${MMALLOC_DISABLE}
 
-# Where is the source dir for the BFD library?  Traditionally ../bfd or ./bfd
-# (When we want the binary library built from it, we use ${BFD_DIR}${subdir}.)
-BFD_DIR =  ${srcdir}/../bfd
-BFD_DEP = $$(BFD_DIR)
-BFD_LIB = ./../bfd${subdir}/libbfd.a
+# Where are the source and binary directories for the BFD library?
+BFD_SRC_DIR =  ${srcdir}/../bfd
+BFD_OBJ_DIR = ./../bfd${subdir}
+BFD_DEP = $$(BFD_SRC_DIR)
+BFD_LIB = $(BFD_OBJ_DIR)/libbfd.a
 
 # Where is the source dir for the READLINE library?  Traditionally in .. or .
 # (For the binary library built from it, we use ${READLINE_DIR}${subdir}.)
@@ -174,7 +174,7 @@ VERSION = 4.9.1
 DIST=gdb
 
 LINT=/usr/5bin/lint
-LINTFLAGS= -I${BFD_DIR}
+LINTFLAGS= -I${BFD_SRC_DIR} -I${BFD_OBJ_DIR}
 
 RUNTEST=runtest
 RUNTESTFLAGS=
@@ -462,7 +462,7 @@ gdb: $(OBS) $(TSOBS) ${ADD_DEPS} ${CDEPS} init.o
 	  init.o $(OBS) $(TSOBS) $(ADD_FILES) $(CLIBS) $(LOADLIBES)
 
 saber_gdb: $(SFILES) $(DEPFILES) copying.c version.c
-	#setopt load_flags $(CFLAGS) -I$(BFD_DIR) -DHOST_SYS=SUN4_SYS
+	#setopt load_flags $(CFLAGS) -I$(BFD_SRC_DIR) -I${BFD_OBJ_DIR} -DHOST_SYS=SUN4_SYS
 	#load ./init.c $(SFILES)
 	#unload ${srcdir}/c-exp.y ${srcdir}/m2-exp.y ${srcdir}/ch-exp.y
 	#unload ${srcdir}/vx-share/*.h
@@ -555,8 +555,8 @@ depend: $(SOURCES) Makefile.in
 	@echo Ignore errors about non-existent system-supplied include files
 	@echo for systems other than the one you are using.
 	@echo Also ignore any errors in arm-convert.s.
-	-$(GCC) -MM -nostdinc -I/usr/include -I${BFD_DIR} \
-	  -I${READLINE_DIR} $(INTERNAL_CFLAGS) \
+	-$(GCC) -MM -nostdinc -I/usr/include -I${BFD_SRC_DIR} \
+	  -I${BFD_OBJ_DIR} -I${READLINE_DIR} $(INTERNAL_CFLAGS) \
 	  `ls $(SOURCES) | grep -v '\.[hy]$$' | \
 	  sort -u` >depend.tmp
 #BEGIN COMMENTED OUT CODE -- this should now be taken care of below.
@@ -605,7 +605,10 @@ depend: $(SOURCES) Makefile.in
 # There is one exception: the *.tab.c files can exist either in srcdir
 # or in ., so make sure not to use an explicit rule for them.
 #
-# Adding -I${BFD_DIR} is required for all the files which use BFD internals
+# Adding -I${BFD_SRC_DIR} and -I${BFD_OBJ_DIR} is required for all the files
+# which use BFD internals.  This is because some bfd include files are in the
+# source directory, and some (bfd.h for example) are generated in the bfd
+# build directory.
 # Adding -I${READLINE_DIR} is required because the readline header files
 # are in readline not in include.  They probably should be moved.
 	<depend.tm3 sed \
@@ -615,13 +618,13 @@ depend: $(SOURCES) Makefile.in
 	  -e 'g' \
 	  -e '/:.*\.tab\.c/d' \
 	  -e 's/.*:\(.*\.c\).*/	$${CC} -c $${INTERNAL_CFLAGS} \1/' \
-	  -e 's;$${srcdir}/xcoffread.c;-I$${BFD_DIR} &;' \
-	  -e 's;$${srcdir}/stabsread.c;-I$${BFD_DIR} &;' \
-	  -e 's;$${srcdir}/dwarfread.c;-I$${BFD_DIR} &;' \
-	  -e 's;$${srcdir}/elfread.c;-I$${BFD_DIR} &;' \
-	  -e 's;$${srcdir}/mipsread.c;-I$${BFD_DIR} &;' \
-	  -e 's;$${srcdir}/coffread.c;-I$${BFD_DIR} &;' \
-	  -e 's;$${srcdir}/dbxread.c;-I$${BFD_DIR} &;' \
+	  -e 's;$${srcdir}/xcoffread.c;-I$${BFD_SRC_DIR} -I$${BFD_OBJ_DIR} &;' \
+	  -e 's;$${srcdir}/stabsread.c;-I$${BFD_SRC_DIR} -I$${BFD_OBJ_DIR} &;' \
+	  -e 's;$${srcdir}/dwarfread.c;-I$${BFD_SRC_DIR} -I$${BFD_OBJ_DIR} &;' \
+	  -e 's;$${srcdir}/elfread.c;-I$${BFD_SRC_DIR} -I$${BFD_OBJ_DIR} &;' \
+	  -e 's;$${srcdir}/mipsread.c;-I$${BFD_SRC_DIR} -I$${BFD_OBJ_DIR} &;' \
+	  -e 's;$${srcdir}/coffread.c;-I$${BFD_SRC_DIR} -I$${BFD_OBJ_DIR} &;' \
+	  -e 's;$${srcdir}/dbxread.c;-I$${BFD_SRC_DIR} -I$${BFD_OBJ_DIR} &;' \
 	  -e 's;$${srcdir}/main.c;-I$${READLINE_DIR} &;' \
 	  -e ': end' \
 	  >depend.tm4;
@@ -710,6 +713,8 @@ setup-to-dist: update-depend force_update
 # of files to be checked for dependencies.
 update-depend: update-alldeps force_update
 	../configure none -norecursion
+	(cd ../bfd; ../configure sun4 -norecursion; rm -f stmp-bfd.h)
+	(cd ../bfd; $(MAKE) $(MFLAGS) bfd.h)
 	rm -f depend
 	$(MAKE) $(MFLAGS) depend
 
@@ -788,7 +793,7 @@ STAGESTUFF=${OBS} ${TSOBS} ${NTSOBS} ${ADD_FILES} init.c init.o version.c gdb
 
 subdir_do: force
 	@for i in $(DODIRS); do \
-		if [ -d ./$$i ] ; then \
+		if [ -f ./$$i/Makefile ] ; then \
 			if (cd ./$$i; \
 				$(MAKE) $(FLAGS_TO_PASS) $(DO)) ; then true ; \
 			else exit 1 ; fi ; \
@@ -879,19 +884,6 @@ m2-exp.tab.c: $(srcdir)/m2-exp.y $(srcdir)/Makefile.in
 	  < y.tab.c > ././m2-exp.tab.c
 	-rm y.tab.c
 
-# Used on HP-PA native.
-# This rule fails to get automatically generated in depend because gcc -MM
-# ends up trying to include ../bfd/sysdep.h, which does not exist in an
-# unconfigured BFD directory, and the resulting error suppresses the
-# output of dependency information.  For now, just punt.  (FIXME)
-paread.o: ${srcdir}/paread.c
-	${CC} -c ${INTERNAL_CFLAGS} -I$(BFD_DIR) ${srcdir}/paread.c
-# Used on RS6000 native.
-# This rule fails to get automatically generated in depend if
-# sys/ldr.h does not exist.  (FIXME)
-xcoffexec.o: ${srcdir}/xcoffexec.c
-	${CC} -c ${INTERNAL_CFLAGS} -I${BFD_DIR} ${srcdir}/xcoffexec.c
-
 lint: $(LINTFILES)
 	$(LINT) $(INCLUDE_CFLAGS) $(LINTFLAGS) $(LINTFILES) \
 	   `echo ${DEPFILES} | sed 's/\.o /\.c /g'
diff --git a/gdb/alldeps.mak b/gdb/alldeps.mak
index 65e3bdb..cdfbba4 100644
--- a/gdb/alldeps.mak
+++ b/gdb/alldeps.mak
@@ -78,6 +78,7 @@ ${srcdir}/rs6000-pinsn.c\
 ${srcdir}/rs6000-tdep.c\
 ${srcdir}/ser-go32.c\
 ${srcdir}/ser-tcp.c\
+${srcdir}/sh-tdep.c\
 ${srcdir}/solib.c\
 ${srcdir}/sparc-nat.c\
 ${srcdir}/sparc-pinsn.c\
@@ -217,6 +218,7 @@ ${srcdir}/config/romp/xm-rtbsd.h\
 ${srcdir}/config/rs6000/nm-rs6000.h\
 ${srcdir}/config/rs6000/tm-rs6000.h\
 ${srcdir}/config/rs6000/xm-rs6000.h\
+${srcdir}/config/sh/tm-sh.h\
 ${srcdir}/config/sparc/nm-sun4os4.h\
 ${srcdir}/config/sparc/tm-sparclite.h\
 ${srcdir}/config/sparc/tm-spc-em.h\
@@ -337,6 +339,7 @@ ${srcdir}/config/pyr/pyramid.mt\
 ${srcdir}/config/romp/rtbsd.mh\
 ${srcdir}/config/rs6000/rs6000.mh\
 ${srcdir}/config/rs6000/rs6000.mt\
+${srcdir}/config/sh/sh.mt\
 ${srcdir}/config/sparc/sparc-em.mt\
 ${srcdir}/config/sparc/sparclite.mt\
 ${srcdir}/config/sparc/sun4os4.mh\
diff --git a/gdb/depend b/gdb/depend
index af41ed5..0392c03 100755
--- a/gdb/depend
+++ b/gdb/depend
@@ -11,33 +11,33 @@ a29k-pinsn.o : ${srcdir}/a29k-pinsn.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.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_DIR)/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/frame.h ${srcdir}/value.h \
+  tm.h config.status ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h 
+  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h \
+  $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h $(BFD_SRC_DIR)/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_DIR)/bfd.h \
+  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/symtab.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
+  tm.h config.status $(BFD_SRC_DIR)/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 +45,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_DIR)/bfd.h ${srcdir}/symtab.h \
+  $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(INCLUDE_DIR)/obstack.h $(BFD_SRC_DIR)/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 +58,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_DIR)/bfd.h ${srcdir}/symtab.h \
+  $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(INCLUDE_DIR)/obstack.h $(BFD_SRC_DIR)/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,10 +68,10 @@ 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_DIR)/bfd.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
-  ${srcdir}/objfiles.h ${srcdir}/buildsym.h ${srcdir}/complaints.h $(BFD_DIR)/libbfd.h $(INCLUDE_DIR)/coff/internal.h \
-  $(BFD_DIR)/libcoff.h 
-	${CC} -c ${INTERNAL_CFLAGS}  -I${BFD_DIR} ${srcdir}/coffread.c
+  ${srcdir}/value.h ${srcdir}/expression.h $(BFD_SRC_DIR)/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
 command.o : ${srcdir}/command.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}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/value.h ${srcdir}/gdbtypes.h \
   ${srcdir}/expression.h 
@@ -85,29 +85,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_DIR)/bfd.h ${srcdir}/gdbcmd.h 
+  $(INCLUDE_DIR)/wait.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h ${srcdir}/gdbcmd.h 
+  $(INCLUDE_DIR)/wait.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h ${srcdir}/command.h \
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_SRC_DIR)/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_DIR)/bfd.h ${srcdir}/target.h \
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/command.h $(BFD_SRC_DIR)/bfd.h ${srcdir}/target.h \
   ${srcdir}/gdbcore.h $(INCLUDE_DIR)/dis-asm.h $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/../bfd/bfd.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_DIR)/bfd.h $(INCLUDE_DIR)/obstack.h 
+  tm.h config.status ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h ${srcdir}/target.h \
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/command.h $(BFD_SRC_DIR)/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,35 +116,35 @@ 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_DIR)/bfd.h ${srcdir}/gdbcore.h $(BFD_DIR)/libbfd.h $(BFD_DIR)/libaout.h \
+  ${srcdir}/command.h ${srcdir}/target.h $(BFD_SRC_DIR)/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 
-	${CC} -c ${INTERNAL_CFLAGS}  -I${BFD_DIR} ${srcdir}/dbxread.c
+	${CC} -c ${INTERNAL_CFLAGS}  -I${BFD_SRC_DIR} -I${BFD_OBJ_DIR} ${srcdir}/dbxread.c
 demangle.o : ${srcdir}/demangle.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 $(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_DIR)/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/symtab.h ${srcdir}/gdbtypes.h ${srcdir}/symfile.h \
-  $(INCLUDE_DIR)/demangle.h ${srcdir}/objfiles.h $(BFD_DIR)/libbfd.h $(INCLUDE_DIR)/elf/dwarf.h \
+  tm.h config.status $(BFD_SRC_DIR)/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_DIR} ${srcdir}/dwarfread.c
+	${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_DIR)/bfd.h $(INCLUDE_DIR)/obstack.h $(BFD_DIR)/libbfd.h $(BFD_DIR)/libelf.h \
+  tm.h config.status $(BFD_SRC_DIR)/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 
-	${CC} -c ${INTERNAL_CFLAGS}  -I${BFD_DIR} ${srcdir}/elfread.c
+	${CC} -c ${INTERNAL_CFLAGS}  -I${BFD_SRC_DIR} -I${BFD_OBJ_DIR} ${srcdir}/elfread.c
 environ.o : ${srcdir}/environ.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}/environ.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_DIR)/bfd.h ${srcdir}/frame.h ${srcdir}/language.h 
+  ${srcdir}/target.h $(BFD_SRC_DIR)/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_DIR)/bfd.h ${srcdir}/gdbcmd.h ${srcdir}/command.h \
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_SRC_DIR)/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 \
@@ -153,26 +153,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_DIR)/bfd.h ${srcdir}/inferior.h ${srcdir}/breakpoint.h ${srcdir}/target.h 
+  ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h \
+  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_SRC_DIR)/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_DIR)/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/symtab.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
+  tm.h config.status $(BFD_SRC_DIR)/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_DIR)/bfd.h $(INCLUDE_DIR)/opcode/np1.h 
+  ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h 
+  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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 
@@ -184,23 +184,23 @@ h8500-tdep.o : ${srcdir}/h8500-tdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.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_DIR)/bfd.h 
+  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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 
 	${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_DIR)/bfd.h \
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h $(INCLUDE_DIR)/wait.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_SRC_DIR)/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_DIR)/bfd.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_SRC_DIR)/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 $(INCLUDE_DIR)/../bfd/bfd.h \
@@ -208,18 +208,18 @@ i386-pinsn.o : ${srcdir}/i386-pinsn.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.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_DIR)/bfd.h ${srcdir}/target.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h 
+  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h \
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/language.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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,7 +227,7 @@ 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_DIR)/bfd.h \
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/language.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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 \
@@ -241,25 +241,25 @@ 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_DIR)/bfd.h ${srcdir}/target.h 
+  $(BFD_SRC_DIR)/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_DIR)/bfd.h 
+  $(BFD_SRC_DIR)/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_DIR)/bfd.h ${srcdir}/gdbcore.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_SRC_DIR)/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_DIR)/bfd.h \
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h $(INCLUDE_DIR)/wait.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h $(INCLUDE_DIR)/wait.h \
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_SRC_DIR)/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 \
@@ -268,14 +268,14 @@ irix4-nat.o : ${srcdir}/irix4-nat.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h x
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/irix4-nat.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_DIR)/bfd.h ${srcdir}/parser-defs.h 
+  ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/frame.h ${srcdir}/language.h ${srcdir}/target.h $(BFD_SRC_DIR)/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_DIR)/bfd.h ${srcdir}/symtab.h \
+  $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(INCLUDE_DIR)/obstack.h $(BFD_SRC_DIR)/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
@@ -292,19 +292,19 @@ m68k-tdep.o : ${srcdir}/m68k-tdep.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h x
 	${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_DIR)/bfd.h /usr/include/setjmp.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h /usr/include/setjmp.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h ${srcdir}/language.h $(INCLUDE_DIR)/getopt.h $(READLINE_DIR)/readline.h \
+  ${srcdir}/signals.h ${srcdir}/target.h $(BFD_SRC_DIR)/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 \
@@ -315,12 +315,12 @@ 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_DIR)/bfd.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
+  tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h $(BFD_SRC_DIR)/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_DIR)/bfd.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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 $(INCLUDE_DIR)/../bfd/bfd.h \
@@ -329,16 +329,16 @@ mips-pinsn.o : ${srcdir}/mips-pinsn.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h
 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_DIR)/bfd.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h ${srcdir}/objfiles.h 
+  $(BFD_SRC_DIR)/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_DIR)/bfd.h \
+  tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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 \
-  $(BFD_DIR)/libaout.h $(INCLUDE_DIR)/aout/aout64.h $(INCLUDE_DIR)/aout/stab_gnu.h $(INCLUDE_DIR)/aout/stab.def \
-  $(BFD_DIR)/libcoff.h $(BFD_DIR)/libecoff.h ${srcdir}/expression.h ${srcdir}/language.h ${srcdir}/partial-stab.h 
-	${CC} -c ${INTERNAL_CFLAGS}  -I${BFD_DIR} ${srcdir}/mipsread.c
+  $(BFD_SRC_DIR)/libaout.h $(INCLUDE_DIR)/aout/aout64.h $(INCLUDE_DIR)/aout/stab_gnu.h $(INCLUDE_DIR)/aout/stab.def \
+  $(BFD_SRC_DIR)/libcoff.h $(BFD_SRC_DIR)/libecoff.h ${srcdir}/expression.h ${srcdir}/language.h ${srcdir}/partial-stab.h 
+	${CC} -c ${INTERNAL_CFLAGS}  -I${BFD_SRC_DIR} -I${BFD_OBJ_DIR} ${srcdir}/mipsread.c
 news-xdep.o : ${srcdir}/news-xdep.c 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/news-xdep.c
 Onindy.o : ${srcdir}/nindy-share/Onindy.c ${srcdir}/nindy-share/ttycntl.h ${srcdir}/nindy-share/block_io.h \
@@ -356,15 +356,15 @@ 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_DIR)/bfd.h 
+  ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/symtab.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
+  tm.h config.status $(BFD_SRC_DIR)/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_DIR)/bfd.h $(INCLUDE_DIR)/obstack.h $(BFD_DIR)/libbfd.h $(BFD_DIR)/libhppa.h \
-  $(BFD_DIR)/sysdep.h $(BFD_DIR)/hosts/std-host.h ${srcdir}/symtab.h ${srcdir}/symfile.h \
+  tm.h config.status $(BFD_SRC_DIR)/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 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/paread.c
@@ -374,109 +374,109 @@ 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_DIR)/bfd.h ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/target.h ${srcdir}/breakpoint.h \
+  ${srcdir}/language.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h ${srcdir}/command.h \
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_SRC_DIR)/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_DIR)/bfd.h 
+  $(BFD_SRC_DIR)/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_DIR)/bfd.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h ${srcdir}/gdbcore.h 
+  ${srcdir}/terminal.h ${srcdir}/target.h $(BFD_SRC_DIR)/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_DIR)/bfd.h ${srcdir}/gdbcore.h 
+  ${srcdir}/target.h $(BFD_SRC_DIR)/bfd.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_DIR)/bfd.h \
+  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_SRC_DIR)/bfd.h \
   $(INCLUDE_DIR)/wait.h ${srcdir}/terminal.h ${srcdir}/command.h 
 	${CC} -c ${INTERNAL_CFLAGS}  ${srcdir}/remote-es1800.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_DIR)/bfd.h ${srcdir}/gdbcore.h ${srcdir}/serial.h 
+  ${srcdir}/terminal.h ${srcdir}/target.h $(BFD_SRC_DIR)/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_DIR)/bfd.h \
+  ${srcdir}/breakpoint.h ${srcdir}/frame.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h $(BFD_SRC_DIR)/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_DIR)/bfd.h 
+  ${srcdir}/target.h $(BFD_SRC_DIR)/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_DIR)/bfd.h $(INCLUDE_DIR)/obstack.h \
+  nm.h config.status $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h \
+  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_SRC_DIR)/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_DIR)/bfd.h ${srcdir}/gdbcore.h 
+  ${srcdir}/terminal.h ${srcdir}/target.h $(BFD_SRC_DIR)/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_DIR)/bfd.h $(INCLUDE_DIR)/obstack.h \
+  nm.h config.status $(INCLUDE_DIR)/fopen-same.h tm.h config.status ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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-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_DIR)/bfd.h ${srcdir}/29k-share/udi/udiproc.h ${srcdir}/29k-share/udi/udiphcfg.h \
+  ${srcdir}/terminal.h ${srcdir}/target.h $(BFD_SRC_DIR)/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_DIR)/bfd.h \
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h $(INCLUDE_DIR)/wait.h ${srcdir}/target.h $(BFD_SRC_DIR)/bfd.h \
   ${srcdir}/gdbcore.h ${srcdir}/command.h ${srcdir}/complaints.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_DIR)/bfd.h ${srcdir}/gdbcore.h ${srcdir}/../sim/z8k/sim.h 
+  ${srcdir}/terminal.h ${srcdir}/target.h $(BFD_SRC_DIR)/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_DIR)/bfd.h $(INCLUDE_DIR)/wait.h \
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_SRC_DIR)/bfd.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_DIR)/bfd.h 
+  ${srcdir}/breakpoint.h ${srcdir}/frame.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_SRC_DIR)/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_DIR)/bfd.h \
+  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_SRC_DIR)/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 \
@@ -491,19 +491,24 @@ ser-unix.o : ${srcdir}/ser-unix.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h xm.
 serial.o : ${srcdir}/serial.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}/serial.h 
 	${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 $(INCLUDE_DIR)/../bfd/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_DIR)/bfd.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
+  tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h $(BFD_SRC_DIR)/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_DIR)/bfd.h ${srcdir}/regex.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h \
+  ${srcdir}/gdbcmd.h ${srcdir}/frame.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_SRC_DIR)/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 $(INCLUDE_DIR)/../bfd/bfd.h \
@@ -511,45 +516,45 @@ sparc-pinsn.o : ${srcdir}/sparc-pinsn.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl
 	${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_DIR)/bfd.h \
+  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_SRC_DIR)/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_DIR)/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/symtab.h ${srcdir}/gdbtypes.h ${srcdir}/symfile.h \
+  tm.h config.status $(BFD_SRC_DIR)/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_DIR} ${srcdir}/stabsread.c
+	${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_DIR)/bfd.h ${srcdir}/target.h \
+  ${srcdir}/language.h ${srcdir}/frame.h ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h \
+  tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h ${srcdir}/symfile.h \
+  tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h $(BFD_SRC_DIR)/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_DIR)/bfd.h \
+  tm.h config.status ${srcdir}/symtab.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbtypes.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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
@@ -557,46 +562,46 @@ 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_DIR)/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/gdbcmd.h ${srcdir}/command.h \
+  tm.h config.status ${srcdir}/target.h $(BFD_SRC_DIR)/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_DIR)/bfd.h ${srcdir}/symtab.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h \
+  tm.h config.status $(INCLUDE_DIR)/obstack.h $(BFD_SRC_DIR)/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_DIR)/bfd.h 
+  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h 
+  ${srcdir}/breakpoint.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h 
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h $(INCLUDE_DIR)/obstack.h \
+  tm.h config.status ${srcdir}/signals.h ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/terminal.h $(BFD_SRC_DIR)/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_DIR)/bfd.h ${srcdir}/language.h 
+  ${srcdir}/target.h $(BFD_SRC_DIR)/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_DIR)/bfd.h ${srcdir}/target.h \
+  ${srcdir}/frame.h ${srcdir}/inferior.h ${srcdir}/breakpoint.h ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h ${srcdir}/gdbcmd.h ${srcdir}/command.h ${srcdir}/target.h ${srcdir}/language.h $(INCLUDE_DIR)/demangle.h 
+  ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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_DIR)/bfd.h ${srcdir}/frame.h ${srcdir}/command.h ${srcdir}/gdbcmd.h ${srcdir}/target.h $(INCLUDE_DIR)/demangle.h 
+  ${srcdir}/gdbcore.h $(BFD_SRC_DIR)/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 
@@ -614,18 +619,18 @@ 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_DIR)/bfd.h ${srcdir}/gdbcmd.h ${srcdir}/command.h \
-  ${srcdir}/gdbcore.h ${srcdir}/symfile.h $(INCLUDE_DIR)/demangle.h ${srcdir}/objfiles.h $(BFD_DIR)/libbfd.h \
+  ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/target.h $(BFD_SRC_DIR)/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}  ${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_DIR)/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/symtab.h ${srcdir}/gdbtypes.h ${srcdir}/symfile.h \
+  tm.h config.status $(BFD_SRC_DIR)/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_DIR)/libcoff.h $(INCLUDE_DIR)/coff/rs6000.h $(INCLUDE_DIR)/aout/stab_gnu.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_DIR} ${srcdir}/xcoffread.c
+	${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_DIR)/bfd.h $(INCLUDE_DIR)/obstack.h ${srcdir}/xcoffsolib.h 
+  $(INCLUDE_DIR)/fopen-same.h tm.h config.status $(BFD_SRC_DIR)/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 \