diff options
author | YAMAMOTO Mitsuharu <[email protected]> | 2005-03-04 11:13:42 +0000 |
---|---|---|
committer | YAMAMOTO Mitsuharu <[email protected]> | 2005-03-04 11:13:42 +0000 |
commit | 1c94a3868b8e83688baf36244374d1d014c4d8a7 (patch) | |
tree | a2d4eb2a00a0ab94728b8c8f5613b462eba00d29 | |
parent | 1ff5c655e87f119bffea9972502d71ea51909b1e (diff) |
(NonCarbon): New target. The target `Emacs' is now used for the
Carbon build that defines HAVE_CARBON.
-rw-r--r-- | mac/makefile.MPW | 45 |
1 files changed, 31 insertions, 14 deletions
diff --git a/mac/makefile.MPW b/mac/makefile.MPW index 92840d9c73..39795ba22b 100644 --- a/mac/makefile.MPW +++ b/mac/makefile.MPW @@ -21,7 +21,8 @@ # Boston, MA 02111-1307, USA. */ # # Defines the following targets: -# Emacs (default) - normal Emacs build. +# Emacs (default) - normal Carbon Emacs build. +# NonCarbon - non-Carbon Emacs build. # Clean - remove all object and executable files to prepare for a fresh build. # Doc - generate the "DOC" file in ~emacs/etc/. # Make-DocFile - build the make-docfile tool, utility for generating "DOC". @@ -38,7 +39,9 @@ Lisp = ::lisp: # emacs's lisp directory Make-DocFileDir = {Lib-Src} # directory containing make-docfile tool Makefile = makefile.MPW # self reference +NonCarbonMakeOut = NonCarbon.MakeOut # temporary file for non-Carbon build script +CarbonOption = -d HAVE_CARBON SymOption = # -sym on # remove hash mark before "-sym on" to enable source debugging OptOption = # -opt speed # alternatively set to -opt off or -opt size @@ -47,7 +50,7 @@ OptOption = # -opt speed # alternatively set to -opt off or -opt size PPCCOptions = {SymOption} {OptOption} -noMapCR -enum int -alloca � -typecheck relaxed -w off � -includes unix -i {Includes},{Src} � - -d emacs=1 -d HAVE_CONFIG_H -d MAC_OS -d MAC_OS8 + -d emacs=1 -d HAVE_CONFIG_H -d MAC_OS -d MAC_OS8 {CarbonOption} LinkOptions = {SymOption} -d @@ -132,29 +135,42 @@ MacObjects = � "{Src}macmenu.c.x" � "{Src}macterm.c.x" +StdLibraries = � + "{SharedLibraries}CarbonLib" � + "{SharedLibraries}StdCLib" � + "{PPCLibraries}StdCRuntime.o" � + "{PPCLibraries}PPCCRuntime.o" + +NonCarbonLibs = � + "{SharedLibraries}InterfaceLib" � + "{SharedLibraries}StdCLib" � + "{SharedLibraries}MathLib" � + "{SharedLibraries}AppleScriptLib" � + "{SharedLibraries}TextEncodingConverter" � + "{SharedLibraries}AppearanceLib" � + "{SharedLibraries}QuickTimeLib" � + "{PPCLibraries}StdCRuntime.o" � + "{PPCLibraries}PPCCRuntime.o" � + "{PPCLibraries}PPCToolLibs.o" + # The next two are the dependency rules for building Emacs. Emacs �� {Makefile} {DocTarget}DOC {EmacsObjects} {MacObjects} PPCLink � {LinkOptions} � {EmacsObjects} {MacObjects} � - "{SharedLibraries}InterfaceLib" � - "{SharedLibraries}StdCLib" � - "{SharedLibraries}MathLib" � - "{SharedLibraries}AppleScriptLib" � - "{SharedLibraries}TextEncodingConverter" � - "{SharedLibraries}AppearanceLib" � - "{SharedLibraries}QuickTimeLib" � - "{PPCLibraries}StdCRuntime.o" � - "{PPCLibraries}PPCCRuntime.o" � - "{PPCLibraries}PPCToolLibs.o" � + {StdLibraries} � -o "{EmacsTarget}" Emacs �� {Makefile} "{Source}"Emacs.maclf.r "{Source}"EmacsMPW.maclf.r - Rez -a "{Source}"Emacs.maclf.r -o "{EmacsTarget}" - Rez -a "{Source}"EmacsMPW.maclf.r -o "{EmacsTarget}" + Rez {CarbonOption} -a "{Source}"Emacs.maclf.r -o "{EmacsTarget}" + Rez {CarbonOption} -a "{Source}"EmacsMPW.maclf.r -o "{EmacsTarget}" SetFile "{EmacsTarget}" -t APPL -c 'EMAx' -a B +NonCarbon � + Make -f "{Makefile}" -d CarbonOption="" -d StdLibraries='{NonCarbonLibs}' > "{NonCarbonMakeOut}" + "{NonCarbonMakeOut}" + # Rez cannot handle files with Unix style end lines at all. So generate # them. It does not hurt if Emacs.r and EmacsMPW.r already have Mac end # lines. @@ -951,6 +967,7 @@ Clean � Delete -i stdout stderr Delete -i {Make-DocFile-Objects} {Make-DocFileDir}make-docfile Delete -i "{Source}"Emacs.maclf.r "{Source}"EmacsMPW.maclf.r + Delete -i "{NonCarbonMakeOut}" DistClean � Clean Delete -i "Emacs CW"� |