From b208ff3b5ad6efea86239bd20391f6805d482653 Mon Sep 17 00:00:00 2001
From: Stan Shebs <shebs@codesourcery.com>
Date: Fri, 16 Aug 1996 20:53:56 +0000
Subject: [PATCH] 	* mpw-make.sed: Update for various recent changes, add
 some 	comments. start-sanitize-gm 	* mpw-config.in: Fix name of Magic
 Cap-specific file. end-sanitize-gm

---
 gdb/ChangeLog     |  8 ++++++++
 gdb/mpw-config.in |  2 +-
 gdb/mpw-make.sed  | 16 +++++++---------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3217c2ed67..497c4550a7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+Fri Aug 16 13:52:21 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-make.sed: Update for various recent changes, add some
+	comments.
+start-sanitize-gm
+	* mpw-config.in: Fix name of Magic Cap-specific file.
+end-sanitize-gm
+
 Fri Aug 16 15:47:36 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
 	* config/rs6000/tm-rs6000.h (FIX_CALL_DUMMY): Cast args to be an
diff --git a/gdb/mpw-config.in b/gdb/mpw-config.in
index a969eabcf6..5e71ba8105 100644
--- a/gdb/mpw-config.in
+++ b/gdb/mpw-config.in
@@ -46,7 +46,7 @@ Else If "{target_canonical}" =~ /mips-gm-magic/
 	forward-include "{srcdir}"config:mips:tm-embed.h tm.h
 	forward-include "{srcdir}"config:mips:tm-bigmips.h 'mips/tm-bigmips.h'
 	forward-include "{srcdir}"config:mips:tm-mips.h 'mips/tm-mips.h'
-	Set tdepfiles '"{o}"mips-tdep.c.o "{o}"remote-mips.c.o "{o}"magic.c.o'
+	Set tdepfiles '"{o}"mips-tdep.c.o "{o}"remote-mips.c.o "{o}"gmagic.c.o'
 	If {host_cc} =~ /gcc/
 		Set enable_cflags '-DGENERAL_MAGIC'
 	Else
diff --git a/gdb/mpw-make.sed b/gdb/mpw-make.sed
index 7275c9b49a..ad62071996 100644
--- a/gdb/mpw-make.sed
+++ b/gdb/mpw-make.sed
@@ -16,7 +16,7 @@
 /^MMALLOC_DIR = /s/::mmalloc/mmalloc:/
 /^MMALLOC_SRC = /s/"{srcdir}"/"{topsrcdir}"/
 /^MMALLOC =/s/=.*$/=/
-/#MMALLOC_DISABLE/s/^#//
+/MMALLOC_CFLAGS =/s/=.*$/= -d NO_MMALLOC/
 
 /^BFD_DIR = /s/::bfd/bfd:/
 /^BFD = /s/{BFD_DIR}:libbfd/{BFD_DIR}libbfd/
@@ -32,17 +32,12 @@
 
 /^TERMCAP =/s/ =.*$/ =/
 
-# Whack out autoconf hook for thread debugging.
+# Whack out various autoconf vars that we don't need.
 /@CONFIG_LDFLAGS@/s/@CONFIG_LDFLAGS@//g
-
 /@DEFS@/s/@DEFS@//g
-
 /@YACC@/s/@YACC@/byacc/g
-
 /@ENABLE_OBS@/s/@ENABLE_OBS@//g
-
 /@ENABLE_CLIBS@/s/@ENABLE_CLIBS@//g
-
 /@LIBS@/s/@LIBS@//g
 
 # Whack out autoconf hook for thread debugging.
@@ -66,8 +61,6 @@
 readline_headers =\
 
 
-/{MMALLOC_CHECK}/s/{MMALLOC_CHECK}//g
-
 # This isn't really useful, and seems to cause nonsensical complaints.
 /{ALLDEPFILES}/s/{ALLDEPFILES}//g
 
@@ -99,6 +92,7 @@ readline_headers =\
 /init/s/"{s}"init\.c/"{o}"init.c/g
 /init/s/^init\.c/"{o}"init.c/
 
+# Fix up the generation of version.c.
 /"{o}"version.c \\Option-f Makefile/,/^$/c\
 "{o}"version.c \\Option-f Makefile\
 	echo -n 'char *version = "'	 >"{o}"version.c\
@@ -112,6 +106,8 @@ readline_headers =\
 	echo '";'			>>"{o}"version.c\
 
 
+/ansidecl/s/include "{s}""ansidecl.h"/include "ansidecl.h"/
+
 # Open-brace in a command causes much confusion; replace with the
 # result from a script.
 /initialize_all_files ()/c\
@@ -145,6 +141,7 @@ readline_headers =\
 	{MAKEPEF} gdb{PROG_EXT} -o gdb {MAKEPEF_TOOL_FLAGS} {MAKEPEF_FLAGS}\
 	{REZ} "{s}"mac-gdb.r -o gdb -append -d PROG_NAME='"'gdb'"' -d VERSION_STRING='"'{version}'"'\
 
+# Replace the install actions with MPW-friendly script.
 /^install \\Option-f /,/^$/c\
 install \\Option-f all install-only\
 \
@@ -162,6 +159,7 @@ install-only \\Option-f \
 /^config.status \\Option-f/,/^$/d
 /^Makefile \\Option-f/,/^$/d
 
+# Don't test config.h dependencies.
 /^"{o}"config.h \\Option-f/s/^/#/
 
 # Add an action to build SIOWgdb.