* Makefile.in (depend): More makefile diddling.

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

1 files changed, 18 insertions, 17 deletions

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 8755d7b..c624cf1 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -116,6 +116,7 @@ BFD_SRC_DIR =  ${srcdir}/../bfd
 BFD_OBJ_DIR = ./../bfd${subdir}
 BFD_DEP = $$(BFD_SRC_DIR)
 BFD_LIB = $(BFD_OBJ_DIR)/libbfd.a
+BFD_INCLUDES = -I${BFD_SRC_DIR} -I${BFD_OBJ_DIR}/../include
 
 # Where is the source dir for the READLINE library?  Traditionally in .. or .
 # (For the binary library built from it, we use ${READLINE_DIR}${subdir}.)
@@ -176,7 +177,7 @@ VERSION = 4.9.2
 DIST=gdb
 
 LINT=/usr/5bin/lint
-LINTFLAGS= -I${BFD_SRC_DIR} -I${BFD_OBJ_DIR}
+LINTFLAGS= ${BFD_INCLUDES}
 
 RUNTEST=runtest
 RUNTESTFLAGS=
@@ -462,7 +463,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_SRC_DIR) -I${BFD_OBJ_DIR} -DHOST_SYS=SUN4_SYS
+	#setopt load_flags $(CFLAGS) ${BFD_INCLUDES} -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 +556,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_SRC_DIR} \
-	  -I${BFD_OBJ_DIR} -I${READLINE_DIR} $(INTERNAL_CFLAGS) \
+	-$(GCC) -MM -nostdinc -I/usr/include ${BFD_INCLUDES} \
+	  -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.
@@ -606,10 +607,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_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${BFD_SRC_DIR} and -I${BFD_OBJ_DIR}/../include 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
+# a sibling include directory of 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 \
@@ -619,15 +620,15 @@ 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_SRC_DIR} -I$${BFD_OBJ_DIR} &;' \
-	  -e 's;$${srcdir}/xcoffexec.c;-I$${BFD_SRC_DIR} -I$${BFD_OBJ_DIR} &;' \
-	  -e 's;$${srcdir}/paread.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}/xcoffread.c;$${BFD_INCLUDES} &;' \
+	  -e 's;$${srcdir}/xcoffexec.c;$${BFD_INCLUDES} &;' \
+	  -e 's;$${srcdir}/paread.c;$${BFD_INCLUDES} &;' \
+	  -e 's;$${srcdir}/stabsread.c;$${BFD_INCLUDES} &;' \
+	  -e 's;$${srcdir}/dwarfread.c;$${BFD_INCLUDES} &;' \
+	  -e 's;$${srcdir}/elfread.c;$${BFD_INCLUDES} &;' \
+	  -e 's;$${srcdir}/mipsread.c;$${BFD_INCLUDES} &;' \
+	  -e 's;$${srcdir}/coffread.c;$${BFD_INCLUDES} &;' \
+	  -e 's;$${srcdir}/dbxread.c;$${BFD_INCLUDES} &;' \
 	  -e 's;$${srcdir}/main.c;-I$${READLINE_DIR} &;' \
 	  -e ': end' \
 	  >depend.tm4;