* mpw-mh-mpw: Add definitions for various 68K and PowerMac

	compilers, add definitions for library and link steps for
	PowerMacs.

diff --git a/config/mpw-mh-mpw b/config/mpw-mh-mpw
index c5c4ea1bb46a2e99d2ba1b073559e4a7dc75b6ba..379b675400961fa86f37f3f2f8bafdadbc0fce97 100644 (file)
--- a/config/mpw-mh-mpw
+++ b/config/mpw-mh-mpw
@@ -1,17 +1,88 @@
 # This is an MPW makefile fragment.
 
-CC = C -d MPW_C -d ALMOST_STDC -d ANSI_PROTOTYPES
+# Since there are a multiplicity of Mac compilers and two different
+# processors, this file is primarily a library of options for each
+# compiler.  Somebody else (such as a configure or build script) will
+# make the actual choice.
 
-CFLAGS = -d MPW -w -mc68020 -model far -b
+# Compiler to use for compiling.
 
-LDFLAGS =  -w -d -model far -c 'MPS ' -t MPST
+CC_MPW_C = C -d MPW_C -d ALMOST_STDC -d ANSI_PROTOTYPES -d MPW -mc68020 -model far -b -w
+
+CC_SC = SC -d ALMOST_STDC -d ANSI_PROTOTYPES -d MPW -mc68020 -model far -b -i '' -i :
+
+CC_MWC68K = MWC68K -d MPW -i "{topsrcdir}"include:mpw:sys:
+
+CC_PPCC = PPCC -d powerc=1 -d pascal= -d ALMOST_STDC -d ANSI_PROTOTYPES -d MPW -w
+
+CC_MRC = MrC -d powerc=1 -d pascal= -d ALMOST_STDC -d ANSI_PROTOTYPES -d MPW -i '' -i : -jm
+
+CC_SMrC = SMrC -d MPW
+
+CC_MWCPPC = MWCPPC -d MPW -i "{topsrcdir}"include:mpw:sys: -enum int -opt global,peep,l4,speed
+
+CC_68K_GCC = gC -Dpascal= -DANSI_PROTOTYPES -DMPW
+
+CC_PPC_GCC = gC -Dpowerc=1 -Dpascal= -DANSI_PROTOTYPES -DMPW
+
+# Nothing for the default CFLAGS.
+
+CFLAGS = 
+
+# These two definitions must *not* have any trailing blanks.
+
+SEGFLAG_68K = -s 
+
+SEGFLAG_PPC = -d dumdum_ 
+
+# Tool to use for making libraries/archives.
+
+AR_LIB = Lib
+
+AR_MWLINK68K = MWLink68K
+
+AR_PPCLINK = PPCLink -xm library
+
+AR_MWLINKPPC = MWLinkPPC -xm library
+
+AR_FLAGS = -o
+
+RANLIB_NULL = null-command
+
+RANLIB_RANLIB = ranlib
+
+# Compiler and/or linker to use for linking.
+
+CC_LD_LINK = Link -w -d -model far {CC_LD_TOOL_FLAGS}
+
+CC_LD_MWLINK68K = MWLink68K -w -d -model far {CC_LD_TOOL_FLAGS}
+
+CC_LD_PPCLINK = PPCLink -main __start -outputformat xcoff
+
+CC_LD_MWLINKPPC = MWLinkPPC -w {CC_LD_TOOL_FLAGS}
+
+CC_LD_GLD = gC
+
+# Extension for linker output.
+
+PROG_EXT_68K =
+
+PROG_EXT_XCOFF = .xcoff
+
+# Nothing for the default LDFLAGS.
+
+LDFLAGS = -w
+
+CC_LD_TOOL_FLAGS = -c 'MPS ' -t MPST
+
+# Libraries to link against.
 
 # It would appear that the math libraries are not
 # needed except to provide a definition for scalb,
 # which is called from ldexp, which is referenced
 # in the m68k opcodes library.
 
-EXTRALIBS = \Option-d
+EXTRALIBS_C = \Option-d
        "{CLibraries}"StdClib.o \Option-d
        "{CLibraries}"Math.o \Option-d
        "{CLibraries}"CSANELib.o \Option-d
@@ -19,3 +90,37 @@ EXTRALIBS = \Option-d
        "{Libraries}"Runtime.o \Option-d
        "{Libraries}"Interface.o \Option-d
        "{Libraries}"ToolLibs.o
+
+EXTRALIBS_PPC = \Option-d
+       "{PPCLibraries}"InterfaceLib.xcoff \Option-d
+       "{PPCLibraries}"MathLib.xcoff \Option-d
+       "{PPCLibraries}"StdCLib.xcoff \Option-d
+       "{PPCLibraries}"PPCToolLibs.o \Option-d
+       "{PPCLibraries}"StdCRuntime.o \Option-d
+       "{PPCLibraries}"PPCCRuntime.o
+
+EXTRALIBS_MWCPPC = \Option-d
+       "{MWPPCLibraries}"InterfaceLib \Option-d
+       "{MWPPCLibraries}"MWStdCRuntime.Lib \Option-d
+       "{MWPPCLibraries}"StdCLib \Option-d
+       "{MWPPCLibraries}"PPCToolLibs.o
+
+# Tool to make PEF with, if needed.
+
+MAKEPEF_NULL = null-command
+
+MAKEPEF_PPC = MakePEF
+
+MAKEPEF_FLAGS = \Option-d
+       -l InterfaceLib.xcoff=InterfaceLib \Option-d
+       -l MathLib.xcoff=MathLib \Option-d
+       -l StdCLib.xcoff=StdCLib
+
+MAKEPEF_TOOL_FLAGS = -ft MPST -fc 'MPS '
+
+# Resource compiler to use.
+
+REZ_68K = Rez
+
+REZ_PPC = Rez -d WANT_CFRG
+