X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2FMakefile.in;h=6fc29363367f5b7a7ff8f5f14e4391a6f4409054;hb=73dab896d406ce96df17d78204c84c5a5c477075;hp=6d21c1d8ddadfcdef5ed697f77885cf100d07704;hpb=ed89c3d938c97fa374b29dc6134347e310bc41bc;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 6d21c1d8dd..6fc2936336 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1,4 +1,5 @@
-#Copyright 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
+# Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1995
+# Free Software Foundation, Inc.
 
 # This file is part of GDB.
 
@@ -44,8 +45,6 @@ SHELL = /bin/sh
 INSTALL = `cd $(srcdir)/..;pwd`/install.sh -c
 INSTALL_PROGRAM = $(INSTALL)
 INSTALL_DATA = $(INSTALL)
-INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)'
-INSTALL_XFORM1 = $(INSTALL_XFORM) -b=.1
 
 AR = ar
 AR_FLAGS = qv
@@ -55,19 +54,12 @@ RANLIB = ranlib
 # This can be overridden in the host Makefile fragment file.
 TERMCAP = -ltermcap
 
-# System V: If you compile gdb with a compiler which uses the coff
-# encapsulation feature (this is a function of the compiler used, NOT
-# of the m-?.h file selected by config.gdb), you must make sure that
-# the GNU nm is the one that is used by munch.
-
 # If you are compiling with GCC, make sure that either 1) You have the
 # fixed include files where GCC can reach them, or 2) You use the
 # -traditional flag.  Otherwise the ioctl calls in inflow.c
 # will be incorrectly compiled.  The "fixincludes" script in the gcc
 # distribution will fix your include files up.
-#CC=cc
 #CC=gcc -traditional
-GCC=gcc
 
 # Directory containing source files.  Don't clean up the spacing,
 # this exact string is matched for by the "configure" script.
@@ -91,20 +83,22 @@ CC-LD=$(CC)
 # routines in libiberty.
 INCLUDE_DIR =  $(srcdir)/../include
 INCLUDE_CFLAGS = -I$(INCLUDE_DIR)
-# Where is the "-liberty" library, containing getopt and obstack?
+
+# Where is the "-liberty" library?  Typically in ../libiberty.
 LIBIBERTY = ../libiberty/libiberty.a
 
-# Where is the MMALLOC library?  Typically ../mmalloc.
+# Where is the MMALLOC library?  Typically in ../mmalloc.
 # Note that mmalloc can still be used on systems without mmap().
 # To use your system malloc, comment out the following defines.
-MMALLOC = ../mmalloc/libmmalloc.a
+MMALLOC_DIR = ../mmalloc
+MMALLOC = $(MMALLOC_DIR)/libmmalloc.a
 # To use your system malloc, uncomment MMALLOC_DISABLE.
 #MMALLOC_DISABLE = -DNO_MMALLOC
 # To use mmalloc but disable corruption checking, uncomment MMALLOC_CHECK
 #MMALLOC_CHECK = -DNO_MMALLOC_CHECK
-MMALLOC_CFLAGS = $(MMALLOC_CHECK) $(MMALLOC_DISABLE)
+MMALLOC_CFLAGS = -I$(srcdir)/$(MMALLOC_DIR) $(MMALLOC_CHECK) $(MMALLOC_DISABLE)
 
-# Where are the BFD library?
+# Where is the BFD library?  Typically in ../bfd.
 BFD_DIR = ../bfd
 BFD = $(BFD_DIR)/libbfd.a
 BFD_SRC = $(srcdir)/$(BFD_DIR)
@@ -121,12 +115,24 @@ READLINE_CFLAGS = -I$(READLINE_SRC)
 # in INCLUDE_DIR.
 # Where is the "-lopcodes" library, with (some of) the opcode tables and
 # disassemblers?
-OPCODES = ./../opcodes/libopcodes.a
+OPCODES = ../opcodes/libopcodes.a
 # Where are the other opcode tables which only have header file
 # versions?
 OP_INCLUDE = $(INCLUDE_DIR)/opcode
 OPCODES_CFLAGS = -I$(OP_INCLUDE)
 
+# Where is the TCL library?  Typically in ../tcl.
+TCL_DIR = ../tcl
+TCL = -L$(TCL_DIR) -ltcl
+TCL_SRC = $(srcdir)/$(TCL_DIR)
+TCL_CFLAGS = -I$(TCL_SRC)
+
+# Where is the TK library?  Typically in ../tk.
+TK_DIR = ../tk
+TK = -L$(TK_DIR) -ltk
+TK_SRC = $(srcdir)/$(TK_DIR)
+TK_CFLAGS = -I$(TK_SRC)
+
 # All the includes used for CFLAGS and for lint.
 # -I. for config files.
 # -I$(srcdir) for gdb internal headers and possibly for regex.h also.
@@ -146,14 +152,24 @@ GLOBAL_CFLAGS = $(MT_CFLAGS) $(MH_CFLAGS)
 # when running make.  I.E.  "make CFLAGS=-Wmissing-prototypes".
 CFLAGS = -g
 
-# Need to pass this to testsuite for "make check"
-CXXFLAGS = -g
+# Need to pass this to testsuite for "make check".  Probably should be
+# consistent with top-level Makefile.in and gdb/testsuite/Makefile.in
+# so "make check" has the same result no matter where it is run.
+CXXFLAGS = -g -O
 
 # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
 INTERNAL_CFLAGS = $(CFLAGS) $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) \
 	$(GDB_CFLAGS) $(OPCODES_CFLAGS) $(READLINE_CFLAGS) \
 	$(BFD_CFLAGS) $(MMALLOC_CFLAGS) $(INCLUDE_CFLAGS)
 
+# LDFLAGS is specifically reserved for setting from the command line
+# when running make.
+
+# Profiling options need to go here to work.
+# I think it's perfectly reasonable for a user to set -pg in CFLAGS
+# and have it work; that's why CFLAGS is here.
+INTERNAL_LDFLAGS = $(CFLAGS) $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) $(LDFLAGS)
+
 # We are using our own version of REGEX now to be consistent across
 # machines.
 REGEX = regex.o
@@ -168,22 +184,26 @@ REGEX1 = regex.o
 # If you have the Cygnus libraries installed,
 # you can use 'CLIBS=$(INSTALLED_LIBS)' 'CDEPS='
 INSTALLED_LIBS=-lbfd -lreadline $(TERMCAP) -lopcodes -lmmalloc \
-	-liberty $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS)
-CLIBS = $(BFD) $(READLINE) $(OPCODES) $(MMALLOC) \
-	$(LIBIBERTY) $(TERMCAP) $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS)
-CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) \
-	$(BFD) $(READLINE) $(OPCODES) $(MMALLOC) $(LIBIBERTY)
+	-liberty $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) $(ENABLE_CLIBS)
+CLIBS = $(BFD) $(READLINE) $(OPCODES) $(MMALLOC) $(LIBIBERTY) \
+	$(ENABLE_CLIBS) $(TERMCAP) $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) \
+	$(LIBIBERTY)
+CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(BFD) $(READLINE) $(OPCODES) \
+	$(MMALLOC) $(LIBIBERTY)
 
 ADD_FILES = $(REGEX) $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES)
 ADD_DEPS = $(REGEX1) $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES)
 
-VERSION = 4.10.3
+VERSION = 4.13.2
 DIST=gdb
 
 LINT=/usr/5bin/lint
 LINTFLAGS= $(BFD_CFLAGS)
 
-RUNTEST=runtest
+RUNTEST = `if [ -f $${srcdir}/../dejagnu/runtest ] ; then \
+		echo $${srcdir}/../dejagnu/runtest ; else echo runtest; \
+	   fi`
+
 RUNTESTFLAGS=
 
 # This is ser-unix.o for any system which supports a v7/BSD/SYSV/POSIX
@@ -198,6 +218,8 @@ SER_HARDWIRE=ser-unix.o
 # but not all (e.g. 960)
 REMOTE_O = remote.o dcache.o remote-utils.o
 
+ANNOTATE_OBS = annotate.o
+
 # Host and target-dependent makefile fragments come in here.
 ####
 # End of host and target-dependent makefile fragments
@@ -227,8 +249,12 @@ FLAGS_TO_PASS = \
 # Flags that we pass when building the testsuite.
 
 CC_FOR_TARGET = ` \
-  if [ -f $${rootme}/../gcc/Makefile ] ; then \
-    echo $${rootme}/../gcc/xgcc -B$${rootme}/../gcc/; \
+  if [ -f $${rootme}/../gcc/xgcc ] ; then \
+    if [ -f $${rootme}/../newlib/Makefile ] ; then \
+      echo $${rootme}/../gcc/xgcc -B$${rootme}/../gcc/ -idirafter $${rootme}/newlib/targ-include -idirafter $${rootsrc}/../newlib/libc/include -nostdinc -L$${rootme}/../newlib -B$${rootme}/../newlib/; \
+    else \
+      echo $${rootme}/../gcc/xgcc -B$${rootme}/../gcc/; \
+    fi; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
       echo $(CC); \
@@ -238,10 +264,13 @@ CC_FOR_TARGET = ` \
   fi`
 
 CXX = gcc
-
 CXX_FOR_TARGET = ` \
   if [ -f $${rootme}/../gcc/Makefile ] ; then \
-    echo $${rootme}/../gcc/xgcc -B$${rootme}/../gcc/; \
+    if [ -f $${rootme}/../newlib/Makefile ] ; then \
+      echo $${rootme}/../gcc/xgcc -B$${rootme}/../gcc/ -idirafter $${rootme}/newlib/targ-include -idirafter $${rootsrc}/../newlib/libc/include -nostdinc -L$${rootme}/../newlib -B$${rootme}/../newlib/; \
+    else \
+      echo $${rootme}/../gcc/xgcc -B$${rootme}/../gcc/; \
+    fi; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
       echo $(CXX); \
@@ -254,7 +283,7 @@ CHILLFLAGS = $(CFLAGS)
 CHILL = gcc
 CHILL_FOR_TARGET = ` \
   if [ -f $${rootme}/../gcc/Makefile ] ; then \
-    echo $${rootme}/../gcc/xgcc -B$${rootme}/../gcc/ -L$${rootme}/../chillrt/; \
+    echo $${rootme}/../gcc/xgcc -B$${rootme}/../gcc/ -L$${rootme}/../gcc/ch/runtime/; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
       echo $(CC); \
@@ -262,7 +291,13 @@ CHILL_FOR_TARGET = ` \
       t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
     fi; \
   fi`
-CHILL_LIB = -lchill
+CHILL_LIB = ` \
+  if [ -f $${rootme}/../gcc/ch/runtime/libchill.a ] ; then \
+    echo $${rootme}/../gcc/ch/runtime/chillrt0.o \
+      $${rootme}/../gcc/ch/runtime/libchill.a; \
+  else \
+      echo -lchill; \
+  fi`
 
 # The use of $$(x_FOR_TARGET) reduces the command line length by not
 # duplicating the lengthy definition.
@@ -270,6 +305,7 @@ TARGET_FLAGS_TO_PASS = \
 	"prefix=$(prefix)" \
 	"exec_prefix=$(exec_prefix)" \
 	"against=$(against)" \
+	"BISON=$(BISON)" \
 	'CC=$$(CC_FOR_TARGET)' \
 	"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
 	"CFLAGS=$(CFLAGS)" \
@@ -280,13 +316,12 @@ TARGET_FLAGS_TO_PASS = \
 	'CXX=$$(CXX_FOR_TARGET)' \
 	"CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
 	"CXXFLAGS=$(CXXFLAGS)" \
-	"MAKEINFO=$(MAKEINFO)" \
 	"INSTALL=$(INSTALL)" \
 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
 	"INSTALL_DATA=$(INSTALL_DATA)" \
+	"MAKEINFO=$(MAKEINFO)" \
 	"RUNTEST=$(RUNTEST)" \
-	"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
-	"BISON=$(BISON)"
+	"RUNTESTFLAGS=$(RUNTESTFLAGS)"
 
 # All source files that go into linking GDB.
 # Links made at configuration time should not be specified here, since
@@ -295,40 +330,30 @@ TARGET_FLAGS_TO_PASS = \
 SFILES = blockframe.c breakpoint.c buildsym.c c-exp.y c-lang.c \
 	c-typeprint.c c-valprint.c ch-exp.y ch-lang.c ch-typeprint.c \
 	ch-valprint.c coffread.c command.c complaints.c core.c cp-valprint.c \
-	dbxread.c demangle.c dwarfread.c elfread.c environ.c eval.c expprint.c \
-	findvar.c gdbtypes.c infcmd.c inflow.c infrun.c language.c putenv.c \
+	dbxread.c demangle.c dwarfread.c \
+	elfread.c environ.c eval.c expprint.c \
+	f-exp.y f-lang.c f-typeprint.c f-valprint.c findvar.c \
+	gdbtypes.c infcmd.c inflow.c infrun.c language.c \
 	m2-exp.y m2-lang.c m2-typeprint.c m2-valprint.c main.c maint.c \
 	mem-break.c minsyms.c mipsread.c nlmread.c objfiles.c parse.c \
 	printcmd.c remote.c source.c stabsread.c stack.c symfile.c symmisc.c \
-	symtab.c target.c thread.c typeprint.c utils.c valarith.c valops.c \
-	valprint.c values.c serial.c ser-unix.c
-
-# Files that are not source code, but need to go into
-# gdb-$(VERSION).tar.Z.
-
-NONSRC = Makefile.in munch configure.in ChangeLog ChangeLog-9091 \
-	ChangeLog-92 ChangeLog-3.x gdb.1 refcard.ps README TODO TAGS NEWS \
-	Projects .gdbinit COPYING $(YYFILES) copying.c copying.awk \
-	saber.suppress standalone.c stuff.c kdb-start.c gcc.patch \
-	nindy-share/Makefile nindy-share/VERSION nindy-share/README \
-	vx-share/README 29k-share/README config/convex/Convex.notes \
-	i386-nlmstub.c
+	symtab.c target.c thread.c top.c \
+	typeprint.c utils.c valarith.c valops.c \
+	valprint.c values.c serial.c ser-unix.c mdebugread.c os9kread.c
 
 # All source files that lint should look at
 LINTFILES = $(SFILES) $(YYFILES) init.c
 
-# Any additional files specified on these lines should also be added to
-# the NONSRC definition, so they go in the tar files.
-SFILES_STAND = $(SFILES) standalone.c
-SFILES_KGDB  = $(SFILES) stuff.c kdb-start.c
-
 # "system" headers.  Using these in dependencies is a rather personal
-# choice.  By default, we do not depend on these files.
-#getopt_h =	$(INCLUDE_DIR)/getopt.h
-#ieee-float_h =	$(INCLUDE_DIR)/ieee-float.h
-#bfd_h =		$(BFD_DIR)/bfd.h
-#wait_h =	$(INCLUDE_DIR)/wait.h
-#dis-asm_h =	$(INCLUDE_DIR)/dis-asm.h 
+# choice. (-rich, summer 1993)
+# (Why would we not want to depend on them?  If one of these changes in a 
+# non-binary-compatible way, it is a real pain to remake the right stuff
+# without these dependencies -kingdon, 13 Mar 1994)
+getopt_h =	$(INCLUDE_DIR)/getopt.h
+floatformat_h =	$(INCLUDE_DIR)/floatformat.h
+bfd_h =		$(BFD_DIR)/bfd.h
+wait_h =	$(INCLUDE_DIR)/wait.h
+dis-asm_h =	$(INCLUDE_DIR)/dis-asm.h 
 
 dcache_h = dcache.h
 remote_utils_h = $(dcache_h) serial.h target.h remote-utils.h remote-sim.h
@@ -340,14 +365,12 @@ readline_headers = \
 	$(READLINE_SRC)/readline.h
 
 udiheaders = \
-	29k-share/udi/udiproc.h \
-	29k-share/udi/udiphcfg.h \
-	29k-share/udi/udiphunix.h \
-	29k-share/udi/udiptcfg.h \
-	29k-share/udi/udipt29k.h \
-	29k-share/udi/udisoc.h
-
-dcache_h =	dcache.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)/29k-share/udi/udisoc.h
 
 gdbcore_h =	gdbcore.h $(bfd_h)
 
@@ -366,25 +389,31 @@ defs_h =	defs.h xm.h tm.h nm.h config.status
 
 inferior_h =	inferior.h $(breakpoint_h)
 
-# Header files that are not named in config/*/* Makefile fragments go
-# into HFILES.
+# Header files that need to have srcdir added.  Note that in the cases
+# where we use a macro like $(gdbcmd_h), things are carefully arranged
+# so that each .h file is listed exactly once (M-x tags-search works
+# wrong if TAGS has files twice).  Because this is tricky to get
+# right, it is probably easiest just to list .h files here directly.
 
-HFILES = buildsym.h call-cmds.h coff-solib.h defs.h environ.h $(gdbcmd_h) \
-	$(gdbcore_h) gdb-stabs.h $(inferior_h) language.h minimon.h monitor.h \
+HFILES_NO_SRCDIR = buildsym.h call-cmds.h coff-solib.h defs.h dst.h environ.h \
+	$(gdbcmd_h) gdbcore.h \
+	gdb-stabs.h $(inferior_h) language.h minimon.h monitor.h \
 	objfiles.h parser-defs.h partial-stab.h serial.h signals.h solib.h \
 	symfile.h stabsread.h target.h terminal.h typeprint.h xcoffsolib.h \
-	c-lang.h ch-lang.h m2-lang.h complaints.h ns32k-opcode.h valprint.h \
-	config/m68k/tm-m68k.h config/pa/tm-hppa.h config/i960/tm-i960.h \
-	config/sparc/tm-sparc.h config/tm-sunos.h config/tm-sysv4.h \
-	config/m68k/xm-m68k.h config/sparc/xm-sparc.h config/xm-sysv4.h \
-	config/vax/xm-vax.h config/nm-m3.h config/nm-trash.h $(udiheaders) \
+	c-lang.h ch-lang.h f-lang.h m2-lang.h \
+	complaints.h valprint.h \
 	29k-share/udi/udiids.h 29k-share/udi_soc nindy-share/b.out.h \
 	nindy-share/block_io.h nindy-share/coff.h \
 	nindy-share/env.h nindy-share/stop.h \
 	vx-share/dbgRpcLib.h vx-share/ptrace.h vx-share/vxTypes.h \
 	vx-share/vxWorks.h vx-share/wait.h vx-share/xdr_ld.h \
 	vx-share/xdr_ptrace.h vx-share/xdr_rdb.h thread.h \
-	$(remote_utils_h)
+	dcache.h remote-utils.h remote-sim.h top.h somsolib.h
+
+# Header files that already have srcdir in them, or which are in objdir.
+
+HFILES_WITH_SRCDIR = $(udiheaders) ../bfd/bfd.h
+
 
 # GDB "info" files, which should be included in their entirety
 INFOFILES = gdb.info*
@@ -403,43 +432,49 @@ TARDIRS = doc gdbserver sparclite
 # variables analogous to SER_HARDWIRE which get defaulted in this
 # Makefile.in
 
-DEPFILES = $(TDEPFILES) $(XDEPFILES) $(SER_HARDWIRE) $(NATDEPFILES) $(REMOTE_O)
+DEPFILES = $(TDEPFILES) $(XDEPFILES) $(SER_HARDWIRE) $(NATDEPFILES) $(REMOTE_O) \
+	   $(ENABLE_DEPFILES)
 
 SOURCES = $(SFILES) $(ALLDEPFILES) $(YYFILES)
 # Don't include YYFILES (*.tab.c) because we already include *.y in SFILES,
 # and it's more useful to see it in the .y file.
-TAGFILES = $(SFILES) $(HFILES) $(ALLDEPFILES) $(ALLPARAM) $(POSSLIBS) 
-
-TARFILES = $(SFILES) $(HFILES) $(NONSRC) $(ALLDEPFILES) $(ALLCONFIG) \
-	$(ALLPARAM) $(INFOFILES) $(POSSLIBS) $(REMOTE_EXAMPLES)
-
+TAGFILES_NO_SRCDIR = $(SFILES) $(HFILES_NO_SRCDIR) $(ALLDEPFILES) \
+	$(POSSLIBS)
+TAGFILES_WITH_SRCDIR = $(HFILES_WITH_SRCDIR)
 
-OBS =	version.o main.o blockframe.o breakpoint.o findvar.o stack.o thread.o \
+COMMON_OBS = version.o blockframe.o breakpoint.o findvar.o stack.o thread.o \
 	source.o values.o eval.o valops.o valarith.o valprint.o printcmd.o \
 	symtab.o symfile.o symmisc.o infcmd.o infrun.o command.o \
-	utils.o expprint.o environ.o gdbtypes.o copying.o $(DEPFILES) \
-	mem-break.o target.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 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 nlmread.o \
-	serial.o
+	expprint.o environ.o gdbtypes.o copying.o $(DEPFILES) \
+	mem-break.o target.o parse.o language.o $(YYOBJ) buildsym.o \
+	exec.o objfiles.o minsyms.o maint.o demangle.o \
+	dbxread.o coffread.o elfread.o \
+	dwarfread.o mipsread.o stabsread.o core.o \
+	c-lang.o ch-lang.o f-lang.o m2-lang.o \
+	complaints.o typeprint.o \
+	c-typeprint.o ch-typeprint.o f-typeprint.o m2-typeprint.o \
+	c-valprint.o cp-valprint.o ch-valprint.o f-valprint.o m2-valprint.o \
+	nlmread.o serial.o mdebugread.o os9kread.o top.o utils.o
 
-RAPP_OBS = rgdb.o rudp.o rserial.o serial.o udp.o $(XDEPFILES)
+OBS = $(COMMON_OBS) $(ANNOTATE_OBS) main.o
+
+LIBGDB_OBS = 
 
 TSOBS = inflow.o
 
 NTSOBS = standalone.o
 
-TSSTART = /lib/crt0.o
-
 NTSSTART = kdb-start.o
 
-SUBDIRS = doc testsuite
+SUBDIRS = doc testsuite nlm
 
 # For now, shortcut the "configure GDB for fewer languages" stuff.
-YYFILES = c-exp.tab.c m2-exp.tab.c ch-exp.tab.c
-YYOBJ = c-exp.tab.o m2-exp.tab.o ch-exp.tab.o
+YYFILES = c-exp.tab.c f-exp.tab.c m2-exp.tab.c ch-exp.tab.c
+YYOBJ = c-exp.tab.o f-exp.tab.o m2-exp.tab.o ch-exp.tab.o
+
+# Things which need to be built when making a distribution.
+
+DISTSTUFF = $(YYFILES)
 
 # Prevent Sun make from putting in the machine type.  Setting
 # TARGET_ARCH to nothing works for SunOS 3, 4.0, but not for 4.1.
@@ -450,8 +485,17 @@ all: gdb
 	@$(MAKE) $(FLAGS_TO_PASS) DO=all "DODIRS=`echo $(SUBDIRS) | sed 's/testsuite//'`" subdir_do
 
 installcheck:
+
+# The check target can not use subdir_do, because subdir_do does not
+# use TARGET_FLAGS_TO_PASS.
 check: force
-	@rootme=`pwd`; export rootme; $(MAKE) $(TARGET_FLAGS_TO_PASS) DO=check DODIRS=testsuite subdir_do
+	@if [ -f testsuite/Makefile ]; then \
+	  rootme=`pwd`; export rootme; \
+	  rootsrc=`cd $(srcdir); pwd`; export rootsrc; \
+	  cd testsuite; \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS) check; \
+	else true; fi
+
 info dvi install-info clean-info: force
 	@$(MAKE) $(FLAGS_TO_PASS) DO=$@ "DODIRS=$(SUBDIRS)" subdir_do
 
@@ -466,27 +510,102 @@ gdb.z:gdb.1
 # time it takes for make to check that all is up to date.
 # install-only is intended to address that need.
 install: all install-only
-install-only: 
-	$(INSTALL_XFORM) gdb $(bindir)/gdb
-	$(INSTALL_XFORM1) $(srcdir)/gdb.1 $(man1dir)/gdb.1
+install-only:
+	transformed_name=`t='$(program_transform_name)'; \
+			  echo gdb | sed -e "s/brokensed/brokensed/" $$t` ; \
+		if test "x$$transformed_name" = x; then \
+		  transformed_name=gdb ; \
+		else \
+		  true ; \
+		fi ; \
+		$(INSTALL_PROGRAM) gdb $(bindir)/$$transformed_name ; \
+		$(INSTALL_DATA) $(srcdir)/gdb.1 $(man1dir)/$$transformed_name.1
+	# start-sanitize-gdbtk
+	if [ x"$(ENABLE_GDBTK)" != x ] ; then \
+		  $(INSTALL_DATA) $(srcdir)/gdbtk.tcl $(libdir)/gdbtk.tcl ; \
+		else \
+		  true ; \
+		fi
+	# end-sanitize-gdbtk
 	@$(MAKE) DO=install "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do 
 
 uninstall: force
-	rm -f $(bindir)/gdb $(man1dir)/gdb.1
+	transformed_name=`t='$(program_transform_name)'; \
+			  echo gdb | sed -e "s/brokensed/brokensed/" $$t` ; \
+		if test "x$$transformed_name" = x; then \
+		  transformed_name=gdb ; \
+		else \
+		  true ; \
+		fi ; \
+		rm -f $(bindir)/$$transformed_name $(man1dir)/$$transformed_name.1
 	@$(MAKE) DO=uninstall "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do 
 
-init.c: munch $(OBS) $(TSOBS)
-	$(srcdir)/munch $(MUNCH_DEFINE) $(OBS) $(TSOBS) > init.c-new
-	mv init.c-new init.c
+# We do this by grepping through sources.  If that turns out to be too slow,
+# maybe we could just require every .o file to have an initialization routine
+# of a given name (remote-udi.o -> _initialize_remote_udi, etc.).
+#
+# Formatting conventions:  The name of the _initialize_* routines must start
+# in column zero, and must not be inside #if.
+#
+# Note that the set of files with init functions might change, or the names
+# of the functions might change, so this files needs to depend on all the
+# object files that will be linked into gdb.
+
+init.c: $(OBS) $(TSOBS)
+	@echo Making init.c
+	@rm -f init.c-tmp
+	@echo '/* Do not modify this file.  */' >init.c-tmp
+	@echo '/* It is created automatically by the Makefile.  */'>>init.c-tmp
+	@echo 'void initialize_all_files () {' >>init.c-tmp
+	@for i in $(OBS) $(TSOBS); do \
+	  filename=`echo $$i | sed \
+	    -e '/^Onindy.o/d' \
+	    -e '/^nindy.o/d' \
+	    -e '/ttyflush.o/d' \
+	    -e '/xdr_ld.o/d' \
+	    -e '/xdr_ptrace.o/d' \
+	    -e '/xdr_rdb.o/d' \
+	    -e '/udr.o/d' \
+	    -e '/udip2soc.o/d' \
+	    -e '/udi2go32.o/d' \
+	    -e '/version.o/d' \
+	    -e '/[a-z0-9A-Z_]*-exp.tab.o/d' \
+	    -e 's/\.o/.c/'` ; \
+	  case $$filename in \
+	    "") ;; \
+	    *) sed <$(srcdir)/$$filename >>init.c-tmp -n \
+	    -e '/^_initialize_[a-z_0-9A-Z]* *(/s/^\([a-z_0-9A-Z]*\).*/  {extern void \1 (); \1 ();}/p' ; ;; \
+	  esac ; \
+	done
+	@echo '}' >>init.c-tmp
+	@mv init.c-tmp init.c
 
 .PRECIOUS: init.c
 
 # Removing the old gdb first works better if it is running, at least on SunOS.
 gdb: $(OBS) $(TSOBS) $(ADD_DEPS) $(CDEPS) init.o
 	rm -f gdb
-	$(CC-LD) $(GLOBAL_CFLAGS) $(LDFLAGS) -o gdb \
+	$(CC-LD) $(INTERNAL_LDFLAGS) -o gdb \
 	  init.o $(OBS) $(TSOBS) $(ADD_FILES) $(CLIBS) $(LOADLIBES)
 
+nlm:	force
+	rootme=`pwd`; export rootme; $(MAKE) $(TARGET_FLAGS_TO_PASS) DO=all DODIRS=nlm subdir_do
+
+libgdb:	libgdb-files $(LIBGDB_OBS)
+
+# libproc is not listed here because all-libproc is a dependency of all-gui,
+# not all-gdb, and thus might be built after us.
+LIBGDBDEPS=$(COMMON_OBS) $(LIBGDB_OBS) $(TSOBS) $(ADD_DEPS) $(CDEPS) init.o
+# libproc needs to be before libiberty for alloca.
+LIBGDBFILES=$(COMMON_OBS) $(LIBGDB_OBS) $(TSOBS) ../libproc/libproc.a \
+  $(ADD_DEPS) $(CDEPS) init.o
+
+libgdb-files: $(LIBGDBDEPS) Makefile.in
+	-rm -f libgdb-files
+	for i in $(LIBGDBFILES); do\
+		echo $$i >> libgdb-files;\
+	done
+
 saber_gdb: $(SFILES) $(DEPFILES) copying.c version.c
 	#setopt load_flags $(CFLAGS) $(BFD_CFLAGS) -DHOST_SYS=SUN4_SYS
 	#load ./init.c $(SFILES)
@@ -505,6 +624,12 @@ saber_gdb: $(SFILES) $(DEPFILES) copying.c version.c
 	echo "Load .c corresponding to:" $(DEPFILES)
 
 
+# A Mach 3.0 program to force gdb back to command level
+
+stop-gdb: stop-gdb.o
+	${CC-LD} $(GLOBAL_CFLAGS) $(LDFLAGS) -o stop-gdb \
+	stop-gdb.o $(CLIBS) $(LOADLIBES)
+
 # This is useful when debugging GDB, because some Unix's don't let you run GDB
 # on itself without copying the executable.  So "make gdb1" will make
 # gdb and put a copy in gdb1, and you can run it with "gdb gdb1".
@@ -514,14 +639,6 @@ gdb1: gdb
 	rm -f gdb1
 	cp gdb gdb1
 
-# This is a remote stub which runs under unix and starts up an
-# inferior process.  This is at least useful for debugging GDB's
-# remote support.
-rapp: $(RAPP_OBS)
-	rm -f rapp_init.c
-	$(srcdir)/munch $(MUNCH_DEFINE) $(RAPP_OBS) > rapp_init.c
-	$(CC-LD) $(LDFLAGS) -o $@ rapp_init.c $(RAPP_OBS)
-
 config.status:
 	@echo "You must configure gdb.  Look at the README file for details."
 	@false
@@ -557,98 +674,35 @@ xm-vaxult.h: xm-vax.h
 xm-vaxbsd.h: xm-vax.h
 
 kdb:	$(NTSSTART) $(OBS) $(NTSOBS) $(ADD_DEPS) $(CDEPS)
-	rm -f init.c
-	$(srcdir)/munch $(MUNCH_DEFINE) $(OBS) $(NTSOBS) > init.c
-	$(CC) $(LDFLAGS) -c init.c $(CLIBS) 
 	ld -o kdb $(NTSSTART) $(OBS) $(NTSOBS) init.o $(ADD_FILES) \
 	  -lc $(CLIBS)
 
 # Put the proper machine-specific files first, so M-. on a machine
-# specific routine gets the one for the correct machine.
-TAGS:	
-	etags `find $(srcdir)/config \( -name $(TM_FILE) \
-		-o -name $(XM_FILE) \
-		-o -name $(NAT_FILE) \) -print` \
-	`(for i in $(DEPFILES) $(TAGFILES); do \
+# specific routine gets the one for the correct machine.  (FIXME: those
+# files go in twice; we should be removing them from the main list).
+
+# TAGS depends on all the files that go into it so you can rebuild TAGS
+# with `make TAGS' and not have to say `rm TAGS' first.
+
+TAGS: $(TAGFILES_NO_SRCDIR) $(TAGFILES_WITH_SRCDIR)
+	@echo Making TAGS
+	@etags $(srcdir)/$(TM_FILE) \
+	  $(srcdir)/$(XM_FILE) \
+	  $(srcdir)/$(NAT_FILE) \
+	`(for i in $(DEPFILES) $(TAGFILES_NO_SRCDIR); do \
 		echo $(srcdir)/$$i ; \
+	done ; for i in $(TAGFILES_WITH_SRCDIR); do \
+		echo $$i ; \
 	done) | sed -e 's/\.o$$/\.c/'` \
+	`find $(srcdir)/config -name '*.h' -print`
 
 tags: TAGS
 
-# Making distributions of GDB and friends.
-
-# Make a tar file containing the GDB directory of the distribution.
-gdb.tar.Z: force_update
-	$(MAKE) $(MFLAGS) -f Makefile.in setup-to-dist
-	$(MAKE) $(MFLAGS) -f Makefile.in gdb-$(VERSION).tar.Z
-
-# Make a directory `proto-gdb.dir' that contains an image of the GDB
-# directory of the distribution, built up with symlinks.  Note that this
-# make target is not directly referenced by any other rules in this makefile,
-# it is referenced by the makefile in the parent directory.
-make-proto-gdb.dir: force_update 
-	$(MAKE) $(MFLAGS) -f Makefile.in setup-to-dist
-	$(MAKE) $(MFLAGS) -f Makefile make-proto-gdb-1
-
-# Set up the GDB source directory for distribution, by building all files that
-# are products of other files.
-setup-to-dist: force_update
-	../configure none
-	(cd doc; $(MAKE) $(MFLAGS) GDBvn.texi)
-	$(MAKE) $(MFLAGS) gdb.info
-	$(MAKE) $(MFLAGS) refcard.ps
-
-# Build a tar file from a proto-gdb.dir.
-gdb-$(VERSION).tar.Z: force_update
-	rm -f gdb.tar gdb-$(VERSION).tar.Z
-	$(MAKE) $(MFLAGS) -f Makefile make-proto-gdb-1
-	ln -s proto-gdb.dir $(DIST)
-	tar chf - $(DIST) | compress >gdb-$(VERSION).tar.Z
-	rm -rf $(DIST) proto-gdb.dir
-
-# Build a proto-gdb.dir after GDB has been set up for distribution.
-# This stuff must be run in `Makefile', not `Makefile.in`; we use the makefile
-# built in the setup-to-dist process, since it defines things like ALLCONFIG
-# and ALLDEPFILES, that we need.
-make-proto-gdb-1: $(TARFILES) $(TARDIRS) gdb.info
-	rm -rf proto-gdb.dir
-	mkdir proto-gdb.dir
-	rootme=`pwd`/ ; export rootme ; \
-	  for i in `echo $(TARDIRS)`; do \
-	    (cd proto-gdb.dir ; \
-	    mkdir -p $$i; \
-	    cd $$i; \
-	    ln -s $${rootme}/$$i/* .; \
-	    rm -rf SCCS CVS CVS.adm RCS config.status; \
-	    if test -f Makefile.in; then rm -f Makefile; else true; fi;); \
-	  done ; \
-	  for i in `echo $(TARFILES)`; do \
-	    (cd proto-gdb.dir ; \
-	    dir=`dirname $$i`; \
-	    if test -d $$dir; then true; else mkdir -p $$dir; fi; \
-	    ln -s $${rootme}/$$i $$i;); \
-	  done
-	chmod og=u `find . -print`
-
-# Build a proto-testsuite.dir.
-make-proto-testsuite.dir: force_update
-	rm -rf proto-testsuite.dir
-	mkdir proto-testsuite.dir
-	rootme=`pwd`/ ; export rootme ; \
-	  for i in `find testsuite -type f -print`; do \
-	    (cd proto-testsuite.dir ; \
-	    dir=`dirname $$i`; \
-	    if test -d $$dir; then true; else mkdir -p $$dir; fi; \
-	    ln -s $${rootme}/$$i $$i;); \
-	  done
-	find proto-testsuite.dir -name Makefile -exec rm {} \;
-	find proto-testsuite.dir -name config.status -exec rm {} \;
-
-clean:
+clean mostlyclean:
 	@$(MAKE) $(FLAGS_TO_PASS) DO=clean "DODIRS=$(SUBDIRS)" subdir_do 
-	rm -f *.o $(ADD_FILES) *~
+	rm -f *.o $(ADD_FILES) *~ init.c-tmp
 	rm -f init.c version.c
-	rm -f gdb core make.log
+	rm -f gdb core make.log libgdb-files
 	rm -f gdb[0-9]
 
 # This used to depend on c-exp.tab.c m2-exp.tab.c ch-exp.tab.c TAGS
@@ -663,11 +717,17 @@ distclean: clean
 
 realclean: clean
 	@$(MAKE) $(FLAGS_TO_PASS) DO=realclean "DODIRS=$(SUBDIRS)" subdir_do
-	rm -f c-exp.tab.c m2-exp.tab.c ch-exp.tab.c TAGS
+	rm -f c-exp.tab.c f-exp.tab.c m2-exp.tab.c ch-exp.tab.c
+	rm -f TAGS $(INFOFILES)
 	rm -f nm.h tm.h xm.h config.status
 	rm -f y.output yacc.acts yacc.tmp
 	rm -f Makefile
 
+diststuff: $(DISTSTUFF)
+	(cd doc; $(MAKE) $(MFLAGS) GDBvn.texi)
+	$(MAKE) $(MFLAGS) gdb.info
+	$(MAKE) $(MFLAGS) refcard.ps
+
 subdir_do: force
 	@for i in $(DODIRS); do \
 		if [ -f ./$$i/Makefile ] ; then \
@@ -709,8 +769,8 @@ copying.c: COPYING copying.awk
 
 version.c: Makefile
 	echo 'char *version = "$(VERSION)";' >version.c
-	echo 'char *host_canonical = "$(host_canonical)";' >> version.c
-	echo 'char *target_canonical = "$(target_canonical)";' >> version.c
+	echo 'char *host_name = "$(host_alias)";' >> version.c
+	echo 'char *target_name = "$(target_alias)";' >> version.c
 
 # c-exp.tab.c is generated in objdir from c-exp.y if it doesn't exist
 # in srcdir, then compiled in objdir to c-exp.tab.o.
@@ -719,9 +779,10 @@ version.c: Makefile
 # would sometimes re-write it into $(srcdir)/c-exp.tab.c.
 
 # Remove bogus decls for malloc/realloc/free which conflict with everything
-# else.
+# else.  Strictly speaking c-exp.tab.c should therefore depend on
+# Makefile.in, but that was a pretty big annoyance.
 c-exp.tab.o: c-exp.tab.c
-c-exp.tab.c: c-exp.y Makefile.in
+c-exp.tab.c: c-exp.y
 	$(YACC) $(YFLAGS) $(srcdir)/c-exp.y
 	-sed -e '/extern.*malloc/d' \
 	     -e '/extern.*realloc/d' \
@@ -733,15 +794,28 @@ c-exp.tab.c: c-exp.y Makefile.in
 	-rm y.tab.c
 	mv c-exp.new ./c-exp.tab.c
 
+f-exp.tab.o: f-exp.tab.c
+f-exp.tab.c: f-exp.y c-exp.tab.c
+	$(YACC) $(YFLAGS) $(srcdir)/f-exp.y
+	-sed -e '/extern.*malloc/d' \
+	     -e '/extern.*realloc/d' \
+	     -e '/extern.*free/d' \
+	     -e '/include.*malloc.h/d' \
+	     -e 's/malloc/xmalloc/g' \
+	     -e 's/realloc/xrealloc/g' \
+	  < y.tab.c > f-exp.new
+	-rm y.tab.c
+	mv f-exp.new ./f-exp.tab.c
+
 # ch-exp.tab.c is generated in objdir from ch-exp.y if it doesn't exist
 # in srcdir, then compiled in objdir to ch-exp.tab.o.
 # Remove bogus decls for malloc/realloc/free which conflict with everything
 # else.
 ch-exp.tab.o: ch-exp.tab.c
-# the dependency here on c-exp.tab.c is artificial.  Without this
+# the dependency here on f-exp.tab.c is artificial.  Without this
 # dependency, a parallel make will attempt to build both at the same
 # time and the second yacc will pollute the first y.tab.c file.
-ch-exp.tab.c: ch-exp.y Makefile.in c-exp.tab.c
+ch-exp.tab.c: ch-exp.y f-exp.tab.c
 	$(YACC) $(YFLAGS) $(srcdir)/ch-exp.y
 	-sed -e '/extern.*malloc/d' \
 	     -e '/extern.*realloc/d' \
@@ -761,7 +835,7 @@ m2-exp.tab.o: m2-exp.tab.c
 # the dependency here on ch-exp.tab.c is artificial.  Without this
 # dependency, a parallel make will attempt to build both at the same
 # time and the second yacc will pollute the first y.tab.c file.
-m2-exp.tab.c: m2-exp.y Makefile.in ch-exp.tab.c
+m2-exp.tab.c: m2-exp.y ch-exp.tab.c
 	$(YACC) $(YFLAGS) $(srcdir)/m2-exp.y
 	-sed -e '/extern.*malloc/d' \
 	     -e '/extern.*realloc/d' \
@@ -774,7 +848,7 @@ m2-exp.tab.c: m2-exp.y Makefile.in ch-exp.tab.c
 	mv m2-exp.new ./m2-exp.tab.c
 
 # These files are updated atomically, so make never has to remove them
-.PRECIOUS: m2-exp.tab.c ch-exp.tab.c c-exp.tab.c
+.PRECIOUS: m2-exp.tab.c ch-exp.tab.c f-exp.tab.c c-exp.tab.c
 
 lint: $(LINTFILES)
 	$(LINT) $(INCLUDE_CFLAGS) $(LINTFLAGS) $(LINTFILES) \
@@ -801,124 +875,49 @@ MAKEOVERRIDES=
 ## with no dependencies and no actions.
 unexport CHILLFLAGS CHILL_LIB CHILL_FOR_TARGET :
 
-# These are things from config/*/*.m? fragments.  There is no good reason
-# why they are separate from the lists of files above.
-
 ALLDEPFILES = 29k-share/udi/udip2soc.c 29k-share/udi/udr.c \
-	a29k-pinsn.c a29k-tdep.c a68v-nat.c alpha-nat.c alpha-tdep.c \
+	29k-share/udi/udi2go32.c \
+	a29k-tdep.c a68v-nat.c alpha-nat.c alpha-tdep.c \
 	altos-xdep.c arm-convert.s \
-	arm-pinsn.c arm-tdep.c arm-xdep.c coff-solib.c convex-pinsn.c \
+	arm-tdep.c arm-xdep.c coff-solib.c \
 	convex-tdep.c \
-	convex-xdep.c core-svr4.c coredep.c corelow.c dcache.c delta68-nat.c \
-	dpx2-nat.c exec.c fork-child.c \
-	go32-xdep.c gould-pinsn.c gould-xdep.c h8300-tdep.c h8500-tdep.c \
-	hp300ux-nat.c hppa-pinsn.c hppa-tdep.c hppab-nat.c hppah-nat.c \
-	i386-pinsn.c i386-tdep.c i386b-nat.c i386mach-nat.c i386v-nat.c \
-	i386aix-nat.c i386m3-nat.c i386v4-nat.c i386lynx-nat.c i386ly-tdep.c \
+	convex-xdep.c core-sol2.c core-svr4.c coredep.c corelow.c dcache.c \
+	delta68-nat.c dpx2-nat.c dstread.c exec.c fork-child.c \
+	go32-xdep.c gould-tdep.c gould-xdep.c h8300-tdep.c h8500-tdep.c \
+	hp300ux-nat.c hppa-tdep.c hppab-nat.c hppah-nat.c \
+	hpread.c \
+	i386-tdep.c i386b-nat.c i386mach-nat.c i386v-nat.c \
+	i386aix-nat.c i386m3-nat.c i386v4-nat.c i386ly-tdep.c \
 	i387-tdep.c \
-	i960-pinsn.c i960-tdep.c \
-	infptrace.c inftarg.c irix4-nat.c isi-xdep.c m3-nat.c \
-	m68k-pinsn.c m68k-tdep.c \
-	m88k-nat.c m88k-pinsn.c m88k-tdep.c mips-nat.c mips-pinsn.c \
-	mips-tdep.c mipsm3-nat.c news-xdep.c \
+	i960-tdep.c \
+	infptrace.c inftarg.c irix4-nat.c irix5-nat.c isi-xdep.c \
+	lynx-nat.c m3-nat.c \
+	m68k-tdep.c \
+	m88k-nat.c m88k-tdep.c mips-nat.c \
+	mips-tdep.c mipsm3-nat.c mipsv4-nat.c news-xdep.c \
 	nindy-share/Onindy.c nindy-share/nindy.c \
 	nindy-share/ttyflush.c nindy-tdep.c \
-	ns32k-pinsn.c ns32km3-nat.c osfsolib.c \
-	paread.c procfs.c pyr-pinsn.c pyr-tdep.c pyr-xdep.c \
-	remote-adapt.c remote-bug.c remote-eb.c remote-es.c \
+	ns32k-tdep.c ns32km3-nat.c osfsolib.c \
+	somread.c somsolib.c $(HPREAD_SOURCE) \
+	procfs.c pyr-tdep.c pyr-xdep.c \
+	remote-adapt.c remote-bug.c remote-e7000.c remote-eb.c remote-es.c \
 	remote-hms.c remote-mips.c \
-	remote-mm.c remote-mon.c remote-nindy.c remote-sim.c \
+	remote-mm.c remote-nindy.c remote-os9k.c remote-sim.c \
 	remote-st.c remote-utils.c dcache.c \
-	remote-udi.c remote-vx.c remote-z8k.c rs6000-nat.c rs6000-pinsn.c \
-	rs6000-tdep.c ser-go32.c ser-tcp.c sh-tdep.c solib.c sparc-nat.c \
-	sparc-pinsn.c sparc-tdep.c sun3-nat.c sun386-nat.c symm-tdep.c \
-	symm-nat.c tahoe-pinsn.c ultra3-nat.c ultra3-xdep.c umax-xdep.c \
-	vax-pinsn.c \
+	remote-udi.c remote-vx.c remote-vx29k.c remote-z8k.c \
+	rs6000-nat.c rs6000-tdep.c \
+	ser-go32.c ser-tcp.c sh-tdep.c solib.c sparc-nat.c \
+	sparc-tdep.c sparcl-tdep.c sun3-nat.c sun386-nat.c \
+	symm-tdep.c symm-nat.c \
+	tahoe-tdep.c ultra3-nat.c ultra3-xdep.c umax-xdep.c \
+	vax-tdep.c \
 	vx-share/xdr_ld.c vx-share/xdr_ptrace.c vx-share/xdr_rdb.c \
-	xcoffexec.c xcoffread.c xcoffsolib.c z8k-tdep.c
-
-ALLPARAM = config/a29k/nm-ultra3.h config/a29k/tm-a29k.h \
-	config/a29k/tm-ultra3.h config/a29k/xm-ultra3.h \
-	config/alpha/nm-alpha.h config/alpha/tm-alpha.h \
-	config/alpha/xm-alpha.h config/arm/tm-arm.h \
-	config/arm/xm-arm.h config/convex/tm-convex.h \
-	config/convex/xm-convex.h config/gould/tm-np1.h config/gould/tm-pn.h \
-	config/gould/xm-np1.h config/gould/xm-pn.h config/h8300/tm-h8300.h \
-	config/h8500/tm-h8500.h config/i386/nm-i386aix.h \
-	config/i386/nm-i386bsd.h config/i386/nm-i386lynx.h \
-	config/i386/nm-i386mach.h config/i386/nm-i386sco.h \
-	config/i386/nm-i386sco4.h config/i386/nm-i386v.h \
-	config/i386/nm-i386v4.h config/i386/nm-linux.h \
-	config/i386/nm-sun386.h config/i386/nm-symmetry.h \
-	config/i386/tm-i386aix.h config/i386/tm-i386bsd.h \
-	config/i386/tm-i386lynx.h config/i386/tm-i386m3.h \
-	config/i386/tm-i386mk.h config/i386/tm-i386nw.h \
-	config/i386/tm-i386v.h \
-	config/i386/tm-i386v4.h config/i386/tm-linux.h \
-	config/i386/tm-sun386.h \
-	config/i386/tm-symmetry.h config/i386/xm-go32.h \
-	config/i386/xm-i386aix.h config/i386/xm-i386bsd.h \
-	config/i386/xm-i386lynx.h config/i386/xm-i386mach.h \
-	config/i386/xm-i386m3.h config/i386/xm-i386mk.h \
-	config/i386/xm-i386sco.h config/i386/xm-i386v.h \
-	config/i386/xm-i386v32.h config/i386/xm-i386v4.h \
-	config/i386/xm-linux.h config/i386/xm-sun386.h \
-	config/i386/xm-symmetry.h config/i960/tm-nindy960.h \
-	config/i960/tm-vx960.h config/m68k/nm-apollo68b.h \
-	config/m68k/nm-apollo68v.h config/m68k/nm-delta68.h \
-	config/m68k/nm-dpx2.h config/m68k/nm-hp300bsd.h \
-	config/m68k/nm-hp300hpux.h config/m68k/nm-news.h \
-	config/m68k/nm-sun2.h \
-	config/m68k/nm-sun3.h config/m68k/tm-3b1.h config/m68k/tm-altos.h \
-	config/m68k/tm-amix.h config/m68k/tm-delta68.h \
-	config/m68k/tm-dpx2.h config/m68k/tm-es1800.h \
-	config/m68k/tm-hp300bsd.h config/m68k/tm-hp300hpux.h \
-	config/m68k/tm-isi.h config/m68k/tm-m68k-em.h \
-	config/m68k/tm-monitor.h \
-	config/m68k/tm-news.h config/m68k/tm-os68k.h config/m68k/tm-st2000.h \
-	config/m68k/tm-sun2.h config/m68k/tm-sun2os4.h config/m68k/tm-sun3.h \
-	config/m68k/tm-sun3os4.h config/m68k/tm-vx68.h config/m68k/xm-3b1.h \
-	config/m68k/xm-altos.h config/m68k/xm-amix.h \
-	config/m68k/xm-apollo68b.h config/m68k/xm-apollo68v.h \
-	config/m68k/xm-delta68.h config/m68k/xm-dpx2.h \
-	config/m68k/xm-hp300bsd.h config/m68k/xm-hp300hpux.h \
-	config/m68k/xm-isi.h config/m68k/xm-news.h config/m68k/xm-news1000.h \
-	config/m68k/xm-sun2.h config/m68k/xm-sun3.h config/m68k/xm-sun3os4.h \
-	config/m88k/nm-delta88v4.h config/m88k/nm-m88k.h \
-	config/m88k/tm-delta88.h \
-	config/m88k/tm-delta88v4.h config/m88k/tm-m88k.h \
-	config/m88k/xm-delta88.h config/m88k/xm-dgux.h config/m88k/xm-m88k.h \
-	config/mips/nm-irix3.h \
-	config/mips/nm-irix4.h config/mips/nm-mips.h config/mips/nm-riscos.h \
-	config/mips/nm-news-mips.h config/mips/tm-bigmips.h \
-	config/mips/tm-irix3.h config/mips/tm-mips.h config/mips/tm-mipsm3.h \
-	config/mips/xm-irix3.h \
-	config/mips/xm-irix4.h config/mips/xm-makeva.h config/mips/xm-mips.h \
-	config/mips/xm-mipsm3.h \
-	config/mips/xm-riscos.h config/mips/xm-news-mips.h config/nm-sysv4.h \
-	config/none/nm-none.h config/none/tm-none.h config/none/xm-none.h \
-	config/ns32k/nm-umax.h \
-	config/ns32k/tm-ns32km3.h \
-	config/ns32k/tm-merlin.h config/ns32k/tm-umax.h \
-	config/ns32k/xm-ns32km3.h \
-	config/ns32k/xm-merlin.h config/ns32k/xm-umax.h \
-	config/pa/nm-hppab.h \
-	config/pa/nm-hppah.h config/pa/tm-hppab.h config/pa/tm-hppah.h \
-	config/pa/xm-hppab.h config/pa/xm-hppah.h config/pa/xm-pa.h \
-	config/pyr/tm-pyr.h \
-	config/pyr/xm-pyr.h config/romp/xm-rtbsd.h config/rs6000/nm-rs6000.h \
-	config/rs6000/tm-rs6000.h config/rs6000/xm-rs6000.h config/sh/tm-sh.h \
-	config/sparc/nm-sun4os4.h config/sparc/tm-sparclite.h \
-	config/sparc/tm-spc-em.h config/sparc/tm-sun4os4.h \
-	config/sparc/tm-sun4sol2.h config/sparc/tm-vxsparc.h \
-	config/sparc/xm-sun4os4.h config/sparc/xm-sun4sol2.h \
-	config/tahoe/tm-tahoe.h config/tahoe/xm-tahoe.h config/vax/nm-vax.h \
-	config/vax/tm-vax.h config/vax/xm-vaxbsd.h config/vax/xm-vaxult.h \
-	config/vax/xm-vaxult2.h config/z8k/tm-z8k.h
-
-ALLCONFIG = config/a29k/a29k-kern.mt config/a29k/a29k-udi.mt \
+	xcoffread.c xcoffsolib.c z8k-tdep.c
+
+ALLCONFIG = config/a29k/a29k-kern.mt config/a29k/a29k-udi.mt config/a29k/vx29k.mt\
 	config/a29k/a29k.mt config/a29k/ultra3.mh config/a29k/ultra3.mt \
-	config/alpha/alpha-osf1.mh config/alpha/alpha-osf1.mt \
+	config/alpha/alpha-osf1.mh config/alpha/alpha-osf2.mh \
+	config/alpha/alpha-osf1.mt config/alpha/alpha-nw.mt \
 	config/arm/arm.mh config/arm/arm.mt config/convex/convex.mh \
 	config/convex/convex.mt config/gould/np1.mh config/gould/np1.mt \
 	config/gould/pn.mh config/gould/pn.mt config/h8300/h8300hms.mt \
@@ -938,12 +937,14 @@ ALLCONFIG = config/a29k/a29k-kern.mt config/a29k/a29k-udi.mt \
 	config/i960/nindy960.mt config/i960/vxworks960.mt config/m68k/3b1.mh \
 	config/m68k/3b1.mt config/m68k/altos.mh config/m68k/altos.mt \
 	config/m68k/amix.mh config/m68k/amix.mt config/m68k/apollo68b.mh \
-	config/m68k/apollo68v.mh config/m68k/delta68.mh \
+	config/m68k/apollo68b.mt \
+	config/m68k/apollo68v.mh \
+	config/m68k/cisco.mt config/m68k/delta68.mh \
 	config/m68k/delta68.mt config/m68k/dpx2.mh config/m68k/dpx2.mt \
 	config/m68k/es1800.mt config/m68k/hp300bsd.mh \
 	config/m68k/hp300bsd.mt config/m68k/hp300hpux.mh \
 	config/m68k/hp300hpux.mt config/m68k/isi.mh config/m68k/isi.mt \
-	config/m68k/m68k-em.mt \
+	config/m68k/m68klynx.mh config/m68k/m68klynx.mt \
 	config/m68k/monitor.mt \
 	config/m68k/news.mh config/m68k/news.mt config/m68k/news1000.mh \
 	config/m68k/os68k.mt config/m68k/st2000.mt config/m68k/sun2os3.mh \
@@ -952,11 +953,16 @@ ALLCONFIG = config/a29k/a29k-kern.mt config/a29k/a29k-udi.mt \
 	config/m68k/sun3os4.mt config/m68k/vxworks68.mt config/m88k/delta88.mh \
 	config/m88k/delta88.mt config/m88k/delta88v4.mh \
 	config/m88k/delta88v4.mt config/m88k/m88k.mh config/m88k/m88k.mt \
-	config/mips/bigmips.mt config/mips/decstation.mh \
+	config/mips/bigmips.mt config/mips/bigmips64.mt \
+	config/mips/decstation.mh \
 	config/mips/decstation.mt config/mips/idt.mt config/mips/idtl.mt \
+	config/mips/idt64.mt config/mips/idtl64.mt \
 	config/mips/irix3.mh config/mips/irix3.mt config/mips/irix4.mh \
+	config/mips/irix5.mh config/mips/irix5.mt \
 	config/mips/littlemips.mh config/mips/littlemips.mt \
+	config/mips/mipsel64.mt \
 	config/mips/mipsm3.mh config/mips/mipsm3.mt \
+	config/mips/mipsv4.mh config/mips/mipsv4.mt \
 	config/mips/news-mips.mh config/mips/riscos.mh \
 	config/none/none.mh config/none/none.mt config/ns32k/merlin.mh \
 	config/ns32k/merlin.mt config/ns32k/ns32km3.mh config/ns32k/ns32km3.mt \
@@ -965,6 +971,7 @@ ALLCONFIG = config/a29k/a29k-kern.mt config/a29k/a29k-udi.mt \
 	config/pa/hppahpux.mt config/pyr/pyramid.mh config/pyr/pyramid.mt \
 	config/romp/rtbsd.mh config/rs6000/rs6000.mh config/rs6000/rs6000.mt \
 	config/sh/sh.mt config/sparc/sparc-em.mt config/sparc/sparclite.mt \
+	config/sparc/sparclynx.mh config/sparc/sparclynx.mt \
 	config/sparc/sun4os4.mh config/sparc/sun4os4.mt \
 	config/sparc/sun4sol2.mh config/sparc/sun4sol2.mt \
 	config/sparc/vxsparc.mt config/tahoe/tahoe.mh config/tahoe/tahoe.mt \
@@ -972,14 +979,17 @@ ALLCONFIG = config/a29k/a29k-kern.mt config/a29k/a29k-udi.mt \
 	config/vax/vaxult2.mh config/z8k/z8ksim.mt
 
 
-udip2soc.o: 29k-share/udi/udip2soc.c $(udiheaders)
+udip2soc.o: $(srcdir)/29k-share/udi/udip2soc.c $(udiheaders)
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/29k-share/udi/udip2soc.c
 
-udr.o: 29k-share/udi/udr.c $(udiheaders) 
+udi2go32.o: $(srcdir)/29k-share/udi/udi2go32.c $(udiheaders)
+	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/29k-share/udi/udi2go32.c
+
+udr.o: $(srcdir)/29k-share/udi/udr.c $(udiheaders) 
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/29k-share/udi/udr.c
 
-a29k-pinsn.o: a29k-pinsn.c $(bfd_h) $(dis-asm_h)
 a29k-tdep.o: a29k-tdep.c $(gdbcmd_h) $(gdbcore_h) $(inferior_h) $(defs_h)
+
 a68v-nat.o: a68v-nat.c $(defs_h) $(gdbcore_h) $(inferior_h)
 
 alpha-nat.o: alpha-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h
@@ -988,13 +998,16 @@ alpha-tdep.o: alpha-tdep.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
 	$(inferior_h) $(symtab_h) $(dis-asm.h)
 
 altos-xdep.o: altos-xdep.c $(defs_h) $(gdbcore_h) $(inferior_h)
-arm-pinsn.o: arm-pinsn.c $(OP_INCLUDE)/arm.h $(defs_h) $(symtab_h)
+
+annotate.o: annotate.c $(defs_h) annotate.h $(value_h) target.h $(gdbtypes_h)
+
+arm-tdep.o: arm-tdep.c $(gdbcmd_h) $(gdbcore_h) $(inferior_h) $(defs_h)
 
 blockframe.o: blockframe.c $(defs_h) $(gdbcore_h) $(inferior_h) \
 	objfiles.h symfile.h target.h
 
 breakpoint.o: breakpoint.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
-	$(inferior_h) language.h target.h
+	$(inferior_h) language.h target.h thread.h
 
 buildsym.o: buildsym.c $(bfd_h) buildsym.h complaints.h $(defs_h) \
 	objfiles.h symfile.h $(symtab_h)
@@ -1009,63 +1022,75 @@ c-typeprint.o: c-typeprint.c c-lang.h $(defs_h) $(expression_h) \
 c-valprint.o: c-valprint.c $(defs_h) $(expression_h) $(gdbtypes_h) \
 	language.h $(symtab_h) valprint.h $(value_h)
 
+f-lang.o: f-lang.c f-lang.h $(defs_h) $(expression_h) $(gdbtypes_h) \
+	language.h parser-defs.h $(symtab_h)
+
+f-typeprint.o: f-typeprint.c f-lang.h $(defs_h) $(expression_h) \
+	$(gdbcmd_h) $(gdbcore_h) $(gdbtypes_h) language.h $(symtab_h) target.h \
+	typeprint.h $(value_h)
+
+f-valprint.o: f-valprint.c $(defs_h) $(expression_h) $(gdbtypes_h) \
+	language.h $(symtab_h) valprint.h $(value_h)
+
 ch-lang.o: ch-lang.c ch-lang.h $(defs_h) $(expression_h) $(gdbtypes_h) \
 	language.h parser-defs.h $(symtab_h)
 
 ch-typeprint.o: ch-typeprint.c ch-lang.h $(defs_h) $(expression_h) \
-	$(gdbcmd_h) $(gdbcore_h) $(gdbtypes_h) language.h $(symtab_h) target.h \
-	$(value_h)
+	$(gdbcmd_h) $(gdbcore_h) $(gdbtypes_h) language.h $(symtab_h) \
+	target.h $(value_h) typeprint.h
 
 ch-valprint.o: ch-valprint.c $(defs_h) $(expression_h) $(gdbtypes_h) \
-	language.h $(symtab_h) valprint.h $(value_h)
+	language.h $(symtab_h) valprint.h $(value_h) c-lang.h
 
 coff-solib.o: coff-solib.c $(defs_h)
 
 coffread.o: coffread.c $(bfd_h) $(breakpoint_h) buildsym.h \
 	complaints.h $(defs_h) $(expression_h) $(gdbtypes_h) objfiles.h \
-	symfile.h $(symtab_h)
+	symfile.h $(symtab_h) gdb-stabs.h stabsread.h target.h
 
 command.o: command.c $(defs_h) $(expression_h) $(gdbcmd_h) \
 	$(gdbtypes_h) $(symtab_h) $(value_h)
 
 complaints.o: complaints.c complaints.h $(defs_h) $(gdbcmd_h)
 
-convex-pinsn.o: convex-pinsn.c $(OP_INCLUDE)/convex.h $(defs_h) \
-	$(symtab_h)
-
 convex-tdep.o: convex-tdep.c $(wait_h) $(defs_h) $(gdbcmd_h) \
 	$(gdbcore_h) $(inferior_h)
 
 convex-xdep.o: convex-xdep.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
 	$(inferior_h)
 
+copying.o: copying.c $(defs_h) $(gdbcmd_h)
+
+core-sol2.o: core-sol2.c $(command_h) $(defs_h) $(gdbcore_h) \
+	$(inferior_h) target.h
+
 core-svr4.o: core-svr4.c $(command_h) $(defs_h) $(gdbcore_h) \
 	$(inferior_h) target.h
 
 core.o: core.c $(dis-asm_h) $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
-	$(inferior_h) target.h
+	$(inferior_h) target.h language.h
 
-coredep.o: coredep.c $(defs_h) $(gdbcore_h)
+coredep.o: coredep.c $(defs_h) $(gdbcore_h) $(value_h) $(inferior_h)
 
 corelow.o: corelow.c $(command_h) $(defs_h) $(gdbcore_h) $(inferior_h) \
-	target.h
+	target.h thread.h
 
 cp-valprint.o: cp-valprint.c $(defs_h) $(expression_h) $(gdbcmd_h) \
 	$(gdbtypes_h) $(symtab_h) $(value_h)
 
-dcache.o: dcache.c $(dcache_h)
+dcache.o: dcache.c $(dcache_h) $(defs_h) $(gdbcmd_h)
 
 dbxread.o: dbxread.c $(breakpoint_h) buildsym.h $(command_h) \
 	complaints.h $(defs_h) $(expression_h) gdb-stabs.h $(gdbcore_h) \
 	$(gdbtypes_h) language.h objfiles.h partial-stab.h stabsread.h \
 	symfile.h $(symtab_h) target.h
 
-dcache.o: dcache.c $(dcache_h)
-
 delta68-nat.o: delta68-nat.c $(defs_h)
 
 demangle.o: demangle.c $(defs_h) $(gdbcmd_h)
 
+dpx2-nat.o: dpx2-nat.c $(defs_h) $(gdbcore_h)
+
 dwarfread.o: dwarfread.c $(bfd_h) buildsym.h complaints.h $(defs_h) \
 	$(expression_h) $(gdbtypes_h) language.h objfiles.h symfile.h \
 	$(symtab_h)
@@ -1073,13 +1098,13 @@ dwarfread.o: dwarfread.c $(bfd_h) buildsym.h complaints.h $(defs_h) \
 elfread.o: elfread.c $(bfd_h) buildsym.h complaints.h $(defs_h) \
 	gdb-stabs.h objfiles.h symfile.h $(symtab_h)
 
-environ.o: environ.c $(defs_h) environ.h
+environ.o: environ.c $(defs_h) environ.h $(gdbcore_h)
 
 eval.o: eval.c $(bfd_h) $(defs_h) $(expression_h) $(frame_h) \
 	$(gdbtypes_h) language.h $(symtab_h) target.h $(value_h)
 
 exec.o: exec.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) $(inferior_h) \
-	target.h
+	target.h language.h
 
 expprint.o: expprint.c $(defs_h) $(expression_h) $(gdbtypes_h) \
 	language.h parser-defs.h $(symtab_h) $(value_h)
@@ -1087,7 +1112,14 @@ expprint.o: expprint.c $(defs_h) $(expression_h) $(gdbtypes_h) \
 findvar.o: findvar.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h
 
 fork-child.o: fork-child.c $(wait_h) $(defs_h) $(gdbcore_h) \
-	$(inferior_h) target.h terminal.h
+	$(inferior_h) target.h terminal.h thread.h
+
+# start-sanitize-gdbtk
+gdbtk.o: gdbtk.c $(defs_h) $(symtab_h) $(inferior_h) $(command_h) \
+	$(bfd_h) symfile.h objfiles.h target.h
+	$(CC) -c $(INTERNAL_CFLAGS) $(TCL_CFLAGS) $(TK_CFLAGS) $(srcdir)/gdbtk.c \
+		 -DGDBTK_FILENAME=\"$(libdir)/gdbtk.tcl\"
+# end-sanitize-gdbtk
 
 gdbtypes.o: gdbtypes.c $(bfd_h) complaints.h $(defs_h) $(expression_h) \
 	$(gdbtypes_h) language.h objfiles.h symfile.h $(symtab_h) target.h \
@@ -1095,10 +1127,11 @@ gdbtypes.o: gdbtypes.c $(bfd_h) complaints.h $(defs_h) $(expression_h) \
 
 go32-xdep.o: go32-xdep.c
 
-gould-pinsn.o: gould-pinsn.c $(OP_INCLUDE)/np1.h $(defs_h) $(frame_h) \
+gould-tdep.o: gould-tdep.c $(OP_INCLUDE)/np1.h $(defs_h) $(frame_h) \
 	$(gdbcore_h) $(symtab_h)
 
 gould-xdep.o: gould-xdep.c $(defs_h) $(gdbcore_h) $(inferior_h)
+
 h8300-tdep.o: h8300-tdep.c $(defs_h) $(frame_h) $(symtab_h)
 
 h8500-tdep.o: h8500-tdep.c $(bfd_h) $(dis-asm_h) $(defs_h) \
@@ -1106,54 +1139,65 @@ h8500-tdep.o: h8500-tdep.c $(bfd_h) $(dis-asm_h) $(defs_h) \
 	$(value_h)
 
 hp300ux-nat.o: hp300ux-nat.c $(defs_h) $(gdbcore_h) $(inferior_h)
-hppa-pinsn.o: hppa-pinsn.c $(bfd_h) $(dis-asm_h) $(defs_h) 
 
 hppa-tdep.o: hppa-tdep.c $(wait_h) $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
 	$(inferior_h) objfiles.h symfile.h target.h
 
 hppab-nat.o: hppab-nat.c $(bfd_h) $(defs_h) $(inferior_h) target.h
 hppah-nat.o: hppah-nat.c $(bfd_h) $(defs_h) $(inferior_h) target.h
-i386-pinsn.o: i386-pinsn.c $(bfd_h) $(dis-asm_h) $(defs_h)
+
 i386-tdep.o: i386-tdep.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h
+
+i386aix-nat.o: i386aix-nat.c $(defs_h) $(frame_h) $(inferior_h) \
+	language.h $(gdbcore_h) $(floatformat_h) target.h
+
 i386b-nat.o: i386b-nat.c $(defs_h) 
-i386lynx-nat.o: i386lynx-nat.c $(defs_h) $(frame_h) $(inferior_h) target.h
+
+i386ly-nat.o: i386ly-nat.c $(defs_h) $(frame_h) $(inferior_h) target.h
+
 i386ly-tdep.o: i386ly-tdep.c $(defs_h) $(inferior_h) target.h
+
+i386m3-nat.o: i386m3-nat.c $(defs_h) $(inferior_h) $(floatformat_h) target.h
+
 i386mach-nat.o: i386mach-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) 
 
-i386v-nat.o: i386v-nat.c $(ieee-float_h) $(defs_h) $(gdbcore_h) \
+i386v-nat.o: i386v-nat.c $(floatformat_h) $(defs_h) $(gdbcore_h) \
 	$(inferior_h) language.h target.h
 
 i386v4-nat.o: i386v4-nat.c $(defs_h)
 
-i387-tdep.o: i387-tdep.c $(ieee-float_h) $(defs_h) $(gdbcore_h) \
+i387-tdep.o: i387-tdep.c $(floatformat_h) $(defs_h) $(gdbcore_h) \
 	$(inferior_h) language.h
 
-i960-pinsn.o: i960-pinsn.c $(bfd_h) $(dis-asm_h) $(defs_h)
-
-i960-tdep.o: i960-tdep.c $(ieee-float_h) $(defs_h) $(expression_h) \
+i960-tdep.o: i960-tdep.c $(floatformat_h) $(defs_h) $(expression_h) \
 	$(frame_h) $(gdbtypes_h) $(symtab_h) $(value_h)
 
 infcmd.o: infcmd.c $(defs_h) environ.h $(gdbcmd_h) $(gdbcore_h) \
-	$(inferior_h) target.h
+	$(inferior_h) target.h language.h
 
 inflow.o: inflow.c $(bfd_h) $(command_h) $(defs_h) $(inferior_h) \
-	signals.h target.h terminal.h
+	signals.h target.h terminal.h thread.h
 
 infptrace.o: infptrace.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h
 
 infrun.o: infrun.c $(wait_h) $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
-	$(inferior_h) target.h
+	$(inferior_h) target.h thread.h
 
 inftarg.o: inftarg.c $(wait_h) $(defs_h) $(gdbcore_h) $(inferior_h) \
-	target.h terminal.h
+	target.h terminal.h $(command_h)
 
 irix4-nat.o: irix4-nat.c $(defs_h) $(inferior_h)
+irix5-nat.o: irix5-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) target.h \
+	$(symtab_h) symfile.h objfiles.h $(command_h) $(frame_h) regex.h \
+	language.h
 isi-xdep.o: isi-xdep.c
 
 language.o: language.c $(bfd_h) $(defs_h) $(expression_h) $(frame_h) \
 	$(gdbcmd_h) $(gdbtypes_h) language.h parser-defs.h $(symtab_h) \
 	target.h $(value_h)
 
+lynx-nat.o: lynx-nat.c $(defs_h) $(frame_h) $(inferior_h) target.h
+
 m2-lang.o: m2-lang.c $(defs_h) $(expression_h) $(gdbtypes_h) \
 	language.h m2-lang.h parser-defs.h $(symtab_h)
 
@@ -1164,25 +1208,42 @@ m2-typeprint.o: m2-typeprint.c $(defs_h) $(expression_h) $(gdbcmd_h) \
 m2-valprint.o: m2-valprint.c $(defs_h) $(gdbtypes_h) $(symtab_h) \
 	valprint.h
 
-m68k-pinsn.o: m68k-pinsn.c $(bfd_h) $(dis-asm_h) $(defs_h) 
+m3-nat.o: m3-nat.c $(defs_h) $(inferior_h) $(value_h) language.h target.h \
+	$(wait_h) $(gdbcmd_h) $(gdbcore_h)
+
 m68k-tdep.o: m68k-tdep.c $(defs_h) $(frame_h) $(symtab_h) 
+
+m68kly-nat.o: m68kly-nat.c $(defs_h) $(frame_h) $(inferior_h) target.h
+
 m88k-nat.o: m88k-nat.c $(defs_h) $(gdbcore_h) $(inferior_h)
-m88k-pinsn.o: m88k-pinsn.c $(defs_h) $(symtab_h) 
+
 m88k-tdep.o: m88k-tdep.c $(defs_h) $(gdbcore_h) $(inferior_h)
 
-main.o: main.c $(bfd_h) $(getopt_h) $(readline_headers) call-cmds.h \
+top.o: top.c top.h $(bfd_h) $(getopt_h) $(readline_headers) call-cmds.h \
 	$(defs_h) $(gdbcmd_h) $(inferior_h) language.h signals.h \
 	$(remote_utils_h)
-	$(CC) -c $(INTERNAL_CFLAGS) $(READLINE_CFLAGS) $(srcdir)/main.c
 
-maint.o: maint.c $(defs_h) $(gdbcmd_h) $(gdbtypes_h) $(symtab_h) 
+main.o: main.c top.h $(defs_h)
+
+maint.o: maint.c $(defs_h) $(gdbcmd_h) $(gdbtypes_h) $(symtab_h) language.h \
+	$(expression_h)
+
+mdebugread.o: mdebugread.c buildsym.h complaints.h $(bfd_h) $(defs_h) \
+	$(expression_h) gdb-stabs.h $(gdbcore_h) $(gdbtypes_h) language.h \
+	objfiles.h partial-stab.h stabsread.h symfile.h $(symtab_h)
+
+mipsm3-nat.o: mipsm3-nat.c $(defs_h) $(inferior_h)
+
+os9kread.o: os9kread.c buildsym.h complaints.h $(bfd_h) $(defs_h) \
+        $(expression_h) gdb-stabs.h $(gdbcore_h) $(gdbtypes_h) language.h \
+        objfiles.h partial-stab.h stabsread.h symfile.h $(symtab_h) target.h
+
 mem-break.o: mem-break.c $(defs_h) 
 
 minsyms.o: minsyms.c $(bfd_h) $(defs_h) objfiles.h symfile.h \
 	$(symtab_h)
 
 mips-nat.o: mips-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) 
-mips-pinsn.o: mips-pinsn.c $(bfd_h) $(dis-asm_h) $(defs_h) 
 
 mips-tdep.o: mips-tdep.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
 	$(inferior_h) language.h objfiles.h symfile.h
@@ -1191,6 +1252,11 @@ mipsread.o: mipsread.c buildsym.h complaints.h $(bfd_h) $(defs_h) \
 	$(expression_h) gdb-stabs.h $(gdbcore_h) $(gdbtypes_h) language.h \
 	objfiles.h partial-stab.h stabsread.h symfile.h $(symtab_h)
 
+mipsv4-nat.o: mipsv4-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h
+
+monitor.o: monitor.c monitor.h $(bfd_h) $(wait_h) $(defs_h) $(gdbcmd_h) \
+	$(inferior_h) target.h serial.h terminal.h
+
 news-xdep.o: news-xdep.c
 
 Onindy.o: nindy-share/Onindy.c $(wait_h) nindy-share/block_io.h \
@@ -1202,15 +1268,16 @@ nindy.o: nindy-share/nindy.c $(wait_h) nindy-share/block_io.h \
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/nindy-share/nindy.c
 
 nlmread.o: nlmread.c $(bfd_h) buildsym.h complaints.h $(defs_h) \
-	gdb-stabs.h objfiles.h symfile.h $(symtab_h)
+	gdb-stabs.h objfiles.h symfile.h $(symtab_h) stabsread.h
+
+ns32km3-nat.o: ns32km3-nat.c $(defs_h) $(inferior_h)
 
 ttyflush.o: nindy-share/ttyflush.c
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/nindy-share/ttyflush.c
 
 nindy-tdep.o: nindy-tdep.c $(defs_h) $(frame_h) $(symtab_h) 
 
-ns32k-pinsn.o: ns32k-pinsn.c $(defs_h) $(gdbcore_h) ns32k-opcode.h \
-	$(symtab_h)
+ns32k-tdep.o: ns32k-tdep.c $(bfd_h) $(dis-asm_h) $(defs_h)
 
 objfiles.o: objfiles.c $(bfd_h) $(defs_h) objfiles.h symfile.h \
 	$(symtab_h)
@@ -1218,7 +1285,12 @@ objfiles.o: objfiles.c $(bfd_h) $(defs_h) objfiles.h symfile.h \
 osfsolib.o: osfsolib.c $(command_h) $(defs_h) $(gdbcore_h) $(inferior_h) \
 	objfiles.h regex.h symfile.h target.h language.h
 
-paread.o: paread.c $(bfd_h) buildsym.h complaints.h $(defs_h) \
+somread.o: somread.c $(bfd_h) buildsym.h complaints.h $(defs_h) \
+	gdb-stabs.h objfiles.h symfile.h $(symtab_h)
+
+somsolib.o: somsolib.c $(defs_h)
+
+hpread.o: hpread.c $(bfd_h) buildsym.h complaints.h $(defs_h) \
 	gdb-stabs.h objfiles.h symfile.h $(symtab_h)
 
 parse.o: parse.c $(command_h) $(defs_h) $(expression_h) $(frame_h) \
@@ -1231,15 +1303,11 @@ printcmd.o: printcmd.c $(breakpoint_h) $(defs_h) $(expression_h) \
 procfs.o: procfs.c $(command_h) $(defs_h) $(gdbcore_h) $(inferior_h) \
 	target.h
 
-putenv.o: putenv.c
-
-pyr-pinsn.o: pyr-pinsn.c $(OP_INCLUDE)/pyr.h $(defs_h) $(gdbcore_h) \
-	$(symtab_h)
-
 pyr-tdep.o: pyr-tdep.c $(defs_h) 
+
 pyr-xdep.o: pyr-xdep.c $(defs_h) $(gdbcore_h) $(inferior_h) 
 
-regex.o: regex.c regex.h
+regex.o: regex.c regex.h $(defs_h)
 
 remote-adapt.o: remote-adapt.c $(wait_h) $(defs_h) $(gdbcore_h) \
 	$(inferior_h) target.h terminal.h
@@ -1247,6 +1315,9 @@ remote-adapt.o: remote-adapt.c $(wait_h) $(defs_h) $(gdbcore_h) \
 remote-bug.o: remote-bug.c $(wait_h) $(defs_h) $(gdbcore_h) \
 	$(inferior_h) target.h terminal.h $(remote_utils_h)
 
+remote-e7000.o: remote-e7000.c $(defs_h) $(gdbcore_h) target.h \
+	$(wait_h) serial.h
+
 remote-eb.o: remote-eb.c $(wait_h) $(srcdir)/config/a29k/tm-a29k.h \
 	$(defs_h) $(gdbcore_h) $(inferior_h) symfile.h target.h terminal.h
 
@@ -1262,14 +1333,15 @@ remote-mips.o: remote-mips.c $(wait_h) $(defs_h) $(gdbcmd_h) \
 remote-mm.o: remote-mm.c $(bfd_h) $(wait_h) $(defs_h) $(inferior_h) \
 	minimon.h target.h terminal.h
 
-remote-mon.o: remote-mon.c $(wait_h) $(command_h) $(defs_h) \
-	$(gdbcore_h) monitor.h serial.h target.h
-
-remote-nindy.o: remote-nindy.c $(ieee-float_h) $(wait_h) $(command_h) \
+remote-nindy.o: remote-nindy.c $(floatformat_h) $(wait_h) $(command_h) \
 	$(defs_h) $(gdbcore_h) $(inferior_h) \
 	nindy-share/env.h nindy-share/stop.h $(remote_utils_h) \
 	symfile.h
 
+remote-os9k.o: remote-os9k.c $(defs_h) $(gdbcore_h) $(wait_h) \
+	$(command_h) monitor.h $(remote_utils_h) $(symtab_h) symfile.h \
+	objfiles.h gdb-stabs.h
+
 remote-sim.o: remote-sim.c $(wait_h) $(defs_h) $(gdbcore_h) \
 	$(inferior_h) target.h terminal.h
 
@@ -1282,27 +1354,36 @@ remote-udi.o: remote-udi.c $(bfd_h) $(wait_h) $(defs_h) $(gdbcmd_h) \
 remote-vx.o: remote-vx.c $(wait_h) complaints.h $(defs_h) $(gdbcmd_h) \
 	$(gdbcore_h) $(inferior_h) target.h vx-share/dbgRpcLib.h \
 	vx-share/ptrace.h vx-share/xdr_ld.h vx-share/xdr_ptrace.h \
-	vx-share/xdr_rdb.h
+	vx-share/xdr_rdb.h gdb-stabs.h objfiles.h symfile.h $(bfd_h)
+
+remote-vx29k.o: remote-vx29k.c $(wait_h) complaints.h $(defs_h) $(gdbcmd_h) \
+        $(gdbcore_h) $(inferior_h) target.h vx-share/dbgRpcLib.h \
+        vx-share/ptrace.h vx-share/xdr_ld.h vx-share/xdr_ptrace.h \
+        vx-share/xdr_rdb.h
 
 remote-z8k.o: remote-z8k.c $(wait_h) $(srcdir)/../sim/z8k/sim.h \
 	$(defs_h) $(gdbcore_h) $(inferior_h) target.h terminal.h
 
 remote-utils.o: remote-utils.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
-	$(inferior_h) $(remote_utils_h) 
+	$(inferior_h) $(remote_utils_h)
 
 remote.o: remote.c $(bfd_h) $(wait_h) $(defs_h) $(gdbcmd_h) \
 	$(inferior_h) $(remote_utils_h) symfile.h terminal.h
 
-rs6000-nat.o: rs6000-nat.c $(bfd_h) $(defs_h) $(inferior_h) target.h
+rom68k-rom.o: rom68k-rom.c monitor.h $(bfd_h) $(wait_h) $(defs_h) $(gdbcmd_h) \
+	$(inferior_h) target.h serial.h terminal.h
 
-rs6000-pinsn.o: rs6000-pinsn.c $(OP_INCLUDE)/rs6k.h $(defs_h)
+rs6000-nat.o: rs6000-nat.c $(bfd_h) $(defs_h) $(inferior_h) target.h
 
 rs6000-tdep.o: rs6000-tdep.c $(defs_h) $(gdbcore_h) $(inferior_h) \
 	target.h xcoffsolib.h
 
 ser-go32.o: ser-go32.c $(defs_h) serial.h 
+
 ser-tcp.o: ser-tcp.c $(defs_h) serial.h signals.h
+
 ser-unix.o: ser-unix.c $(defs_h) serial.h 
+
 serial.o: serial.c $(defs_h) serial.h 
 
 sh-tdep.o: sh-tdep.c $(bfd_h) $(dis-asm_h) \
@@ -1316,11 +1397,12 @@ source.o: source.c $(defs_h) $(expression_h) $(frame_h) $(gdbcmd_h) \
 	$(gdbcore_h) language.h objfiles.h regex.h symfile.h $(symtab_h)
 
 sparc-nat.o: sparc-nat.c $(bfd_h) $(defs_h) $(inferior_h) target.h
-sparc-pinsn.o: sparc-pinsn.c $(bfd_h) $(dis-asm_h) $(defs_h)
 
-sparc-tdep.o: sparc-tdep.c $(ieee-float_h) $(defs_h) $(gdbcore_h) \
+sparc-tdep.o: sparc-tdep.c $(floatformat_h) $(defs_h) $(gdbcore_h) \
 	$(inferior_h) objfiles.h symfile.h target.h
 
+sparcl-tdep.o: sparcl-tdep.c $(defs_h) $(gdbcore_h) target.h
+
 stabsread.o: stabsread.c $(bfd_h) $(INCLUDE_DIR)/aout/stab.def \
 	$(INCLUDE_DIR)/aout/stab_gnu.h buildsym.h complaints.h $(defs_h) \
 	$(gdbtypes_h) objfiles.h stabsread.h symfile.h $(symtab_h)
@@ -1346,13 +1428,13 @@ symtab.o: symtab.c call-cmds.h $(defs_h) $(expression_h) $(frame_h) \
 	$(gdbcmd_h) $(gdbcore_h) $(gdbtypes_h) language.h objfiles.h \
 	regex.h symfile.h $(symtab_h) target.h $(value_h)
 
-tahoe-pinsn.o: tahoe-pinsn.c $(OP_INCLUDE)/tahoe.h $(defs_h) \
+tahoe-tdep.o: tahoe-tdep.c $(OP_INCLUDE)/tahoe.h $(defs_h) \
 	$(symtab_h)
 
 target.o: target.c $(bfd_h) $(defs_h) $(gdbcmd_h) $(inferior_h) \
 	objfiles.h symfile.h target.h
 
-thread.o: thread.c $(defs_h) thread.h 
+thread.o: thread.c $(defs_h) thread.h $(gdbcmd_h)
 
 typeprint.o: typeprint.c $(defs_h) $(expression_h) $(gdbcmd_h) \
 	$(gdbcore_h) $(gdbtypes_h) language.h $(symtab_h) target.h \
@@ -1363,7 +1445,7 @@ ultra3-xdep.o: ultra3-xdep.c $(defs_h) $(gdbcore_h) $(inferior_h)
 umax-xdep.o: umax-xdep.c $(defs_h) $(gdbcore_h) $(inferior_h)
 
 utils.o: utils.c $(bfd_h) $(defs_h) $(expression_h) $(gdbcmd_h) \
-	language.h signals.h target.h terminal.h
+	language.h signals.h target.h terminal.h $(readline_headers)
 
 valarith.o: valarith.c $(bfd_h) $(defs_h) $(expression_h) \
 	$(gdbtypes_h) language.h $(symtab_h) target.h $(value_h)
@@ -1377,7 +1459,9 @@ valprint.o: valprint.c $(defs_h) $(expression_h) $(gdbcmd_h) \
 values.o: values.c $(defs_h) $(expression_h) $(frame_h) $(gdbcmd_h) \
 	$(gdbcore_h) $(gdbtypes_h) $(symtab_h) target.h $(value_h)
 
-vax-pinsn.o: vax-pinsn.c $(OP_INCLUDE)/vax.h $(defs_h) $(symtab_h)
+vax-tdep.o: vax-tdep.c $(OP_INCLUDE)/vax.h $(defs_h) $(symtab_h)
+
+w65-tdep.o : w65-tdep.c
 
 xdr_ld.o: vx-share/xdr_ld.c $(defs_h) vx-share/vxTypes.h \
 	vx-share/vxWorks.h vx-share/xdr_ld.h
@@ -1391,9 +1475,6 @@ xdr_rdb.o: vx-share/xdr_rdb.c $(defs_h) vx-share/vxTypes.h \
 	vx-share/vxWorks.h vx-share/xdr_rdb.h
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/vx-share/xdr_rdb.c
 
-xcoffexec.o: xcoffexec.c $(BFD_SRC)/libbfd.h $(defs_h) $(gdbcmd_h) \
-	$(gdbcore_h) $(inferior_h) objfiles.h symfile.h target.h xcoffsolib.h
-
 xcoffread.o: xcoffread.c $(bfd_h) $(INCLUDE_DIR)/aout/stab.def \
 	$(INCLUDE_DIR)/aout/stab_gnu.h $(INCLUDE_DIR)/coff/internal.h \
 	$(INCLUDE_DIR)/coff/rs6000.h $(BFD_SRC)/libcoff.h buildsym.h \
@@ -1406,12 +1487,18 @@ z8k-tdep.o: z8k-tdep.c $(bfd_h) $(dis-asm_h) $(defs_h) $(frame_h) \
 	$(gdbcmd_h) $(gdbtypes_h) $(symtab_h)
 
 c-exp.tab.o: c-exp.tab.c c-lang.h $(defs_h) $(expression_h) \
-	$(gdbtypes_h) language.h parser-defs.h $(symtab_h) $(value_h)
+	$(gdbtypes_h) language.h parser-defs.h $(symtab_h) $(value_h) \
+	$(bfd_h) objfiles.h symfile.h
 
 ch-exp.tab.o: ch-exp.tab.c ch-lang.h $(defs_h) $(expression_h) \
-	$(gdbtypes_h) language.h parser-defs.h $(symtab_h) $(value_h)
+	$(gdbtypes_h) language.h parser-defs.h $(symtab_h) $(value_h) \
+	$(bfd_h) objfiles.h symfile.h
+
+f-exp.tab.o: f-exp.tab.c f-lang.h $(defs_h) $(expression_h) \
+	language.h parser-defs.h $(value_h) $(bfd_h) objfiles.h symfile.h
 
 m2-exp.tab.o: m2-exp.tab.c $(defs_h) $(expression_h) $(gdbtypes_h) \
-	language.h m2-lang.h parser-defs.h $(symtab_h) $(value_h)
+	language.h m2-lang.h parser-defs.h $(symtab_h) $(value_h) \
+	$(bfd_h) objfiles.h symfile.h
 
 ### end of the gdb Makefile.in.