* config/i386/{i386aix.mh, i386bsd.mh, i386lynx.mh, i386sco.mh,

	i386sco4.mh, i386sol2.mh, i386v.mh, i386v32.mh, i386v4.mh,
	ncr3000.mh, ptx.mh, ptx4.mh}, config/m68k/{altos.mh, apollo68v.mh,
	delta68.mh, dpx2.mh, hp300bsd.mh, hp300hpux.mh, m68klynx.mh,
	m68kv4.mh}, config/m88k/{delta88.mh, delta88v4.mh},
	config/mips/riscos.mh, config/pa/hppahpux.mh,
	config/sparc/{sparclynx.mh, sun4sol2.mh}, config/tahoe/tahoe.mh,
	config/vax/{vaxbsd.mh, vaxult.mh, vaxult2.mh} (REGEX, REGEX1,
	SYSV_DEFINE): No longer define.
	* config/i386/i386sco4.mh (MUNCH_DEFINE): No longer define.

6 files changed, 27 insertions, 24 deletions

diff --git a/gdb/config/i386/i386aix.mh b/gdb/config/i386/i386aix.mh
index 0e7fd75..751f813 100644
--- a/gdb/config/i386/i386aix.mh
+++ b/gdb/config/i386/i386aix.mh
@@ -1,10 +1,12 @@
 # Host: IBM PS/2 (i386) running AIX PS/2
-XDEPFILES= 
+
 XM_FILE= xm-i386aix.h
+XDEPFILES= 
+
 NAT_FILE= nm-i386aix.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o i386aix-nat.o
-REGEX=regex.o
-REGEX1=regex.o
+
 TERMCAP=-lcurses
+
 # Use gcc. Only coff output can be debugged
 CC=gcc
diff --git a/gdb/config/i386/i386bsd.mh b/gdb/config/i386/i386bsd.mh
index c918376..2515662 100644
--- a/gdb/config/i386/i386bsd.mh
+++ b/gdb/config/i386/i386bsd.mh
@@ -1,7 +1,7 @@
 # Host: Intel 386 running 386BSD
-XDEPFILES= 
-NATDEPFILES= exec.o fork-child.o infptrace.o inftarg.o corelow.o coredep.o i386b-nat.o
+
 XM_FILE= xm-i386bsd.h
+XDEPFILES= 
+
 NAT_FILE= nm-i386bsd.h
-REGEX=regex.o
-REGEX1=regex.o
+NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o coredep.o i386b-nat.o
diff --git a/gdb/config/i386/i386lynx.mh b/gdb/config/i386/i386lynx.mh
index 01e9cb3..9cb086f 100644
--- a/gdb/config/i386/i386lynx.mh
+++ b/gdb/config/i386/i386lynx.mh
@@ -1,10 +1,11 @@
 # Host: Intel 386 running LynxOS
+
 XM_FILE= xm-i386lynx.h
 XM_CLIBS= -lbsd
 XDEPFILES= ser-tcp.o
+
 NAT_FILE= nm-i386lynx.h
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o lynx-nat.o
-REGEX=regex.o
-REGEX1=regex.o
+
 GDBSERVER_LIBS= -lbsd
 GDBSERVER_DEPFILES= low-lynx.o
diff --git a/gdb/config/i386/i386v32.mh b/gdb/config/i386/i386v32.mh
index 595aaad..ada9736 100644
--- a/gdb/config/i386/i386v32.mh
+++ b/gdb/config/i386/i386v32.mh
@@ -1,9 +1,9 @@
 # Host: Intel 386 running System V release 3.2
-XDEPFILES= 
+
 XM_FILE= xm-i386v32.h
+XDEPFILES= 
+XM_CLIBS= -lPW
+
 NAT_FILE= nm-i386v.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o coredep.o corelow.o i386v-nat.o
-XM_CLIBS= -lPW
-SYSV_DEFINE=-DSYSV
-REGEX=regex.o
-REGEX1=regex.o
+
diff --git a/gdb/config/i386/ptx.mh b/gdb/config/i386/ptx.mh
index 20e17d8..256d2fa 100644
--- a/gdb/config/i386/ptx.mh
+++ b/gdb/config/i386/ptx.mh
@@ -1,7 +1,7 @@
-# Host: Sequent Symmetry running ptx 1.3, with Weitek 1167 or i387.
-XDEPFILES= inftarg.o fork-child.o symm-nat.o corelow.o coredep.o
+# Host: Sequent Symmetry running ptx 1.3, with Weitek 1167 or i387
+
 XM_FILE= xm-ptx.h
-NAT_FILE= nm-symmetry.h
+XDEPFILES= inftarg.o fork-child.o symm-nat.o corelow.o coredep.o
 XM_CLIBS= -lPW -lseq
-REGEX=regex.o
-REGEX1=regex.o
+
+NAT_FILE= nm-symmetry.h
diff --git a/gdb/config/i386/ptx4.mh b/gdb/config/i386/ptx4.mh
index dd06a9c..3a7c740 100644
--- a/gdb/config/i386/ptx4.mh
+++ b/gdb/config/i386/ptx4.mh
@@ -1,7 +1,7 @@
-# Host: Sequent Symmetry running ptx 1.3, with Weitek 1167 or i387.
-XDEPFILES= inftarg.o fork-child.o symm-nat.o corelow.o coredep.o solib.o core-svr4.o
+# Host: Sequent Symmetry running ptx 1.3, with Weitek 1167 or i387
+
 XM_FILE= xm-ptx4.h
-NAT_FILE= nm-ptx4.h
+XDEPFILES= inftarg.o fork-child.o symm-nat.o corelow.o coredep.o solib.o core-svr4.o
 XM_CLIBS= -lseq
-REGEX=regex.o
-REGEX1=regex.o
+
+NAT_FILE= nm-ptx4.h