* Makefile.in (VERSION): Roll to 4.7.6.

(SFILES_SUBDIR):  Add 29k-share/udi_soc.
(SFILES_SUBSUBDIR):  Move 29k-share/udi files to this macro.
(HFILES):  Remove all nm-* except nm-trash.h.  Add ns32k-opcode.h.
(depend):  Fix bug where nm-files in config files weren't noticed.
(make-proto-gdb-1):  Avoid changing directories while building new
prototype.  Build SFILES_SUBSUBDIR with longer symlinks.

.Sanitize:  Remove am29k-opcode.h, convx-opcode.h, os68k-xdep.c.

3 files changed, 41 insertions, 26 deletions

diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index 16f2311..d4b3583 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -43,7 +43,6 @@ a68v-nat.c
 alldeps.mak
 alloca.c
 altos-xdep.c
-am29k-opcode.h
 am29k-pinsn.c
 am29k-tdep.c
 arm-convert.s
@@ -71,7 +70,6 @@ configure.in
 convex-pinsn.c
 convex-tdep.c
 convex-xdep.c
-convx-opcode.h
 copying.awk
 copying.c
 core.c
@@ -191,7 +189,6 @@ ns32k-opcode.h
 ns32k-pinsn.c
 objfiles.c
 objfiles.h
-os68k-xdep.c
 paread.c
 parse.c
 parser-defs.h
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 326e545..11df611 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+Tue Feb 16 00:53:20 1993  John Gilmore  (gnu@cygnus.com)
+
+	* Makefile.in (VERSION):  Roll to 4.7.6.
+	(SFILES_SUBDIR):  Add 29k-share/udi_soc.
+	(SFILES_SUBSUBDIR):  Move 29k-share/udi files to this macro.
+	(HFILES):  Remove all nm-* except nm-trash.h.  Add ns32k-opcode.h.
+	(depend):  Fix bug where nm-files in config files weren't noticed.
+	(make-proto-gdb-1):  Avoid changing directories while building new
+	prototype.  Build SFILES_SUBSUBDIR with longer symlinks.
+
 Mon Feb 15 20:48:09 1993  John Gilmore  (gnu@cygnus.com)
 
 	* remote.c:  Improve error recovery.  Allow user to break out
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 1ec2b41..4d8c6f6 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -163,7 +163,7 @@ CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${NAT_CDEPS} \
 ADD_FILES = ${REGEX} ${ALLOCA}  ${XM_ADD_FILES} ${TM_ADD_FILES} ${NAT_ADD_FILES}
 ADD_DEPS = ${REGEX1} ${ALLOCA1} ${XM_ADD_FILES} ${TM_ADD_FILES} ${NAT_ADD_FILES}
 
-VERSION = 4.7.5
+VERSION = 4.7.6
 DIST=gdb
 
 LINT=/usr/5bin/lint
@@ -198,7 +198,7 @@ SFILES_MAINDIR = \
 	 remote.c source.c stack.c symmisc.c symtab.c symfile.c \
 	 utils.c valarith.c valops.c valprint.c values.c c-exp.y m2-exp.y \
 	 mem-break.c target.c \
-	 dbxread.c coffread.c elfread.c dwarfread.c xcoffread.c stabsread.c \
+	 dbxread.c coffread.c elfread.c dwarfread.c stabsread.c \
 	 ieee-float.c language.c parse.c buildsym.c objfiles.c \
 	 minsyms.c mipsread.c maint.c ch-exp.y c-lang.c ch-lang.c m2-lang.c \
 	 complaints.c typeprint.c c-typeprint.c ch-typeprint.c m2-typeprint.c \
@@ -224,6 +224,11 @@ SFILES_SUBDIR = \
 	 ${srcdir}/nindy-share/env.h \
 	 ${srcdir}/nindy-share/stop.h \
 	 ${srcdir}/nindy-share/ttycntl.h \
+	 ${srcdir}/29k-share/udi_soc
+
+# Source files in sub-subdirectories.  We need to know this because we
+# make relative symlinks with them.
+SFILES_SUBSUBDIR = \
 	 ${srcdir}/29k-share/udi/udiphcfg.h \
 	 ${srcdir}/29k-share/udi/udiphsun.h \
 	 ${srcdir}/29k-share/udi/udiproc.h \
@@ -239,7 +244,7 @@ NONSRC_SUBDIR = \
 	 ${srcdir}/vx-share/README
 
 # All source files that go into linking GDB, except config-specified files.
-SFILES = $(SFILES_MAINDIR) $(SFILES_SUBDIR)
+SFILES = $(SFILES_MAINDIR) $(SFILES_SUBDIR) $(SFILES_SUBSUBDIR)
 
 # All source files that lint should look at
 LINTFILES = $(SFILES) $(YYFILES) init.c
@@ -258,12 +263,9 @@ HFILES=	breakpoint.h buildsym.h call-cmds.h command.h defs.h \
 	target.h terminal.h typeprint.h xcoffsolib.h value.h \
 	tm-68k.h tm-hppa.h tm-i960.h tm-sparc.h tm-sunos.h tm-sysv4.h \
 	xm-m68k.h xm-sparc.h xm-sysv4.h xm-vax.h \
-	nm-i386bsd.h nm-i386mach.h nm-i386sco.h nm-i386v.h nm-i386v4.h nm-irix3.h \
-	nm-irix4.h nm-linux.h nm-m88k.h nm-mips.h nm-news.h nm-rs6000.h \
-	nm-sun2.h nm-sun3.h nm-sun386.h nm-sun4os4.h nm-trash.h \
-	nm-ultra3.h nm-hppab.h nm-hppah.h nm-umax.h nm-sysv4.h \
-	nm-apollo68b.h nm-apollo68v.h nm-vax.h nm-hp300bsd.h \
-	nm-hp300hpux.h c-lang.h ch-lang.h m2-lang.h complaints.h \
+	nm-trash.h \
+	c-lang.h ch-lang.h m2-lang.h complaints.h \
+	ns32k-opcode.h \
 	valprint.h
 
 REMOTE_EXAMPLES = m68k-stub.c i386-stub.c sparc-stub.c rem-multi.shar
@@ -283,7 +285,7 @@ OTHERS = Makefile.in depend alldeps.mak createtags munch configure.in \
 
 # Subdirectories of gdb, which should be included in their entirety in
 # gdb-xxx.tar.Z:
-TARDIRS = doc # tests
+TARDIRS = doc sparclite # tests
 
 # GDB "info" files, which should be included in their entirety
 INFOFILES = gdb.info*
@@ -303,7 +305,7 @@ OBS = version.o main.o blockframe.o breakpoint.o findvar.o stack.o source.o \
     copying.o $(DEPFILES) mem-break.o target.o \
     ieee-float.o putenv.o parse.o language.o $(YYOBJ) \
     buildsym.o objfiles.o minsyms.o maint.o demangle.o \
-    dbxread.o coffread.o elfread.o dwarfread.o xcoffread.o mipsread.o \
+    dbxread.o coffread.o elfread.o dwarfread.o mipsread.o \
     stabsread.o core.o c-lang.o ch-lang.o m2-lang.o complaints.o \
     typeprint.o c-typeprint.o ch-typeprint.o m2-typeprint.o \
     c-valprint.o cp-valprint.o ch-valprint.o m2-valprint.o
@@ -415,7 +417,7 @@ alldeps.mak: ${srcdir}/config
 	      for (i = 2; i <= NF; i++) \
 	        print $$i >> "alldeps.tmp" ; \
             } \
-	    $$1 == "TM_FILE=" || $$1 == "XM_FILE=" || $$1 == "NAT_FILE" { \
+	    $$1 == "TM_FILE=" || $$1 == "XM_FILE=" || $$1 == "NAT_FILE=" { \
 	      print $$2 >> "allparam.tmp" }' ; \
 	done
 	sort <alldeps.tmp | uniq | \
@@ -596,19 +598,21 @@ make-proto-gdb-1: ${TARFILES} ${TARDIRS} gdb.info
 	cd proto-gdb.dir ; for i in ${TARFILES} ; do ln -s ../$$i . ; done
 	cd proto-gdb.dir ; ln -s ../${INFOFILES} .
 	cd proto-gdb.dir ; for i in ${TARDIRS}; do \
-	  mkdir $$i; cd $$i; \
+	  (mkdir $$i; cd $$i; \
 	  ln -s ../../$$i/* .; \
 	  rm -rf SCCS CVS.adm RCS config.status; \
-	  if test -f Makefile.in; then rm Makefile; else true; fi; done
+	  if test -f Makefile.in; then rm Makefile; else true; fi;); done
 	mkdir proto-gdb.dir/config
 	cd proto-gdb.dir/config ; \
 	  for i in $(ALLCONFIG) ; do ln -s ../../$$i ../$$i ; done
-	mkdir proto-gdb.dir/vx-share proto-gdb.dir/nindy-share \
-		proto-gdb.dir/29k-share
-	mkdir proto-gdb.dir/29k-share/udi
+	mkdir proto-gdb.dir/vx-share proto-gdb.dir/nindy-share
+	mkdir proto-gdb.dir/29k-share proto-gdb.dir/29k-share/udi
 	cd proto-gdb.dir/config ; \
 	  for i in $(SFILES_SUBDIR) $(NONSRC_SUBDIR) $(ALLDEPFILES_SUBDIR); \
 	    do ln -s ../../$$i ../$$i ; done
+	cd proto-gdb.dir/config ; \
+	  for i in $(SFILES_SUBSUBDIR); \
+	    do ln -s ../../../$$i ../$$i ; done
 	chmod og=u `find . -print`
 
 clean:
@@ -676,10 +680,12 @@ version.c: Makefile
 
 # c-exp.tab.c is generated in target dir from c-exp.y if it doesn't exist
 # in srcdir, then compiled in target dir to c-exp.tab.o.
+# ././c-exp.tab.c is so the command argument will never match $(srcdir)/c-exp.y
+# (some "makes" rewrite the VPATH into command arguments if they match deps).
 # Remove bogus decls for malloc/realloc/free which conflict with everything
 # else.
 c-exp.tab.o: c-exp.tab.c
-c-exp.tab.c: $(srcdir)/c-exp.y Makefile
+c-exp.tab.c: $(srcdir)/c-exp.y $(srcdir)/Makefile.in
 	@echo 'Expect 4 shift/reduce conflicts.'
 	${YACC} $(srcdir)/c-exp.y
 	-sed -e '/extern.*malloc/d' \
@@ -688,7 +694,7 @@ c-exp.tab.c: $(srcdir)/c-exp.y Makefile
 	     -e '/include.*malloc.h/d' \
 	     -e 's/malloc/xmalloc/g' \
 	     -e 's/realloc/xrealloc/g' \
-	  < y.tab.c > c-exp.tab.c
+	  < y.tab.c > ././c-exp.tab.c
 	-rm y.tab.c
 
 # start-sanitize-chill
@@ -697,7 +703,7 @@ c-exp.tab.c: $(srcdir)/c-exp.y Makefile
 # Remove bogus decls for malloc/realloc/free which conflict with everything
 # else.
 ch-exp.tab.o: ch-exp.tab.c
-ch-exp.tab.c: $(srcdir)/ch-exp.y Makefile
+ch-exp.tab.c: $(srcdir)/ch-exp.y $(srcdir)/Makefile.in
 	@echo 'Expect rules never reduced and {shift,reduce}/reduce conflicts.'
 	${YACC} $(srcdir)/ch-exp.y
 	-sed -e '/extern.*malloc/d' \
@@ -706,7 +712,7 @@ ch-exp.tab.c: $(srcdir)/ch-exp.y Makefile
 	     -e '/include.*malloc.h/d' \
 	     -e 's/malloc/xmalloc/g' \
 	     -e 's/realloc/xrealloc/g' \
-	  < y.tab.c > ch-exp.tab.c
+	  < y.tab.c > ././ch-exp.tab.c
 	-rm y.tab.c
 # end-sanitize-chill
 
@@ -715,7 +721,7 @@ ch-exp.tab.c: $(srcdir)/ch-exp.y Makefile
 # Remove bogus decls for malloc/realloc/free which conflict with everything
 # else.
 m2-exp.tab.o: m2-exp.tab.c
-m2-exp.tab.c: $(srcdir)/m2-exp.y Makefile
+m2-exp.tab.c: $(srcdir)/m2-exp.y $(srcdir)/Makefile.in
 	${YACC} $(srcdir)/m2-exp.y
 	-sed -e '/extern.*malloc/d' \
 	     -e '/extern.*realloc/d' \
@@ -723,7 +729,7 @@ m2-exp.tab.c: $(srcdir)/m2-exp.y Makefile
 	     -e '/include.*malloc.h/d' \
 	     -e 's/malloc/xmalloc/g' \
 	     -e 's/realloc/xrealloc/g' \
-	  < y.tab.c > m2-exp.tab.c
+	  < y.tab.c > ././m2-exp.tab.c
 	-rm y.tab.c
 
 
@@ -749,12 +755,14 @@ dwarfread.o: ${srcdir}/dwarfread.c
 stabsread.o: ${srcdir}/stabsread.c
 	${CC} -c ${INTERNAL_CFLAGS} -I$(BFD_DIR) ${srcdir}/stabsread.c
 
+# Used on RS/6000 native
 xcoffread.o: ${srcdir}/xcoffread.c
 	${CC} -c ${INTERNAL_CFLAGS} -I$(BFD_DIR) ${srcdir}/xcoffread.c
 
 xcoffexec.o: ${srcdir}/xcoffexec.c
 	${CC} -c ${INTERNAL_CFLAGS} -I$(BFD_DIR) ${srcdir}/xcoffexec.c
 
+# Used on HP-PA native
 paread.o: ${srcdir}/paread.c
 	${CC} -c ${INTERNAL_CFLAGS} -I$(BFD_DIR) ${srcdir}/paread.c