* Makefile.in (ALLDEPFILES): Add hpread.c.
[binutils-gdb.git] / gdb / Makefile.in
index d38228f3c4e76a2d9891463d26a07be3e86d3afb..213f2943934701db49908e80e5319da2a4fd3953 100644 (file)
@@ -169,16 +169,17 @@ 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)
+       -liberty $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) $(ENABLE_CLIBS)
 CLIBS = $(BFD) $(READLINE) $(OPCODES) $(MMALLOC) \
-       $(LIBIBERTY) $(TERMCAP) $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS)
+       $(LIBIBERTY) $(TERMCAP) $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) \
+       $(ENABLE_CLIBS)
 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.12.3
+VERSION = 4.13.1
 DIST=gdb
 
 LINT=/usr/5bin/lint
@@ -232,7 +233,11 @@ FLAGS_TO_PASS = \
 
 CC_FOR_TARGET = ` \
   if [ -f $${rootme}/../gcc/xgcc ] ; 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 $(CC); \
@@ -242,10 +247,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); \
@@ -268,12 +276,38 @@ CHILL_FOR_TARGET = ` \
   fi`
 CHILL_LIB = -lchill
 
+NLMCONV_FOR_TARGET = ` \
+  if [ -f $${rootme}/../binutils/nlmconv ] ; then \
+    echo $${rootme}/../binutils/nlmconv; \
+  else \
+    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
+      echo $(NLMCONV); \
+    else \
+      t='$(program_transform_name)'; echo nlmconv | sed -e '' $$t; \
+    fi; \
+  fi`
+
+NWSOURCE = /gaunt/grossman/unsupported/Novell
+NWINCLUDES = $(NWSOURCE)/novh40
+
+LD_FOR_TARGET = ` \
+  if [ -f $${rootme}/../ld/ld.new ] ; then \
+    echo $${rootme}/../ld/ld.new; \
+  else \
+    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
+      echo $(LD); \
+    else \
+      t='$(program_transform_name)'; echo ld | sed -e '' $$t; \
+    fi; \
+  fi`
+
 # The use of $$(x_FOR_TARGET) reduces the command line length by not
 # duplicating the lengthy definition.
 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)" \
@@ -284,13 +318,14 @@ 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)" \
+       "LD_FOR_TARGET=$(LD_FOR_TARGET)" \
+       "MAKEINFO=$(MAKEINFO)" \
+       "NLMCONV_FOR_TARGET=$(NLMCONV_FOR_TARGET)" \
        "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
@@ -308,26 +343,9 @@ SFILES = blockframe.c breakpoint.c buildsym.c c-exp.y c-lang.c \
        typeprint.c utils.c valarith.c valops.c \
        valprint.c values.c serial.c ser-unix.c mdebugread.c os9kread.c
 
-# Files that are not source code, but need to go into
-# gdb-$(VERSION).tar.Z.
-
-NONSRC = Makefile.in configure.in ChangeLog ChangeLog-9091 \
-       ChangeLog-92 ChangeLog-93 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
-
 # 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. (-rich, summer 1993)
 # (Why would we not want to depend on them?  If one of these changes in a 
@@ -356,8 +374,6 @@ udiheaders = \
        $(srcdir)/29k-share/udi/udipt29k.h \
        $(srcdir)/29k-share/udi/udisoc.h
 
-dcache_h =     dcache.h
-
 gdbcore_h =    gdbcore.h $(bfd_h)
 
 frame_h =      frame.h
@@ -387,12 +403,6 @@ HFILES_NO_SRCDIR = buildsym.h call-cmds.h coff-solib.h defs.h dst.h environ.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-lynx.h config/tm-sunos.h \
-       config/tm-sysv4.h \
-       config/m68k/xm-m68k.h config/sparc/xm-sparc.h \
-       config/xm-lynx.h config/xm-sysv4.h \
-       config/vax/xm-vax.h config/nm-m3.h config/nm-trash.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 \
@@ -423,20 +433,16 @@ 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_NO_SRCDIR = $(SFILES) $(HFILES_NO_SRCDIR) $(ALLDEPFILES) \
-       $(ALLPARAM) $(POSSLIBS)
+       $(POSSLIBS)
 TAGFILES_WITH_SRCDIR = $(HFILES_WITH_SRCDIR)
 
-TARFILES = $(SFILES) $(HFILES_NO_SRCDIR) $(HFILES_WITH_SRCDIR) \
-       $(NONSRC) $(ALLDEPFILES) $(ALLCONFIG) \
-       $(ALLPARAM) $(INFOFILES) $(POSSLIBS) $(REMOTE_EXAMPLES)
-
-
 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 \
@@ -458,12 +464,16 @@ NTSOBS = standalone.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
 
+# 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.
 .c.o:
@@ -479,6 +489,7 @@ installcheck:
 check: force
        @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
@@ -519,6 +530,11 @@ uninstall: force
 #
 # 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
@@ -556,6 +572,23 @@ gdb: $(OBS) $(TSOBS) $(ADD_DEPS) $(CDEPS) init.o
        $(CC-LD) $(INTERNAL_LDFLAGS) -o gdb \
          init.o $(OBS) $(TSOBS) $(ADD_FILES) $(CLIBS) $(LOADLIBES)
 
+prelude.o: $(NWSOURCE)/prelude.c
+       rootme=`pwd`; export rootme; rootsrc=`cd $(srcdir); pwd`; export rootsrc; $(CC_FOR_TARGET) -g -I $(NWINCLUDES) -c $(NWSOURCE)/prelude.c
+
+i386-nlmstub.o: $(srcdir)/i386-nlmstub.c
+       rootme=`pwd`; export rootme; rootsrc=`cd $(srcdir); pwd`; export rootsrc; $(CC_FOR_TARGET) -g -I $(NWINCLUDES) -c $(srcdir)/i386-nlmstub.c
+
+nlmstub.o: prelude.o i386-nlmstub.o
+       rootme=`pwd`; export rootme; $(LD_FOR_TARGET) -r -o nlmstub.o prelude.o i386-nlmstub.o
+
+nlmstub.nlm: nlmstub.o $(srcdir)/nlmstub.def
+       rootme=`pwd`; export rootme; $(NLMCONV_FOR_TARGET) -T $(srcdir)/nlmstub.def nlmstub.o nlmstub.nlm
+
+nlmstub: nlmstub.nlm
+
+nlm:   force
+       rootme=`pwd`; export rootme; $(MAKE) $(TARGET_FLAGS_TO_PASS) DO=all DODIRS=nlm subdir_do
+
 # 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
@@ -656,84 +689,16 @@ TAGS: $(TAGFILES_NO_SRCDIR) $(TAGFILES_WITH_SRCDIR)
                echo $(srcdir)/$$i ; \
        done ; for i in $(TAGFILES_WITH_SRCDIR); do \
                echo $$i ; \
-       done) | sed -e 's/\.o$$/\.c/'`
+       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 mostlyclean:
        @$(MAKE) $(FLAGS_TO_PASS) DO=clean "DODIRS=$(SUBDIRS)" subdir_do 
        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
@@ -753,6 +718,11 @@ realclean: clean
        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 \
@@ -890,14 +860,19 @@ 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.
 
+HPREAD_SOURCE=
+# start-sanitize-hpread
+HPREAD_SOURCE=hpread.c
+# end-sanitize-hpread
+
 ALLDEPFILES = 29k-share/udi/udip2soc.c 29k-share/udi/udr.c \
        29k-share/udi/udi2go32.c \
        a29k-pinsn.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 \
        convex-tdep.c \
-       convex-xdep.c core-svr4.c coredep.c corelow.c dcache.c delta68-nat.c \
-       dpx2-nat.c dstread.c exec.c fork-child.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-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 \
@@ -912,7 +887,7 @@ ALLDEPFILES = 29k-share/udi/udip2soc.c 29k-share/udi/udr.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 \
+       somread.c $(HPREAD_SOURCE) procfs.c pyr-pinsn.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-os9k.c remote-sim.c \
@@ -926,102 +901,6 @@ ALLDEPFILES = 29k-share/udi/udip2soc.c 29k-share/udi/udr.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-m68klynx.h \
-       config/m68k/nm-sun2.h \
-       config/m68k/nm-sun3.h config/m68k/tm-3b1.h config/m68k/tm-altos.h \
-       config/m68k/tm-apollo68b.h \
-       config/m68k/tm-amix.h \
-       config/m68k/tm-cisco.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-m68klynx.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-m68klynx.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-delta88v4.h \
-       config/m88k/xm-dgux.h config/m88k/xm-m88k.h \
-       config/mips/nm-irix3.h \
-       config/mips/nm-irix4.h config/mips/nm-irix5.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-bigmips64.h \
-       config/mips/tm-idt.h config/mips/tm-idtl.h \
-       config/mips/tm-idt64.h config/mips/tm-idtl64.h \
-       config/mips/tm-irix3.h config/mips/tm-irix5.h \
-       config/mips/tm-mips.h config/mips/tm-mips64.h \
-       config/mips/tm-mipsm3.h config/mips/tm-mipsv4.h \
-       config/mips/xm-irix3.h \
-       config/mips/xm-irix4.h config/mips/xm-irix5.h \
-       config/mips/xm-mips.h \
-       config/mips/xm-mipsm3.h config/mips/xm-mipsv4.h \
-       config/mips/xm-riscos.h config/mips/xm-news-mips.h \
-       config/nm-lynx.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-rs6000ly.h config/rs6000/xm-rs6000ly.h \
-       config/rs6000/nm-rs6000ly.h \
-       config/rs6000/tm-rs6000.h config/rs6000/xm-rs6000.h config/sh/tm-sh.h \
-       config/sparc/nm-sun4os4.h config/sparc/nm-sparclynx.h \
-       config/sparc/tm-sparclite.h config/sparc/tm-sparclynx.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-sparclynx.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 \
        config/a29k/a29k.mt config/a29k/ultra3.mh config/a29k/ultra3.mt \
        config/alpha/alpha-osf1.mh config/alpha/alpha-osf1.mt \
@@ -1106,6 +985,9 @@ 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)
+
+annotate.o: annotate.c $(defs_h) annotate.h $(value_h) target.h $(gdbtypes_h)
+
 arm-pinsn.o: arm-pinsn.c $(OP_INCLUDE)/arm.h $(defs_h) $(symtab_h)
 
 blockframe.o: blockframe.c $(defs_h) $(gdbcore_h) $(inferior_h) \
@@ -1157,13 +1039,16 @@ convex-tdep.o: convex-tdep.c $(wait_h) $(defs_h) $(gdbcmd_h) \
 convex-xdep.o: convex-xdep.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
        $(inferior_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 language.h
 
-coredep.o: coredep.c $(defs_h) $(gdbcore_h) $(value_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 thread.h
@@ -1207,6 +1092,11 @@ 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 thread.h
 
+gdbtk.o: gdbtk.c $(defs_h) $(symtab_h) $(inferior_h) $(command_h) \
+       $(bfd_h) symfile.h objfiles.h target.h
+       $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/gdbtk.c \
+                -DGDBTK_FILENAME=\"$(libdir)/gdbtk.tcl\"
+
 gdbtypes.o: gdbtypes.c $(bfd_h) complaints.h $(defs_h) $(expression_h) \
        $(gdbtypes_h) language.h objfiles.h symfile.h $(symtab_h) target.h \
        $(value_h)
@@ -1292,10 +1182,11 @@ m88k-tdep.o: m88k-tdep.c $(defs_h) $(gdbcore_h) $(inferior_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)/top.c
 
 main.o: main.c top.h $(defs_h)
 
+annotate.o: annotate.c annotate.h $(defs_h) value.h target.h $(gdbtypes_h)
+
 maint.o: maint.c $(defs_h) $(gdbcmd_h) $(gdbtypes_h) $(symtab_h) language.h \
        $(expression_h)
 
@@ -1351,8 +1242,13 @@ 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)
+
+# start-sanitize-hpread
+hpread.o: hpread.c $(bfd_h) buildsym.h complaints.h $(defs_h) \
        gdb-stabs.h objfiles.h symfile.h $(symtab_h)
+# end-sanitize-hpread
 
 parse.o: parse.c $(command_h) $(defs_h) $(expression_h) $(frame_h) \
        $(gdbtypes_h) language.h parser-defs.h $(symtab_h) $(value_h)