* Makefile.in: Numerous small changes to macro definitions

	and rules for building gdb distribution tree.  Many macros
	eliminated or merged, and rules simplified.
	* alldeps.mak:  Update.
	* depend:  Update.

1 files changed, 135 insertions, 145 deletions

diff --git a/gdb/alldeps.mak b/gdb/alldeps.mak
index 6ba742e..fa4e118 100644
--- a/gdb/alldeps.mak
+++ b/gdb/alldeps.mak
@@ -1,6 +1,7 @@
 # Start of "alldeps.mak" definitions
-ALLDEPFILES = $(ALLDEPFILES_MAINDIR) $(ALLDEPFILES_SUBDIR) $(ALLDEP_FILES_SUBSUBDIR)
-ALLDEPFILES_MAINDIR=\
+ALLDEPFILES=\
+29k-share/udi/udip2soc.c\
+29k-share/udi/udr.c\
 a68v-nat.c\
 altos-xdep.c\
 am29k-pinsn.c\
@@ -51,6 +52,10 @@ mips-nat.c\
 mips-pinsn.c\
 mips-tdep.c\
 news-xdep.c\
+nindy-share/Onindy.c\
+nindy-share/nindy.c\
+nindy-share/ttybreak.c\
+nindy-share/ttyflush.c\
 nindy-tdep.c\
 ns32k-pinsn.c\
 paread.c\
@@ -88,155 +93,140 @@ ultra3-nat.c\
 ultra3-xdep.c\
 umax-xdep.c\
 vax-pinsn.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
 
-ALLDEPFILES_SUBDIR=\
-nindy-share/Onindy.c\
-nindy-share/nindy.c\
-nindy-share/ttybreak.c\
-nindy-share/ttyflush.c\
-vx-share/xdr_ld.c\
-vx-share/xdr_ptrace.c\
-vx-share/xdr_rdb.c
-
-ALLDEPFILES_SUBSUBDIR=\
-../opcodes/libopcodes.a\
-../sim/h8300/code.c\
-../sim/h8300/perifs.c\
-../sim/h8500/compile.c\
-../sim/z8k/libsim.a\
-29k-share/udi/udip2soc.c\
-29k-share/udi/udr.c
-
 ALLPARAM=\
-config/a29k/nm-ultra3.h\
-config/a29k/tm-ultra3.h\
-config/a29k/xm-ultra3.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-i386bsd.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/tm-i386bsd.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-i386bsd.h\
-config/i386/xm-i386mach.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/i860/tm-stratus.h\
-config/i860/xm-stratus.h\
-config/i960/tm-nindy960.h\
-config/i960/tm-vx960.h\
-config/m68k/nm-apollo68b.h\
-config/m68k/nm-apollo68v.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-68k-fp.h\
-config/m68k/tm-68k-nofp.h\
-config/m68k/tm-altos.h\
-config/m68k/tm-amix.h\
-config/m68k/tm-es1800.h\
-config/m68k/tm-hp300bsd.h\
-config/m68k/tm-hp300hpux.h\
-config/m68k/tm-isi.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-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-m88k.h\
-config/m88k/tm-delta88.h\
-config/m88k/tm-m88k.h\
-config/m88k/xm-delta88.h\
-config/m88k/xm-m88k.h\
-config/mips/nm-irix3.h\
-config/mips/nm-irix4.h\
-config/mips/nm-mips.h\
-config/mips/tm-bigmips.h\
-config/mips/tm-irix3.h\
-config/mips/tm-mips.h\
-config/mips/xm-bigmips.h\
-config/mips/xm-irix3.h\
-config/mips/xm-irix4.h\
-config/mips/xm-mips.h\
-config/nm-sysv4.h\
-config/ns32k/nm-umax.h\
-config/ns32k/tm-merlin.h\
-config/ns32k/tm-umax.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/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/sparc/nm-sun4os4.h\
-config/sparc/tm-spc-em.h\
-config/sparc/tm-sun4os4.h\
-config/sparc/tm-sun4sol2.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
+./config/a29k/nm-ultra3.h\
+./config/a29k/tm-ultra3.h\
+./config/a29k/xm-ultra3.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-i386bsd.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/tm-i386bsd.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-i386bsd.h\
+./config/i386/xm-i386mach.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/i860/tm-stratus.h\
+./config/i860/xm-stratus.h\
+./config/i960/tm-nindy960.h\
+./config/i960/tm-vx960.h\
+./config/m68k/nm-apollo68b.h\
+./config/m68k/nm-apollo68v.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-68k-fp.h\
+./config/m68k/tm-68k-nofp.h\
+./config/m68k/tm-altos.h\
+./config/m68k/tm-amix.h\
+./config/m68k/tm-es1800.h\
+./config/m68k/tm-hp300bsd.h\
+./config/m68k/tm-hp300hpux.h\
+./config/m68k/tm-isi.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-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-m88k.h\
+./config/m88k/tm-delta88.h\
+./config/m88k/tm-m88k.h\
+./config/m88k/xm-delta88.h\
+./config/m88k/xm-m88k.h\
+./config/mips/nm-irix3.h\
+./config/mips/nm-irix4.h\
+./config/mips/nm-mips.h\
+./config/mips/tm-bigmips.h\
+./config/mips/tm-irix3.h\
+./config/mips/tm-mips.h\
+./config/mips/xm-bigmips.h\
+./config/mips/xm-irix3.h\
+./config/mips/xm-irix4.h\
+./config/mips/xm-mips.h\
+./config/nm-sysv4.h\
+./config/ns32k/nm-umax.h\
+./config/ns32k/tm-merlin.h\
+./config/ns32k/tm-umax.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/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/sparc/nm-sun4os4.h\
+./config/sparc/tm-spc-em.h\
+./config/sparc/tm-sun4os4.h\
+./config/sparc/tm-sun4sol2.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\