From: Horst Beepmanh <> Subject: Rip out include-file deps Messy and unhelpful --- diff --git a/DeclData/DeclData.make b/DeclData/DeclData.make --- a/DeclData/DeclData.make +++ b/DeclData/DeclData.make @@ -39,22 +39,7 @@ DeclResources = "{RsrcDir}DeclData.rsrc" ∂ "{RsrcDir}DeclDataVideo.rsrc" ∂ "{RsrcDir}Gamma.rsrc" -DeclHeaders = "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}GestaltEqu.a" ∂ - "{AIncludes}ShutDown.a" ∂ - "{AIncludes}ROMEqu.a" ∂ - "{AIncludes}Video.a" ∂ - "{IntAIncludes}DockingEqu.a" ∂ - "{IntAIncludes}EgretEqu.a" ∂ - "{IntAIncludes}GestaltPrivateEqu.a" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}IOPrimitiveEqu.a" ∂ - "{IntAIncludes}PowerPrivEqu.a" ∂ - "{AIncludes}Slots.a" ∂ - "{IntAIncludes}SlotMgrEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}DepVideoEqu.a" ∂ - "{SonicDir}SonicEqu.a" +DeclHeaders = "{SonicDir}SonicEqu.a" # # DeclData @@ -63,13 +48,7 @@ DeclHeaders = "{ObjDir}StandardEqu.d" ∂ "{RsrcDir}RomLink" {DeclResources} -o "{Targ}" -"{RsrcDir}DeclData.rsrc" ƒ "{RIncludes}Types.r" ∂ - "{IntRIncludes}DepVideoEqu.r" ∂ - "{IntRIncludes}HardwarePrivateEqu.r" ∂ - "{IntRIncludes}InternalOnlyEqu.r" ∂ - "{IntRIncludes}QuickDraw.r" ∂ - "{IntRIncludes}ROMLink.r" ∂ - "{DeclDir}DeclData.r" +"{RsrcDir}DeclData.rsrc" ƒ "{DeclDir}DeclData.r" Rez {StdROpts} "{DeclDir}DeclData.r" -o "{Targ}" @@ -117,22 +96,14 @@ DeclHeaders = "{ObjDir}StandardEqu.d" ∂ # Ethernet # -"{ObjDir}Loopback.c.o" ƒ "{EthernetDir}Loopback.c" ∂ - "{CIncludes}TextUtils.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Devices.h" ∂ - "{CIncludes}Files.h" ∂ - "{CIncludes}AppleTalk.h" ∂ - "{CIncludes}OSUtils.h" +"{ObjDir}Loopback.c.o" ƒ "{EthernetDir}Loopback.c" C {StdCOpts} -b -o "{Targ}" "{EthernetDir}Loopback.c" # # Gamma Resource # -"{RsrcDir}Gamma.rsrc" ƒ "{RIncludes}Types.r" ∂ - "{IntRIncludes}ROMLink.r" ∂ - "{GammaDir}Gamma.r" +"{RsrcDir}Gamma.rsrc" ƒ "{GammaDir}Gamma.r" Rez {StdROpts} "{GammaDir}Gamma.r" -o "{Targ}" diff --git a/DeclData/DeclNet/Mace/Mace.make b/DeclData/DeclNet/Mace/Mace.make --- a/DeclData/DeclNet/Mace/Mace.make +++ b/DeclData/DeclNet/Mace/Mace.make @@ -46,17 +46,7 @@ "{MaceDir}VersionMaceEnet.a" ∂ "{EthernetDir}AtalkMacros.a" ∂ "{EthernetDir}ENETEqu.a" ∂ - "{EthernetDir}SNMPLAP.a" ∂ - "{AIncludes}GestaltEqu.a" ∂ - "{AIncludes}Slots.a" ∂ - "{AIncludes}SysEqu.a" ∂ - "{AIncludes}SysErr.a" ∂ - "{AIncludes}Timer.a" ∂ - "{AIncludes}Traps.a" ∂ - "{IntAIncludes}HardwarePrivateEqu.a"∂ - "{IntAIncludes}InternalOnlyEqu.a" ∂ - "{IntAIncludes}PSCEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" + "{EthernetDir}SNMPLAP.a" Asm {StdAOpts} -i "{MaceDir}" -i "{EthernetDir}" -o "{Targ}" "{MaceDir}MaceEnet.a" @@ -64,14 +54,5 @@ "{MaceDir}MaceEqu.a" ∂ "{EthernetDir}AtalkMacros.a" ∂ "{EthernetDir}ENETEqu.a" ∂ - "{EthernetDir}SNMPLAP.a" ∂ - "{AIncludes}GestaltEqu.a" ∂ - "{AIncludes}SysEqu.a" ∂ - "{AIncludes}SysErr.a" ∂ - "{AIncludes}Traps.a" ∂ - "{IntAIncludes}SysPrivateEqu.a" ∂ - "{IntAIncludes}HardwarePrivateEqu.a"∂ - "{IntAIncludes}InternalOnlyEqu.a" ∂ - "{IntAIncludes}PSCEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" + "{EthernetDir}SNMPLAP.a" Asm {StdAOpts} -i "{MaceDir}" -i "{EthernetDir}" -o "{Targ}" "{MaceDir}Mace.a" diff --git a/DeclData/DeclNet/Mace/PDMMaceEnet/PDMEnet.make b/DeclData/DeclNet/Mace/PDMMaceEnet/PDMEnet.make --- a/DeclData/DeclNet/Mace/PDMMaceEnet/PDMEnet.make +++ b/DeclData/DeclNet/Mace/PDMMaceEnet/PDMEnet.make @@ -58,8 +58,6 @@ "{ObjDir}PDMMace.a.o" ƒ "{PDMMaceDir}PDMMace.a" ∂ "{PDMMaceDir}PDMMaceEqu.a" ∂ - "{IntAIncludes}AMICEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ "{EthernetDir}ATalkMacros.a" ∂ "{PDMMaceDir}PDMEnet.make" Asm {StdAOpts} {Defs} -i "{PDMMaceDir}" -i "{EthernetDir}" -o "{Targ}" "{PDMMaceDir}PDMMace.a" @@ -71,13 +69,6 @@ "{EthernetDir}ATalkMacros.a" ∂ "{EthernetDir}ENETEqu.a" ∂ "{EthernetDir}SNMPLAP.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}AMICEqu.a" ∂ - "{AIncludes}GestaltEqu.a" ∂ - "{AIncludes}SysEqu.a" ∂ - "{AIncludes}SysErr.a" ∂ - "{AIncludes}Traps.a" ∂ - "{AIncludes}Slots.a" ∂ "{PDMMaceDir}PDMEnet.make" Asm {StdAOpts} {Defs} -i "{PDMMaceDir}" -i "{EthernetDir}" -o "{Targ}" "{PDMMaceDir}PDMMaceEnet.a" diff --git a/DeclData/DeclNet/Sonic/Sonic.make b/DeclData/DeclNet/Sonic/Sonic.make --- a/DeclData/DeclNet/Sonic/Sonic.make +++ b/DeclData/DeclNet/Sonic/Sonic.make @@ -24,13 +24,7 @@ "{SonicDir}SonicEqu.a" ∂ "{SonicDir}VersionEclipse.a" ∂ "{EthernetDir}AtalkMacros.a" ∂ - "{EthernetDir}ENETEqu.a" ∂ - "{AIncludes}GestaltEqu.a" ∂ - "{AIncludes}Slots.a" ∂ - "{AIncludes}SysEqu.a" ∂ - "{AIncludes}SysErr.a" ∂ - "{AIncludes}ToolUtils.a" ∂ - "{AIncludes}Traps.a" + "{EthernetDir}ENETEqu.a" Asm {StdAOpts} -d ForEclipseROM=0,sonic32=1,ctlpad=0,mmu=1 -i "{SonicDir}" -i "{EthernetDir}" -o "{Targ}" "{SonicDir}SonicEnet.a" diff --git a/DeclData/DeclVideo/VideoDrivers.make b/DeclData/DeclVideo/VideoDrivers.make --- a/DeclData/DeclVideo/VideoDrivers.make +++ b/DeclData/DeclVideo/VideoDrivers.make @@ -38,14 +38,7 @@ TimVideoDir = {VideoDir}Tim: V8VideoDir = {VideoDir}V8: ATIVideoDir = {VideoDir}ATI: -CommonHeaders = "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{AIncludes}ROMEqu.a" ∂ - "{AIncludes}Video.a" ∂ - "{IntAIncludes}SlotMgrEqu.a" ∂ - "{AIncludes}Slots.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}DepVideoEqu.a" +CommonHeaders = # # Video Resource @@ -90,12 +83,7 @@ CommonHeaders = "{ObjDir}StandardEqu.d" ∂ # CivicHeaders = {CommonHeaders} -"{RsrcDir}CivicDeclVideo.rsrc" ƒ "{CivicVideoDir}CivicDeclVideo.r" ∂ - "{IntRIncludes}DepVideoEqu.r" ∂ - "{IntRIncludes}HardwarePrivateEqu.r" ∂ - "{IntRIncludes}InternalOnlyEqu.r" ∂ - "{IntRIncludes}Quickdraw.r" ∂ - "{IntRIncludes}ROMLink.r" +"{RsrcDir}CivicDeclVideo.rsrc" ƒ "{CivicVideoDir}CivicDeclVideo.r" Rez -t rsrc -c RSED {StdROpts} "{CivicVideoDir}CivicDeclVideo.r" -o "{RsrcDir}CivicDeclVideo.rsrc" "{RsrcDir}CivicDriver.rsrc" ƒ "{ObjDir}CivicDriver.a.o" ∂ @@ -129,12 +117,7 @@ CivicHeaders = {CommonHeaders} # # CSC Video Code # -"{RsrcDir}CSCDeclVideo.rsrc" ƒ "{CSCVideoDir}CSCDeclVideo.r" ∂ - "{IntRIncludes}DepVideoEqu.r" ∂ - "{IntRIncludes}HardwarePrivateEqu.r" ∂ - "{IntRIncludes}InternalOnlyEqu.r" ∂ - "{IntRIncludes}Quickdraw.r" ∂ - "{IntRIncludes}ROMLink.r" +"{RsrcDir}CSCDeclVideo.rsrc" ƒ "{CSCVideoDir}CSCDeclVideo.r" Rez {StdROpts} "{CSCVideoDir}CSCDeclVideo.r" -o "{RsrcDir}CSCDeclVideo.rsrc" "{RsrcDir}CSCDriver.rsrc" ƒ "{ObjDir}CSCDriver.a.o" ∂ @@ -185,19 +168,10 @@ CivicHeaders = {CommonHeaders} # # Sonora Video Driver # -SonoraHeaders = "{IntAIncludes}AMICEqu.a" ∂ - "{IntAIncludes}EgretEqu.a" ∂ - "{AIncludes}GestaltEqu.a" ∂ - "{IntAIncludes}IOPrimitiveEqu.a" ∂ - "{SonicDir}SonicEqu.a" ∂ +SonoraHeaders = "{SonicDir}SonicEqu.a" ∂ {CommonHeaders} -"{RsrcDir}SonoraDeclVideo.rsrc" ƒ "{SonoraVideoDir}SonoraDeclVideo.r" ∂ - "{IntRIncludes}DepVideoEqu.r" ∂ - "{IntRIncludes}HardwarePrivateEqu.r" ∂ - "{IntRIncludes}InternalOnlyEqu.r" ∂ - "{IntRIncludes}Quickdraw.r" ∂ - "{IntRIncludes}ROMLink.r" +"{RsrcDir}SonoraDeclVideo.rsrc" ƒ "{SonoraVideoDir}SonoraDeclVideo.r" Rez {StdROpts} "{SonoraVideoDir}SonoraDeclVideo.r" -o "{RsrcDir}SonoraDeclVideo.rsrc" "{RsrcDir}SonoraDriver.rsrc" ƒ "{ObjDir}SonoraDriver.a.o" @@ -245,12 +219,7 @@ ATIHeaders = "{ATIVideoDir}ATIDrvr.h" ∂ {CommonHeaders} "{RsrcDir}ATIDeclVideo.rsrc" ƒ "{ATIVideoDir}ATIDeclVideo.r" ∂ - "{ATIVideoDir}ATIDeclMonitors.r" ∂ - "{IntRIncludes}DepVideoEqu.r" ∂ - "{IntRIncludes}HardwarePrivateEqu.r" ∂ - "{IntRIncludes}InternalOnlyEqu.r" ∂ - "{IntRIncludes}Quickdraw.r" ∂ - "{IntRIncludes}ROMLink.r" + "{ATIVideoDir}ATIDeclMonitors.r" Rez {StdROpts} "{ATIVideoDir}ATIDeclVideo.r" -o "{RsrcDir}ATIDeclVideo.rsrc" #=================================================================== @@ -342,26 +311,22 @@ VideoDriverObjs = "{ObjDir}JMFBDriver.a.o" ∂ "{ObjDir}JMFBDriver.a.o" ƒ "{VideoDriverDir}JMFBDepVideoEqu.a" ∂ - "{VideoDriverDir}JMFBDriver.a" ∂ - "{IntAIncludes}ComVideoEqu.a" + "{VideoDriverDir}JMFBDriver.a" Asm {StdAOpts} -o "{Targ}" "{VideoDriverDir}JMFBDriver.a" "{ObjDir}JMFBPrimaryInit.a.o" ƒ "{VideoDriverDir}JMFBDepVideoEqu.a" ∂ - "{VideoDriverDir}JMFBPrimaryInit.a" ∂ - "{IntAIncludes}ComVideoEqu.a" + "{VideoDriverDir}JMFBPrimaryInit.a" Asm {StdAOpts} -o "{Targ}" "{VideoDriverDir}JMFBPrimaryInit.a" "{ObjDir}TFBDriver.a.o" ƒ "{VideoDriverDir}TFBDepVideoEqu.a" ∂ - "{VideoDriverDir}TFBDriver.a" ∂ - "{IntAIncludes}ComVideoEqu.a" + "{VideoDriverDir}TFBDriver.a" Asm {StdAOpts} -o "{Targ}" "{VideoDriverDir}TFBDriver.a" "{ObjDir}TFBPrimaryInit.a.o" ƒ "{VideoDriverDir}TFBDepVideoEqu.a" ∂ - "{VideoDriverDir}TFBPrimaryInit.a" ∂ - "{IntAIncludes}ComVideoEqu.a" + "{VideoDriverDir}TFBPrimaryInit.a" Asm {StdAOpts} -o "{Targ}" "{VideoDriverDir}TFBPrimaryInit.a" diff --git a/DeclData/VSCDeclData/VSCDeclData.make b/DeclData/VSCDeclData/VSCDeclData.make --- a/DeclData/VSCDeclData/VSCDeclData.make +++ b/DeclData/VSCDeclData/VSCDeclData.make @@ -27,14 +27,7 @@ VSCVideoDir = {DeclDir}VSCDeclData: -CommonHeaders = "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{AIncludes}ROMEqu.a" ∂ - "{AIncludes}Video.a" ∂ - "{IntAIncludes}SlotMgrEqu.a" ∂ - "{AIncludes}Slots.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}DepVideoEqu.a" +CommonHeaders = # # DeclData diff --git a/Drivers/Backlight/Backlight.make b/Drivers/Backlight/Backlight.make --- a/Drivers/Backlight/Backlight.make +++ b/Drivers/Backlight/Backlight.make @@ -22,20 +22,11 @@ BL_DRVR_OBJ = "{ObjDir}backlight.c.o" ∂ "{ObjDir}backlight.a.o" -"{ObjDir}backlight.a.o" ƒ "{AIncludes}SysEqu.a" ∂ - "{AIncludes}SysErr.a" ∂ - "{BackLightDir}backlight.a" +"{ObjDir}backlight.a.o" ƒ "{BackLightDir}backlight.a" Asm -o {Targ} "{BackLightDir}backlight.a" {StdAOpts} "{ObjDir}backlight.c.o" ƒ "{BackLightDir}backlight.h" ∂ "{BackLightDir}PowerMgr.h" ∂ - "{CIncludes}SysEqu.h" ∂ - "{CIncludes}memory.h" ∂ - "{CIncludes}OSEvents.h" ∂ - "{CIncludes}devices.h" ∂ - "{CIncludes}errors.h" ∂ - "{CIncludes}retrace.h" ∂ - "{CIncludes}Shutdown.h" ∂ "{BackLightDir}backlight.c" C -o {Targ} "{BackLightDir}backlight.c" {StdCOpts} diff --git a/Drivers/EDisk/EDisk.make b/Drivers/EDisk/EDisk.make --- a/Drivers/EDisk/EDisk.make +++ b/Drivers/EDisk/EDisk.make @@ -16,9 +16,5 @@ Link {StdLOpts} {StdAlign} -o "{Targ}" -sn Main=".EDisk" -rt DRVR=48 "{ObjDir}EDiskDriver.a.o" -"{ObjDir}EDiskDriver.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{AIncludes}SonyEqu.a" ∂ - "{IntAIncludes}EDiskEqu.a" ∂ - "{EDiskDir}EDiskDriver.a" +"{ObjDir}EDiskDriver.a.o" ƒ "{EDiskDir}EDiskDriver.a" Asm {StdAOpts} -o "{Targ}" "{EDiskDir}EDiskDriver.a" -d SonyNonPortable=1 diff --git a/Drivers/NewAge/NewAge.make b/Drivers/NewAge/NewAge.make --- a/Drivers/NewAge/NewAge.make +++ b/Drivers/NewAge/NewAge.make @@ -18,8 +18,6 @@ Link {StdLOpts} {StdAlign} -o "{Targ}" -rt DRVR=04 -sn Main=".NewAge" "{ObjDir}NewAgeDrvr.a.o" -"{ObjDir}NewAgeDrvr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{NewAgeDir}NewAgeEqu.a" ∂ - "{NewAgeDir}NewAgeDrvr.a" ∂ - "{IntAIncludes}PSCEqu.a" +"{ObjDir}NewAgeDrvr.a.o" ƒ "{NewAgeDir}NewAgeEqu.a" ∂ + "{NewAgeDir}NewAgeDrvr.a" Asm {StdAOpts} -i "{NewAgeDir}" -w -o "{Targ}" "{NewAgeDir}NewAgeDrvr.a" diff --git a/Drivers/Sony/Sony.make b/Drivers/Sony/Sony.make --- a/Drivers/Sony/Sony.make +++ b/Drivers/Sony/Sony.make @@ -14,15 +14,7 @@ # 2/5/93 GMR Added SonySWIM3.a file, for PDM support. # 11/14/92 kc Change link option used to name segment from -sg to -sn. -"{ObjDir}SonyHdr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}SonyEqu.a" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{AIncludes}FSEqu.a" ∂ - "{IntAIncludes}IOPEqu.a" ∂ - "{IntAIncludes}AMICEqu.a" ∂ - "{SonyDir}Sony.a" ∂ +"{ObjDir}SonyHdr.a.o" ƒ "{SonyDir}Sony.a" ∂ "{SonyDir}SonyFormat.a" ∂ "{SonyDir}SonyRead.a" ∂ "{SonyDir}SonyRwt.a" ∂ diff --git a/Libs/InterfaceSrcs/Interface.Make b/Libs/InterfaceSrcs/Interface.Make --- a/Libs/InterfaceSrcs/Interface.Make +++ b/Libs/InterfaceSrcs/Interface.Make @@ -128,55 +128,31 @@ CommResourceMgrExtensionsObjs = "{IfObjDir}CommRsrcMgrExtensionsGlue.a.o" ∂ -dn __CRMGETTOOLNAMEDRESOURCE -"{IfObjDir}ConnectionMgrExtensions.c.o" ƒ "{CIncludes}CTBUtilities.h" ∂ - "{CIncludes}Connections.h" ∂ - "{CIncludes}ConnectionTools.h" ∂ - "{CIncludes}CommResources.h" ∂ - "{IntCIncludes}ConnectionsPriv.h" ∂ - "{IntCIncludes}CommToolboxPriv.h" ∂ - "{CTCnctDir}ConnectionMgrUtilities.c" ∂ +"{IfObjDir}ConnectionMgrExtensions.c.o" ƒ "{CTCnctDir}ConnectionMgrUtilities.c" ∂ "{CTCnctDir}ConnectionMgrExtensions.c" C {IfCOpts} -i "{CTCnctDir}" -o "{Targ}" "{CTCnctDir}ConnectionMgrExtensions.c" -"{IfObjDir}ConnectionMgrExtensionsGlue.a.o" ƒ "{AIncludes}Traps.a" ∂ - "{AIncludes}GestaltEqu.a" ∂ - "{IntAIncludes}GestaltPrivateEqu.a" ∂ - "{IntAIncludes}CommToolboxPriv.a" ∂ - "{CTGlueDir}ConnectionMgrExtensionsGlue.a" +"{IfObjDir}ConnectionMgrExtensionsGlue.a.o" ƒ "{CTGlueDir}ConnectionMgrExtensionsGlue.a" Asm {IfAOpts} -o "{Targ}" "{CTGlueDir}ConnectionMgrExtensionsGlue.a" -"{IfObjDir}FileTransferMgrExtensions.c.o" ƒ "{CIncludes}CTBUtilities.h" ∂ - "{CIncludes}FileTransfers.h" ∂ - "{CIncludes}FileTransferTools.h" ∂ - "{CIncludes}CommResources.h" ∂ - "{IntCIncludes}CommToolboxPriv.h" ∂ - "{CTFileTransDir}FileTransferMgrUtilities.c" ∂ +"{IfObjDir}FileTransferMgrExtensions.c.o" ƒ "{CTFileTransDir}FileTransferMgrUtilities.c" ∂ "{CTFileTransDir}FileTransferMgrExtensions.c" C {IfCOpts} -o "{Targ}" -i "{CTFileTransDir}" "{CTFileTransDir}FileTransferMgrExtensions.c" -"{IfObjDir}TerminalMgrExtensionsGlue.a.o" ƒ "{AIncludes}Traps.a" ∂ - "{IntAIncludes}CommToolboxPriv.a" ∂ - "{CTGlueDir}TerminalMgrExtensionsGlue.a" +"{IfObjDir}TerminalMgrExtensionsGlue.a.o" ƒ "{CTGlueDir}TerminalMgrExtensionsGlue.a" Asm {IfAOpts} -o "{Targ}" "{CTGlueDir}TerminalMgrExtensionsGlue.a" -"{IfObjDir}TerminalMgrExtensions.c.o" ƒ "{CIncludes}CTBUtilities.h" ∂ - "{CIncludes}Terminals.h" ∂ - "{CIncludes}TerminalTools.h" ∂ - "{CIncludes}CommResources.h" ∂ - "{IntCIncludes}CommToolboxPriv.h" ∂ - "{CTTermDir}TerminalMgrUtilities.c" ∂ +"{IfObjDir}TerminalMgrExtensions.c.o" ƒ "{CTTermDir}TerminalMgrUtilities.c" ∂ "{CTTermDir}TerminalMgrExtensions.c" C {IfCOpts} -i "{CTTermDir}" -o "{Targ}" "{CTTermDir}TerminalMgrExtensions.c" -"{IfObjDir}CommRsrcMgrExtensionsGlue.a.o" ƒ "{AIncludes}Traps.a" ∂ - "{IntAIncludes}CommToolboxPriv.a" ∂ - "{CTGlueDir}CommRsrcMgrExtensionsGlue.a" +"{IfObjDir}CommRsrcMgrExtensionsGlue.a.o" ƒ "{CTGlueDir}CommRsrcMgrExtensionsGlue.a" Asm {IfAOpts} -o "{Targ}" "{CTGlueDir}CommRsrcMgrExtensionsGlue.a" @@ -208,12 +184,7 @@ CommResourceMgrExtensionsObjs = "{IfObjDir}CommRsrcMgrExtensionsGlue.a.o" ∂ Asm {IfAOpts} -o "{Targ}" "{CTGlueDir}FileXferMgrExtensionsGlue.a" -"{IfObjDir}CommResourceMgrExtensions.c.o" ƒ "{CIncludes}Resources.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}CTBUtilities.h" ∂ - "{CIncludes}CommResources.h" ∂ - "{IntCIncludes}CommToolboxPriv.h" ∂ - "{CTRsrcDir}CommResourceMgrExtensions.c" +"{IfObjDir}CommResourceMgrExtensions.c.o" ƒ "{CTRsrcDir}CommResourceMgrExtensions.c" C {IfCOpts} -i "{CTRsrcDir}" -o "{Targ}" "{CTRsrcDir}CommResourceMgrExtensions.c" @@ -337,44 +308,16 @@ CommResourceMgrExtensionsObjs = "{IfObjDir}CommRsrcMgrExtensionsGlue.a.o" ∂ Asm {IfAOpts} -o "{Targ}" "{IfSrcDir}Power.a" -"{IfObjDir}"OSTraps.a.o ƒ "{AIncludes}QuickDraw.a" ∂ - "{AIncludes}Traps.a" ∂ - "{AIncludes}SysEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{AIncludes}Packages.a" ∂ - "{AIncludes}Printing.a" ∂ - "{AIncludes}SaneMacs.a" ∂ - "{AIncludes}SysErr.a" ∂ - "{AIncludes}FSEqu.a" ∂ - "{AIncludes}Private.a" ∂ - "{AIncludes}ToolUtils.a" ∂ - "{AIncludes}Slots.a" ∂ - "{ObjDir}"StandardEqu.d ∂ +"{IfObjDir}"OSTraps.a.o ƒ "{ObjDir}"StandardEqu.d ∂ "{IfSrcDir}OSTraps.a" Asm {IfAOpts} -o "{Targ}" "{IfSrcDir}OSTraps.a" -"{IfObjDir}"BitMapToRegion.a.o ƒ "{AIncludes}QuickDraw.a" ∂ - "{AIncludes}Traps.a" ∂ - "{AIncludes}SysEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{AIncludes}Packages.a" ∂ - "{AIncludes}Printing.a" ∂ - "{AIncludes}SaneMacs.a" ∂ - "{AIncludes}SysErr.a" ∂ - "{AIncludes}FSEqu.a" ∂ - "{AIncludes}Private.a" ∂ - "{AIncludes}ToolUtils.a" ∂ - "{AIncludes}Slots.a" ∂ - "{IfSrcDir}BitMapToRegion.a" +"{IfObjDir}"BitMapToRegion.a.o ƒ "{IfSrcDir}BitMapToRegion.a" Asm {IfAOpts} -o "{Targ}" "{IfSrcDir}BitMapToRegion.a" -"{IfObjDir}PPCGlue.a.o" ƒ "{AIncludes}Traps.a" ∂ - "{AIncludes}SysEqu.a" ∂ - "{AIncludes}ToolUtils.a" ∂ - "{AIncludes}PPCToolbox.a" ∂ - "{IfSrcDir}PPCGlue.a" +"{IfObjDir}PPCGlue.a.o" ƒ "{IfSrcDir}PPCGlue.a" Asm {IfAOpts} -o "{Targ}" "{IfSrcDir}PPCGlue.a" @@ -382,15 +325,9 @@ CommResourceMgrExtensionsObjs = "{IfObjDir}CommRsrcMgrExtensionsGlue.a.o" ∂ C {IfCOpts} -o "{Targ}" "{IfSrcDir}HFSGlue.c" -"{IfObjDir}FoldersGlue.c.o" ƒ "{CIncludes}Folders.h" ∂ - "{CIncludes}GestaltEqu.h" ∂ - "{CIncludes}SysEqu.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}Files.h" ∂ - "{IfSrcDir}FoldersGlue.c" +"{IfObjDir}FoldersGlue.c.o" ƒ "{IfSrcDir}FoldersGlue.c" C {IfCOpts} -o "{Targ}" "{IfSrcDir}FoldersGlue.c" -"{IfObjDir}dialogs.a.o" ƒ "{IntAIncludes}DialogsPriv.a" ∂ - "{IfSrcDir}dialogs.a" +"{IfObjDir}dialogs.a.o" ƒ "{IfSrcDir}dialogs.a" Asm {IfAOpts} -o "{Targ}" "{IfSrcDir}dialogs.a" diff --git a/Make/DBLite.make b/Make/DBLite.make --- a/Make/DBLite.make +++ b/Make/DBLite.make @@ -188,7 +188,7 @@ ResourceFiles = "{MiscDir}AppleTalk.ROM.RSRC" ∂ "{RsrcDir}kbd.rsrc" -RomMondo ƒ FeatureSet "{ImageDir}RomMondo" +RomMondo ƒ FeatureSet "{ObjDir}StandardEqu.d" "{ImageDir}RomMondo" Beep;Beep;Beep diff --git a/Make/LC930.make b/Make/LC930.make --- a/Make/LC930.make +++ b/Make/LC930.make @@ -163,7 +163,7 @@ ResourceFiles = "{RsrcDir}ATBoot.RSRC" ∂ "{RsrcDir}kbd.rsrc" -RomMondo ƒ FeatureSet "{ImageDir}RomMondo" +RomMondo ƒ FeatureSet "{ObjDir}StandardEqu.d" "{ImageDir}RomMondo" Beep;Beep;Beep diff --git a/Make/MainCode.Make b/Make/MainCode.Make --- a/Make/MainCode.Make +++ b/Make/MainCode.Make @@ -121,30 +121,17 @@ MainCodeLibs = ∂ "{LibDir}MainCode.Lib" ƒ {MainCodeLibs} "{ObjDir}VectorTablePatch.a.o" "{ToolDir}Vectorize" -w -v "{ObjDir}VectorTablePatch.a.o" -log "{TextDir}MainCode.Sym" {StdVOpts} -o "{Targ}" {MainCodeLibs} -"{ObjDir}VectorTablePatch.a.o" ƒ "{Sources}Make:VectorTable.a" "{IntAIncludes}VectorTablePatch.a" +"{ObjDir}VectorTablePatch.a.o" ƒ "{Sources}Make:VectorTable.a" Asm -case on {StdAOpts} -o "{Targ}" "{IntAIncludes}VectorTablePatch.a" -d &VectorTable="∂'{Sources}Make:VectorTable.a∂'" -d ROMBASE={RomBase} -"{ObjDir}VectorTableInit.a.o" ƒ "{Sources}Make:VectorTable.a" "{IntAIncludes}VectorTableInit.a" +"{ObjDir}VectorTableInit.a.o" ƒ "{Sources}Make:VectorTable.a" Asm -case on {StdAOpts} -o "{Targ}" "{IntAIncludes}VectorTableInit.a" -d &VectorTable="∂'{Sources}Make:VectorTable.a∂'" -d ROMBASE={RomBase} # # Patches # -"{ObjDir}MiscPatches.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}ResourceMgrPriv.a" ∂ - "{IntAIncludes}BTreeEqu.a" ∂ - "{IntAIncludes}MMUEqu.a" ∂ - "{IntAIncludes}BootEqu.a" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}FileMgrPrivate.a" ∂ - "{IntAIncludes}ScriptPriv.a" ∂ - "{AIncludes}GestaltEqu.a" ∂ - "{IntAIncludes}GestaltPrivateEqu.a" ∂ - "{IntAIncludes}EditionsPrivate.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{AIncludes}DatabaseAccess.a" ∂ - "{PatchDir}MiscPatches.a" +"{ObjDir}MiscPatches.a.o" ƒ "{PatchDir}MiscPatches.a" Asm {StdAOpts} -o "{Targ}" "{PatchDir}MiscPatches.a" @@ -167,22 +154,7 @@ MainCodeLibs = ∂ # It would be nice to be able to avoid full builds although the # Traps.a files will use the stale setting of ROMFastTraps # -"{ObjDir}StandardEqu.d" ƒ "{AIncludes}FSEqu.a" ∂ - "{AIncludes}FSPrivate.a" ∂ - "{AIncludes}Private.a" ∂ - "{AIncludes}QuickDraw.a" ∂ - "{AIncludes}SANEMacs.a" ∂ - "{AIncludes}Script.a" ∂ - "{AIncludes}SysEqu.a" ∂ - "{IntAIncludes}SysPrivateEqu.a" ∂ - "{AIncludes}SysErr.a" ∂ - "{AIncludes}ToolUtils.a" ∂ - "{AIncludes}Traps.a" ∂ - "{AIncludes}Timer.a" ∂ - "{IntAIncludes}InternalOnlyEqu.a" ∂ - "{IntAIncludes}TrapsPrivate.a" ∂ - "{IntAIncludes}StandardEqu.a" ∂ - "{AIncludes}Power.a" +"{ObjDir}StandardEqu.d" ƒ Asm {StdEquAOpts} -o Dev:Null "{IntAIncludes}StandardEqu.a" -i "{IntAIncludes}" Move -y StandardEqu.d "{Targ}" diff --git a/Make/RISC.make b/Make/RISC.make --- a/Make/RISC.make +++ b/Make/RISC.make @@ -316,7 +316,7 @@ ResourceFiles = "{RsrcDir}ATBoot.RSRC" ∂ "{RsrcDir}kbd.rsrc" -RomMondo ƒ FeatureSet "{ImageDir}RomMondo" +RomMondo ƒ FeatureSet "{ObjDir}StandardEqu.d" {ImageDir}RomMondo" "{ImageDir}RomMondo" ƒ {ResourceFiles} @@ -355,7 +355,7 @@ FeatureSet ƒ Set StdEquAOpts "`{MakeDir}CreateStdEquAOptions "{FeatureSet}"`" ; Export StdEquAOpts -"{RsrcDir}RomLayout.Rsrc" ƒ "{MakeDir}RiscLayout.r" "{ResourceDir}RomResources.r" "{IntRIncludes}RomTypes.r" +"{RsrcDir}RomLayout.Rsrc" ƒ "{MakeDir}RiscLayout.r" "{ResourceDir}RomResources.r" Rez {StdROpts} "{MakeDir}RiscLayout.r" -i "{ResourceDir}" -o "{targ}" -d RomBase={RomBase} -c RSED -t rsrc diff --git a/Make/Universal.make b/Make/Universal.make --- a/Make/Universal.make +++ b/Make/Universal.make @@ -297,7 +297,7 @@ ResourceFiles = "{MiscDir}AppleTalk.ROM.RSRC" ∂ "{RsrcDir}kbd.rsrc" -RomMondo ƒ FeatureSet "{ImageDir}RomMondo" +RomMondo ƒ FeatureSet "{ObjDir}StandardEqu.d" "{ImageDir}RomMondo" beep 1300,3,25 0,1,0 1200,3,25 0,1,0 1100,3,25 0,1,0 1000,3,25 @@ -342,7 +342,7 @@ FeatureSet ƒ Set StdVOpts "{VOpts}" Set StdEquAOpts "`{MakeDir}CreateStdEquAOptions "{FeatureSet}"`" ; Export StdEquAOpts -"{RsrcDir}RomLayout.Rsrc" ƒ "{MakeDir}UniversalLayout.r" "{ResourceDir}RomResources.r" "{IntRIncludes}RomTypes.r" +"{RsrcDir}RomLayout.Rsrc" ƒ "{MakeDir}UniversalLayout.r" "{ResourceDir}RomResources.r" Rez {StdROpts} "{MakeDir}UniversalLayout.r" -i "{ResourceDir}" -o "{targ}" -d RomBase={RomBase} diff --git a/OS/ADBMgr/ADBMgr.make b/OS/ADBMgr/ADBMgr.make --- a/OS/ADBMgr/ADBMgr.make +++ b/OS/ADBMgr/ADBMgr.make @@ -10,12 +10,5 @@ # Change History (most recent first): # -"{LibDir}ADBMgr.lib" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{IntAIncludes}IOPEqu.a" ∂ - "{IntAIncludes}EgretEqu.a" ∂ - "{IntAIncludes}AppleDeskBusPriv.a" ∂ - "{IntAIncludes}ScriptPriv.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{ADBDir}ADBMgr.a" +"{LibDir}ADBMgr.lib" ƒ "{ADBDir}ADBMgr.a" Asm {StdAOpts} -o "{Targ}" "{ADBDir}ADBMgr.a" \ No newline at end of file diff --git a/OS/FPUEmulation/FPEmulation.make b/OS/FPUEmulation/FPEmulation.make --- a/OS/FPUEmulation/FPEmulation.make +++ b/OS/FPUEmulation/FPEmulation.make @@ -10,8 +10,7 @@ # Change History (most recent first): # -"{ObjDir}FPEmulation.a.o" ƒ "{AIncludes}SysEqu.a" ∂ - "{FPEmulationDir}"BinDec.a ∂ +"{ObjDir}FPEmulation.a.o" ƒ "{FPEmulationDir}"BinDec.a ∂ "{FPEmulationDir}"BugFix.a ∂ "{FPEmulationDir}"Constants.a ∂ "{FPEmulationDir}"DecBin.a ∂ diff --git a/OS/Gestalt/Gestalt.make b/OS/Gestalt/Gestalt.make --- a/OS/Gestalt/Gestalt.make +++ b/OS/Gestalt/Gestalt.make @@ -22,37 +22,14 @@ GestaltObjs = "{ObjDir}GestaltFunction.a.o" ∂ Lib {StdLibOpts} -o "{Targ}" {GestaltObjs} -"{ObjDir}GestaltFunction.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{AIncludes}SANEMacs881.a" ∂ - "{IntAIncludes}MMUEqu.a" ∂ - "{AIncludes}GestaltEqu.a" ∂ - "{IntAIncludes}GestaltPrivateEqu.a" ∂ - "{IntAIncludes}InternalOnlyEqu.a" ∂ - "{IntAIncludes}EDiskEqu.a" ∂ - "{IntAIncludes}BootEqu.a" ∂ - "{GestaltDir}GestaltFunction.a" +"{ObjDir}GestaltFunction.a.o" ƒ "{GestaltDir}GestaltFunction.a" Asm {StdAOpts} -o "{Targ}" "{GestaltDir}GestaltFunction.a" -"{ObjDir}GestaltExtensions.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{AIncludes}GestaltEqu.a" ∂ - "{IntAIncludes}GestaltPrivateEqu.a" ∂ - "{IntAIncludes}SysPrivateEqu.a" ∂ - "{IntAIncludes}InternalOnlyEqu.a" ∂ - "{GestaltDir}GestaltExtensions.a" +"{ObjDir}GestaltExtensions.a.o" ƒ "{GestaltDir}GestaltExtensions.a" Asm {StdAOpts} -o "{Targ}" "{GestaltDir}GestaltExtensions.a" -"{ObjDir}GestaltLookup.c.o" ƒ "{CIncludes}GestaltEqu.h" ∂ - "{CIncludes}Types.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}SysEqu.h" ∂ - "{IntCIncludes}ExpandMemPriv.h" ∂ - "{IntCIncludes}GestaltPrivateEqu.h" ∂ - "{GestaltDir}GestaltLookup.c" +"{ObjDir}GestaltLookup.c.o" ƒ "{GestaltDir}GestaltLookup.c" C {StdCOpts} -o "{Targ}" "{GestaltDir}GestaltLookup.c" diff --git a/OS/HFS/Extensions/BTreeMgr/BTreeMgr.make b/OS/HFS/Extensions/BTreeMgr/BTreeMgr.make --- a/OS/HFS/Extensions/BTreeMgr/BTreeMgr.make +++ b/OS/HFS/Extensions/BTreeMgr/BTreeMgr.make @@ -24,47 +24,32 @@ BTreeMgrObjects = "{ObjDir}BTreeAlloc.a.o" ∂ Lib {StdLibOpts} -o "{Targ}" {BTreeMgrObjects} -"{ObjDir}BTreeAlloc.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}BtreeEqu.a" ∂ - "{HFSBTreeDir}BtreePrivate.a" ∂ +"{ObjDir}BTreeAlloc.a.o" ƒ "{HFSBTreeDir}BtreePrivate.a" ∂ "{HFSBTreeDir}BTreeAlloc.a" Asm {StdAOpts} -o "{Targ}" "{HFSBTreeDir}BTreeAlloc.a" -"{ObjDir}BTreeFuncs.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}BTreeEqu.a" ∂ - "{AIncludes}Processes.a" ∂ - "{IntAIncludes}FileMgrPrivate.a" ∂ - "{HFSBTreeDir}BTreePrivate.a" ∂ +"{ObjDir}BTreeFuncs.a.o" ƒ "{HFSBTreeDir}BTreePrivate.a" ∂ "{HFSExtensionsDir}DTDBMgrPriv.a" ∂ "{HFSBTreeDir}BTreeFuncs.a" Asm {StdAOpts} -o "{Targ}" "{HFSBTreeDir}BTreeFuncs.a" -i "{HFSExtensionsDir}" -"{ObjDir}BTreeMaint1.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{HFSBTreeDir}BTreeMaint1.a" +"{ObjDir}BTreeMaint1.a.o" ƒ "{HFSBTreeDir}BTreeMaint1.a" Asm {StdAOpts} -o "{Targ}" "{HFSBTreeDir}BTreeMaint1.a" -"{ObjDir}BTreeMaint2.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}BtreeEqu.a" ∂ - "{HFSBTreeDir}BtreePrivate.a" ∂ +"{ObjDir}BTreeMaint2.a.o" ƒ "{HFSBTreeDir}BtreePrivate.a" ∂ "{HFSBTreeDir}BTreeMaint2.a" Asm {StdAOpts} -o "{Targ}" "{HFSBTreeDir}BTreeMaint2.a" -"{ObjDir}BTreeQueue.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}BTreeEqu.a" ∂ - "{IntAIncludes}FileMgrPrivate.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{HFSBTreeDir}BtreePrivate.a" ∂ +"{ObjDir}BTreeQueue.a.o" ƒ "{HFSBTreeDir}BtreePrivate.a" ∂ "{HFSBTreeDir}BTreeQueue.a" Asm {StdAOpts} -o "{Targ}" "{HFSBTreeDir}BTreeQueue.a" -"{ObjDir}BTreeSvcs.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}BTreeEqu.a" ∂ - "{HFSBTreeDir}BtreePrivate.a" ∂ +"{ObjDir}BTreeSvcs.a.o" ƒ "{HFSBTreeDir}BtreePrivate.a" ∂ "{HFSBTreeDir}BTreeSvcs.a" Asm {StdAOpts} -o "{Targ}" "{HFSBTreeDir}BTreeSvcs.a" diff --git a/OS/HFS/HFS.make b/OS/HFS/HFS.make --- a/OS/HFS/HFS.make +++ b/OS/HFS/HFS.make @@ -49,71 +49,36 @@ HFSObjs = "{LibDir}BTreeMgr.lib" ∂ Lib {StdLibOpts} -o "{Targ}" {HFSObjs} -"{ObjDir}BTAlloc.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}SonyEqu.a" ∂ - "{HFSDir}BTAlloc.a" +"{ObjDir}BTAlloc.a.o" ƒ "{HFSDir}BTAlloc.a" Asm {StdAOpts} -o "{Targ}" "{HFSDir}BTAlloc.a" -"{ObjDir}BTMaint1.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}FSPrivate.a" ∂ - "{HFSDir}BTMaint1.a" +"{ObjDir}BTMaint1.a.o" ƒ "{HFSDir}BTMaint1.a" Asm {StdAOpts} -o "{Targ}" "{HFSDir}BTMaint1.a" -"{ObjDir}BTMaint2.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}FSEqu.a" ∂ - "{AIncludes}FSPrivate.a" ∂ - "{HFSDir}BTMaint2.a" +"{ObjDir}BTMaint2.a.o" ƒ "{HFSDir}BTMaint2.a" Asm {StdAOpts} -o "{Targ}" "{HFSDir}BTMaint2.a" -"{ObjDir}BTSVCS.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}FSEqu.a" ∂ - "{HFSDir}BTSVCS.a" ∂ - "{AIncludes}FSPrivate.a" ∂ - "{IntAIncludes}FileMgrPrivate.a" +"{ObjDir}BTSVCS.a.o" ƒ "{HFSDir}BTSVCS.a" Asm {StdAOpts} -o "{Targ}" "{HFSDir}BTSVCS.a" -"{ObjDir}QMgr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{HFSExtensionsDir}QMgrEqu.a" ∂ +"{ObjDir}QMgr.a.o" ƒ "{HFSExtensionsDir}QMgrEqu.a" ∂ "{HFSExtensionsDir}QMgr.a" Asm {StdAOpts} -o "{Targ}" "{HFSExtensionsDir}QMgr.a" -"{ObjDir}cache.a.o" ƒ "{HFSDir}cache.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}FSEqu.a" ∂ - "{AIncludes}FSPrivate.a" +"{ObjDir}cache.a.o" ƒ "{HFSDir}cache.a" Asm {StdAOpts} -o "{Targ}" "{HFSDir}cache.a" -"{ObjDir}CacheControl.a.o" ƒ "{AIncludes}FSPrivate.a" ∂ - "{IntAIncludes}DiskCachePriv.a" ∂ - "{AIncludes}SysEqu.a" ∂ - "{AIncludes}SysErr.a" ∂ - "{HFSCacheDir}CacheControl.a" +"{ObjDir}CacheControl.a.o" ƒ "{HFSCacheDir}CacheControl.a" Asm {StdAOpts} -o "{Targ}" "{HFSCacheDir}CacheControl.a" -"{ObjDir}TFS.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}FSEqu.a" ∂ - "{AIncludes}FSPrivate.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{IntAIncludes}BTreeEqu.a" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{AIncludes}SonyEqu.a" ∂ - "{AIncludes}Processes.a" ∂ - "{IntAIncludes}MFPrivate.a" ∂ - "{IntAIncludes}FileMgrPrivate.a" ∂ - "{AIncludes}SCSI.a" ∂ - "{IntAIncludes}SCSIPriv.a" ∂ - "{AIncludes}GestaltEqu.a" ∂ - "{IntAIncludes}InternalMacros.a" ∂ - "{IntAIncludes}SysPrivateEqu.a" ∂ - "{HFSDir}MFSDir1.a" ∂ +"{ObjDir}TFS.a.o" ƒ "{HFSDir}MFSDir1.a" ∂ "{HFSDir}MFSDir2.a" ∂ "{HFSDir}MFSDir3.a" ∂ "{HFSDir}MFSRfn1.a" ∂ @@ -133,45 +98,29 @@ HFSObjs = "{LibDir}BTreeMgr.lib" ∂ Asm {StdAOpts} -o "{Targ}" "{HFSDir}TFS.a" -"{ObjDir}cacheio.a.o" ƒ "{HFSDir}cacheio.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}FSEqu.a" ∂ - "{AIncludes}FSPrivate.a" +"{ObjDir}cacheio.a.o" ƒ "{HFSDir}cacheio.a" Asm {StdAOpts} -o "{Targ}" "{HFSDir}cacheio.a" "{ObjDir}cmmaint.a.o" ƒ "{HFSDir}cmmaint.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}FSEqu.a" ∂ - "{AIncludes}FSPrivate.a" ∂ "{HFSDir}cmmaint.a" Asm {StdAOpts} -o "{Targ}" "{HFSDir}cmmaint.a" "{ObjDir}cmsvcs.a.o" ƒ "{HFSDir}cmsvcs.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}FSEqu.a" ∂ - "{AIncludes}FSPrivate.a" ∂ "{HFSDir}cmsvcs.a" Asm {StdAOpts} -o "{Targ}" "{HFSDir}cmsvcs.a" -"{ObjDir}FXM.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}FSEqu.a" ∂ - "{HFSDir}FXM.a" ∂ - "{AIncludes}FSPrivate.a" +"{ObjDir}FXM.a.o" ƒ "{HFSDir}FXM.a" Asm {StdAOpts} -o "{Targ}" "{HFSDir}FXM.a" -"{ObjDir}ExternalMakeFSSpec.a.o" ƒ "{HFSExtensionsDir}ExternalMakeFSSpec.a" ∂ - "{ObjDir}StandardEqu.d" +"{ObjDir}ExternalMakeFSSpec.a.o" ƒ "{HFSExtensionsDir}ExternalMakeFSSpec.a" Asm {StdAOpts} -d MakeGlue=0 -o "{Targ}" "{HFSExtensionsDir}ExternalMakeFSSpec.a" -"{ObjDir}vsm.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}FSEqu.a" ∂ - "{AIncludes}FSPrivate.a" ∂ - "{HFSDir}vsm.a" +"{ObjDir}vsm.a.o" ƒ "{HFSDir}vsm.a" Asm {StdAOpts} -o "{Targ}" "{HFSDir}vsm.a" @@ -207,8 +156,5 @@ HFSObjs = "{LibDir}BTreeMgr.lib" ∂ C {StdCOpts} -o "{Targ}" "{HFSExtensionsDir}FSSpecCalls.c" -"{ObjDir}DiskCache.a.o" ƒ "{HFSCacheDir}DiskCache.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}DiskCachePriv.a" ∂ - "{IntAIncludes}FileMgrPrivate.a" +"{ObjDir}DiskCache.a.o" ƒ "{HFSCacheDir}DiskCache.a" Asm {StdAOpts} -o "{Targ}" "{HFSCacheDir}DiskCache.a" diff --git a/OS/IoPrimitives/IOPrimitives.make b/OS/IoPrimitives/IOPrimitives.make --- a/OS/IoPrimitives/IOPrimitives.make +++ b/OS/IoPrimitives/IOPrimitives.make @@ -31,67 +31,25 @@ IOPrimitivesObjs = "{ObjDir}PowerMgrPrimitives.a.o" ∂ Lib {StdLibOpts} {IOPrimitivesObjs} -o "{Targ}" -"{ObjDir}ADBPrimitives.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAincludes}UniversalEqu.a" ∂ - "{IntAincludes}SoundPrivate.a" ∂ - "{IntAincludes}PowerPrivEqu.a" ∂ - "{IntAincludes}EgretEqu.a" ∂ - "{IntAincludes}IopEqu.a" ∂ - "{IntAincludes}AppleDeskBusPriv.a" ∂ - "{IntAincludes}IOPrimitiveEqu.a" ∂ - "{IOPrimitivesDir}ADBPrimitives.a" +"{ObjDir}ADBPrimitives.a.o" ƒ "{IOPrimitivesDir}ADBPrimitives.a" Asm {StdAOpts} -o "{Targ}" "{IOPrimitivesDir}ADBPrimitives.a" -"{ObjDir}ClockPRAMPrimitives.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}PowerPrivEqu.a" ∂ - "{IntAIncludes}EgretEqu.a" ∂ - "{IntAIncludes}IOPrimitiveEqu.a" ∂ - "{IOPrimitivesDir}ClockPRAMPrimitives.a" +"{ObjDir}ClockPRAMPrimitives.a.o" ƒ "{IOPrimitivesDir}ClockPRAMPrimitives.a" Asm {StdAOpts} -o "{Targ}" "{IOPrimitivesDir}ClockPRAMPrimitives.a" -"{ObjDir}PowerMgrPrimitives.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAincludes}SoundPrivate.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}PowerPrivEqu.a" ∂ - "{IntAIncludes}MMUEqu.a" ∂ - "{IntAIncludes}IOPrimitiveEqu.a" ∂ - "{IntAIncludes}DockingEqu.a" ∂ - "{AIncludes}ShutDown.a" ∂ - "{IOPrimitivesDir}PowerMgrPrimitives.a" +"{ObjDir}PowerMgrPrimitives.a.o" ƒ "{IOPrimitivesDir}PowerMgrPrimitives.a" Asm {StdAOpts} -o "{Targ}" "{IOPrimitivesDir}PowerMgrPrimitives.a" -"{ObjDir}ImmgPrimitives.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{AIncludes}ROMEqu.a" ∂ - "{IntAIncludes}IOPrimitiveEqu.a" ∂ - "{AIncludes}IntModemMgrEqu.a" ∂ - "{IntAIncludes}IntModemMgrPrivEqu.a" ∂ - "{IntAIncludes}PowerPrivEqu.a" ∂ - "{AIncludes}Sound.a" +"{ObjDir}ImmgPrimitives.a.o" ƒ Asm {StdAOpts} -o "{Targ}" "{IOPrimitivesDir}ImmgPrimitives.a" "{ObjDir}backlightprim.a.o" ƒ "{BackLightDir}backlightprim.a" ∂ - "{AIncludes}SysEqu.a" ∂ - "{AIncludes}SysErr.a" ∂ - "{AIncludes}Traps.a" ∂ - "{IntAIncludes}powerprivequ.a" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ "{BackLightDir}backlightequ.a" Asm -o {Targ} "{BackLightDir}backlightprim.a" {StdAOpts} -"{ObjDir}SndPrimitives.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAincludes}SoundPrivate.a" ∂ - "{IntAIncludes}IOPrimitiveEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IOPrimitivesDir}SndPrimitives.a" +"{ObjDir}SndPrimitives.a.o" ƒ "{IOPrimitivesDir}SndPrimitives.a" Asm {StdAOpts} -o "{Targ}" "{IOPrimitivesDir}SndPrimitives.a" "{ObjDir}PWM.c.o" ƒ "{BackLightDir}backlight.h" ∂ @@ -103,18 +61,12 @@ IOPrimitivesObjs = "{ObjDir}PowerMgrPrimitives.a.o" ∂ "{BackLightDir}PowerMgr.h" ∂ "{BackLightDir}backlightGenRout.c" C -o {Targ} "{BackLightDir}backlightGenRout.c" {StdCOpts} -"{ObjDir}backlightinput.c.o" ƒ "{CIncludes}SysEqu.h" ∂ - "{CIncludes}memory.h" ∂ - "{CIncludes}errors.h" ∂ - "{BackLightDir}backlightinput.c" ∂ +"{ObjDir}backlightinput.c.o" ƒ "{BackLightDir}backlightinput.c" ∂ "{BackLightDir}backlight.h" ∂ "{BackLightDir}PowerMgr.h" C -o {Targ} "{BackLightDir}backlightinput.c" {StdCOpts} -"{ObjDir}backlightcpu.c.o" ƒ "{CIncludes}SysEqu.h" ∂ - "{CIncludes}memory.h" ∂ - "{CIncludes}errors.h" ∂ - "{BackLightDir}backlightcpu.c" ∂ +"{ObjDir}backlightcpu.c.o" ƒ "{BackLightDir}backlightcpu.c" ∂ "{BackLightDir}backlight.h" ∂ "{BackLightDir}PowerMgr.h" C -o {Targ} "{BackLightDir}backlightcpu.c" {StdCOpts} diff --git a/OS/MMU/MMU.make b/OS/MMU/MMU.make --- a/OS/MMU/MMU.make +++ b/OS/MMU/MMU.make @@ -20,32 +20,15 @@ MMUObjs = "{ObjDir}MMU.a.o" ∂ -"{ObjDir}MMU.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}SoundPrivate.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{IntAIncludes}MMUEqu.a" ∂ - "{IntAIncludes}BootEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{MMUDir}MMU.a" +"{ObjDir}MMU.a.o" ƒ "{MMUDir}MMU.a" Asm {StdAOpts} -o "{Targ}" "{MMUDir}MMU.a" -"{ObjDir}MMUTables.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}MmuEqu.a" ∂ - "{IntAIncludes}BootEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{AIncludes}EDiskEqu.a" ∂ - "{MMUDir}MMUTables.a" +"{ObjDir}MMUTables.a.o" ƒ "{MMUDir}MMUTables.a" Asm {StdAOpts} -o "{Targ}" "{MMUDir}MMUTables.a" -"{ObjDir}GetReal.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{IntAIncludes}MMUEqu.a" ∂ - "{AIncludes}GestaltEqu.a" ∂ - "{MMUDir}GetReal.a" +"{ObjDir}GetReal.a.o" ƒ "{MMUDir}GetReal.a" Asm {StdAOpts} -o "{Targ}" "{MMUDir}GetReal.a" diff --git a/OS/MemoryMgr/FigmentSources/Figment.Make b/OS/MemoryMgr/FigmentSources/Figment.Make --- a/OS/MemoryMgr/FigmentSources/Figment.Make +++ b/OS/MemoryMgr/FigmentSources/Figment.Make @@ -45,15 +45,7 @@ FigMemoryMgrObjs = "{ObjDir}MemMgrGlue.a.o" ∂ Lib {StdLibOpts} -o "{Targ}" {FigMemoryMgrObjs} -"{ObjDir}MemMgrBoot.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}QuickDraw.a" ∂ - "{IntAIncludes}ColorEqu.a" ∂ - "{AIncludes}Palettes.a" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{AIncludes}fsequ.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{MemoryMgrDir}MemoryMgrPriv.a" ∂ +"{ObjDir}MemMgrBoot.a.o" ƒ "{MemoryMgrDir}MemoryMgrPriv.a" ∂ "{FigmentDir}MemMgrBoot.a" Asm {StdAOpts} {MMAOptions} -o "{Targ}" "{FigmentDir}MemMgrBoot.a" @@ -67,7 +59,6 @@ FigMemoryMgrObjs = "{ObjDir}MemMgrGlue.a.o" ∂ "{ObjDir}"MemMgrHeap.c.o ƒ "{FigmentDir}MemMgr.h" ∂ - "{IntCIncludes}MemoryMgrPriv.h" ∂ "{FigmentDir}MemoryRoutines.h" ∂ "{FigmentDir}MemMgrDebug.h" ∂ "{FigmentDir}MemMgrHeap.c" @@ -75,14 +66,12 @@ FigMemoryMgrObjs = "{ObjDir}MemMgrGlue.a.o" ∂ "{ObjDir}"MemMgr.c.o ƒ "{FigmentDir}MemMgr.h" ∂ - "{IntCIncludes}MemoryMgrPriv.h" ∂ "{FigmentDir}MemoryRoutines.h" ∂ "{FigmentDir}MemMgrDebug.h" ∂ "{FigmentDir}MemMgr.c" C {StdCOpts} {MMCOptions} -o "{Targ}" "{FigmentDir}MemMgr.c" "{ObjDir}"MemMgrInternal.c.o ƒ "{FigmentDir}MemMgr.h" ∂ - "{IntCIncludes}MemoryMgrPriv.h" ∂ "{FigmentDir}MemoryRoutines.h" ∂ "{FigmentDir}MemMgrDebug.h" ∂ "{FigmentDir}MemMgrInternal.c" @@ -90,7 +79,6 @@ FigMemoryMgrObjs = "{ObjDir}MemMgrGlue.a.o" ∂ "{ObjDir}"ProcessMgrHeap.c.o ƒ "{FigmentDir}MemMgr.h" ∂ - "{IntCIncludes}MemoryMgrPriv.h" ∂ "{FigmentDir}MemoryRoutines.h" ∂ "{FigmentDir}MemMgrDebug.h" ∂ "{FigmentDir}ProcessMgrHeap.c" @@ -98,7 +86,6 @@ FigMemoryMgrObjs = "{ObjDir}MemMgrGlue.a.o" ∂ "{ObjDir}"MemMgrUtils.c.o ƒ "{FigmentDir}MemMgr.h" ∂ - "{IntCIncludes}MemoryMgrPriv.h" ∂ "{FigmentDir}MemoryRoutines.h" ∂ "{FigmentDir}MemMgrDebug.h" ∂ "{FigmentDir}MemMgrUtils.c" @@ -106,14 +93,12 @@ FigMemoryMgrObjs = "{ObjDir}MemMgrGlue.a.o" ∂ "{ObjDir}"MemMgrDebug.c.o ƒ "{FigmentDir}MemMgr.h" ∂ - "{IntCIncludes}MemoryMgrPriv.h" ∂ "{FigmentDir}MemoryRoutines.h" ∂ "{FigmentDir}MemMgrDebug.h" ∂ "{FigmentDir}MemMgrDebug.c" C {StdCOpts} {MMCOptions} -o "{Targ}" "{FigmentDir}MemMgrDebug.c" "{ObjDir}"QTMemory.c.o ƒ "{FigmentDir}MemMgr.h" ∂ - "{IntCIncludes}MemoryMgrPriv.h" ∂ "{FigmentDir}MemoryRoutines.h" ∂ "{FigmentDir}MemMgrGlue.a" ∂ "{FigmentDir}QTMemory.c" diff --git a/OS/MemoryMgr/MemoryMgr.make b/OS/MemoryMgr/MemoryMgr.make --- a/OS/MemoryMgr/MemoryMgr.make +++ b/OS/MemoryMgr/MemoryMgr.make @@ -34,34 +34,21 @@ MemoryMgrObjs = "{ObjDir}MemoryMgr.a.o" ∂ End -"{ObjDir}BlockMove.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{MemoryMgrDir}BlockMove.a" +"{ObjDir}BlockMove.a.o" ƒ "{MemoryMgrDir}BlockMove.a" Asm {StdAOpts} -o "{Targ}" "{MemoryMgrDir}BlockMove.a" -"{ObjDir}MemoryMgr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}QuickDraw.a" ∂ - "{IntAIncludes}ColorEqu.a" ∂ - "{AIncludes}Palettes.a" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{AIncludes}fsequ.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{MemoryMgrDir}MemoryMgrPriv.a" ∂ +"{ObjDir}MemoryMgr.a.o" ƒ "{MemoryMgrDir}MemoryMgrPriv.a" ∂ "{MemoryMgrDir}MemoryMgr.a" Asm {StdAOpts} -o "{Targ}" "{MemoryMgrDir}MemoryMgr.a" -"{ObjDir}MemoryMgrExtensions.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{MemoryMgrDir}MemoryMgrPriv.a" ∂ +"{ObjDir}MemoryMgrExtensions.a.o" ƒ "{MemoryMgrDir}MemoryMgrPriv.a" ∂ "{MemoryMgrDir}MemoryMgrExtensions.a" Asm {StdAOpts} -o "{Targ}" "{MemoryMgrDir}MemoryMgrExtensions.a" -"{ObjDir}MemoryMgrInternal.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{MemoryMgrDir}MemoryMgrPriv.a" ∂ +"{ObjDir}MemoryMgrInternal.a.o" ƒ "{MemoryMgrDir}MemoryMgrPriv.a" ∂ "{MemoryMgrDir}MemoryMgrInternal.a" Asm {StdAOpts} -o "{Targ}" "{MemoryMgrDir}MemoryMgrInternal.a" diff --git a/OS/NetBoot/NetBoot.make b/OS/NetBoot/NetBoot.make --- a/OS/NetBoot/NetBoot.make +++ b/OS/NetBoot/NetBoot.make @@ -95,8 +95,7 @@ XONetBootOBJ = "{ObjDir}ForXO.a.o" ∂ Asm {StdAOpts} -o "{Targ}" -w -wb -d &ForRam=0 "{NetBootDir}ForXO.a" -"{ObjDir}ATBoot.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{NetBootDir}NetBootEqu.a" ∂ +"{ObjDir}ATBoot.a.o" ƒ "{NetBootDir}NetBootEqu.a" ∂ "{NetBootDir}ATBoot.a" Asm {StdAOpts} -o "{Targ}" -w -wb -d &ForRam=0 "{NetBootDir}ATBoot.a" @@ -110,10 +109,7 @@ XONetBootOBJ = "{ObjDir}ForXO.a.o" ∂ Asm {StdAOpts} -o "{Targ}" -case on -d &ForRam=0 "{NetBootDir}Hash:Hash.a" -"{ObjDir}NetBootlmgr.a.o" ƒ "{NetBootDir}netBootlmgr.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}"AppleTalk.a ∂ - "{IntAIncludes}"ATalkPrivateEQU.a +"{ObjDir}NetBootlmgr.a.o" ƒ "{NetBootDir}netBootlmgr.a" Asm {StdAOpts} -o "{Targ}" -d ATLK=0 -d &ForRam=0 "{NetBootDir}NetBootlmgr.a" -i "{NetBootDir}ATIncludes:" diff --git a/OS/OS.make b/OS/OS.make --- a/OS/OS.make +++ b/OS/OS.make @@ -106,20 +106,11 @@ OSObjs = "{ObjDir}clock.a.o" ∂ Lib {StdLibOpts} {OSObjs} -o "{Targ}" -"{ObjDir}clock.a.o" ƒ "{OSDir}clock.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}IOPrimitiveEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" +"{ObjDir}clock.a.o" ƒ "{OSDir}clock.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}clock.a" -"{ObjDir}CrsrDev.a.o" ƒ "{OSDir}CrsrDev.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}EgretEqu.a" ∂ - "{IntAIncludes}IOPEqu.a" ∂ - "{IntAIncludes}AppleDeskBusPriv.a" ∂ - "{IntAIncludes}CrsrDevEqu.a" +"{ObjDir}CrsrDev.a.o" ƒ "{OSDir}CrsrDev.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}CrsrDev.a" @@ -127,156 +118,73 @@ OSObjs = "{ObjDir}clock.a.o" ∂ Asm {StdAOpts} -o "{Targ}" "{OSDir}CudaMgr.a" -"{ObjDir}DeferredTaskMgr.a.o" ƒ "{OSDir}DeferredTaskMgr.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}HardwareEqu.a" +"{ObjDir}DeferredTaskMgr.a.o" ƒ "{OSDir}DeferredTaskMgr.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}DeferredTaskMgr.a" -"{ObjDir}DeviceMgr.a.o" ƒ "{OSDir}DeviceMgr.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{AIncludes}ROMEqu.a" ∂ - "{AIncludes}Slots.a" ∂ - "{AIncludes}FSEqu.a" +"{ObjDir}DeviceMgr.a.o" ƒ "{OSDir}DeviceMgr.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}DeviceMgr.a" -"{ObjDir}DispatchHelper.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{OSDir}DispatchHelper.a" +"{ObjDir}DispatchHelper.a.o" ƒ "{OSDir}DispatchHelper.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}DispatchHelper.a" -"{ObjDir}DispTable.a.o" ƒ "{OSDir}DispTable.a" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{AIncludes}HardwareEqu.a" +"{ObjDir}DispTable.a.o" ƒ "{OSDir}DispTable.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}DispTable.a" -"{ObjDir}DockingMgr.a.o" ƒ "{OSDir}DockingMgr.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}PowerPrivEqu.a" ∂ - "{AIncludes}ROMEqu.a" ∂ - "{AIncludes}Slots.a" ∂ - "{AIncludes}SCSI.a" ∂ - "{IntAIncludes}SCSIPriv.a" ∂ - "{IntAIncludes}DockingEqu.a" +"{ObjDir}DockingMgr.a.o" ƒ "{OSDir}DockingMgr.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}DockingMgr.a" -"{ObjDir}EgretMgr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}InternalOnlyEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{IntAIncludes}IOPEqu.a" ∂ - "{IntAIncludes}AppleDeskBusPriv.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}EgretEqu.a" ∂ - "{OSDir}EgretMgr.a" +"{ObjDir}EgretMgr.a.o" ƒ "{OSDir}EgretMgr.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}EgretMgr.a" -"{ObjDir}HwPriv.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{OSDir}HwPriv.a" +"{ObjDir}HwPriv.a.o" ƒ "{OSDir}HwPriv.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}HwPriv.a" -"{ObjDir}I2C.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{AIncludes}ROMEqu.a" ∂ - "{IntAIncludes}i2cEqu.a" +"{ObjDir}I2C.a.o" ƒ Asm {StdAOpts} -o "{Targ}" "{I2CDir}I2C.a" -"{ObjDir}InterruptHandlers.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}SysPrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}IOPrimitiveEqu.a" ∂ - "{AIncludes}Shutdown.a" ∂ - "{IntAIncludes}PowerPrivEqu.a" ∂ - "{IntAIncludes}EgretEqu.a" ∂ - "{IntAIncludes}PSCEqu.a" ∂ - "{IntAIncludes}AMICEqu.a" ∂ - "{IntAIncludes}GrandCentralPriv.a" ∂ - "{OSDir}InterruptHandlers.a" +"{ObjDir}InterruptHandlers.a.o" ƒ "{OSDir}InterruptHandlers.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}InterruptHandlers.a" -"{ObjDir}IOPMgr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}IOPequ.a" ∂ - "{OSDir}IOPMgr.a" +"{ObjDir}IOPMgr.a.o" ƒ "{OSDir}IOPMgr.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}IOPMgr.a" -"{ObjDir}OverPatch.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}Slots.a" ∂ - "{AIncludes}ROMEqu.a" ∂ - "{AIncludes}Video.a" ∂ - "{OSDir}OverPatch.a" +"{ObjDir}OverPatch.a.o" ƒ "{OSDir}OverPatch.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}OverPatch.a" "{ObjDir}MagicData.a.o" ƒ "{OSDir}MagicData.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}MagicData.a" -"{ObjDir}OSEventMgr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{OSDir}OSEventMgr.a" +"{ObjDir}OSEventMgr.a.o" ƒ "{OSDir}OSEventMgr.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}OSEventMgr.a" -"{ObjDir}Queue.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{OSDir}Queue.a" +"{ObjDir}Queue.a.o" ƒ "{OSDir}Queue.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}Queue.a" -"{ObjDir}sysUtil.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}GestaltEqu.a" ∂ - "{IntAIncludes}IOPrimitiveEqu.a" ∂ - "{IntAIncludes}ReliabilityEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{OSDir}sysUtil.a" +"{ObjDir}sysUtil.a.o" ƒ "{OSDir}sysUtil.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}sysUtil.a" -"{ObjDir}Universal.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{AIncludes}Slots.a" ∂ - "{OSDir}Universal.a" +"{ObjDir}Universal.a.o" ƒ "{OSDir}Universal.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}Universal.a" -i "{OSDir}StartMgr" -"{ObjDir}UniversalTables.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{AIncludes}Slots.a" ∂ - "{IntAincludes}DepVideoEqu.a" ∂ - "{AIncludes}ROMEqu.a" ∂ - "{OSDir}UniversalTables.a" +"{ObjDir}UniversalTables.a.o" ƒ "{OSDir}UniversalTables.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}UniversalTables.a" -i "{OSDir}IoPrimitives:" -"{ObjDir}VerticalRetraceMgr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}Slots.a" ∂ - "{IntAIncludes}SlotMgrEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{OSDir}VerticalRetraceMgr.a" +"{ObjDir}VerticalRetraceMgr.a.o" ƒ "{OSDir}VerticalRetraceMgr.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}VerticalRetraceMgr.a" -"{ObjDir}WallyWorld.a.o" ƒ "{AIncludes}Private.a" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{OSDir}WallyWorld.a" +"{ObjDir}WallyWorld.a.o" ƒ "{OSDir}WallyWorld.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}WallyWorld.a" diff --git a/OS/PPC/PPC.make b/OS/PPC/PPC.make --- a/OS/PPC/PPC.make +++ b/OS/PPC/PPC.make @@ -48,17 +48,11 @@ PPCBrowserObjs = "{ObjDir}PPCBrowser.a.o" ∂ Link {StdLOpts} {StdAlign} -o "{Targ}" {PPCBrowserObjs} -m BrowsePackEntry -rt PACK=9 || Exit 1 -"{RsrcDir}PPC.rsrc" ƒƒ "{RIncludes}Types.r" ∂ - "{RIncludes}SysTypes.r" ∂ - "{RIncludes}BalloonTypes.r" ∂ - "{PPCDir}PPCBrowser.r" +"{RsrcDir}PPC.rsrc" ƒƒ "{PPCDir}PPCBrowser.r" Rez {StdROpts} -o "{Targ}" "{PPCDir}PPCBrowser.r" -a || Exit 1 -"{ObjDir}BTIntf.a.o" ƒ "{AIncludes}Traps.a" ∂ - "{AIncludes}ToolUtils.a" ∂ - "{IntAIncludes}BTreeEqu.a" ∂ - "{PPCDir}BTIntf.a" +"{ObjDir}BTIntf.a.o" ƒ "{PPCDir}BTIntf.a" Asm {StdAOpts} -o "{Targ}" "{PPCDir}BTIntf.a" @@ -68,211 +62,73 @@ PPCBrowserObjs = "{ObjDir}PPCBrowser.a.o" ∂ "{ObjDir}PPCAuth.c.o" ƒ "{PPCDir}PPCCommon.h" ∂ "{PPCDir}UserGroup.h" ∂ - "{CIncludes}Types.h" ∂ - "{CIncludes}Files.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}ToolUtils.h" ∂ - "{IntCIncludes}BTEqu.h" ∂ - "{CIncludes}OSUtils.h" ∂ - "{CIncludes}Devices.h" ∂ - "{CIncludes}AppleTalk.h" ∂ - "{CIncludes}ADSP.h" ∂ - "{CIncludes}PPCToolbox.h" ∂ "{PPCDir}PPCAuth.c" C {StdCOpts} -o "{Targ}" "{PPCDir}PPCAuth.c" -"{ObjDir}PPCDispatcher.a.o" ƒ "{AIncludes}Traps.a" ∂ - "{AIncludes}ToolUtils.a" ∂ - "{AIncludes}PPCToolbox.a" ∂ - "{PPCDir}PPCDispatcher.a" +"{ObjDir}PPCDispatcher.a.o" ƒ "{PPCDir}PPCDispatcher.a" Asm {StdAOpts} -o "{Targ}" "{PPCDir}PPCDispatcher.a" "{ObjDir}PPCDsp.c.o" ƒ "{PPCDir}PPCCommon.h" ∂ "{PPCDir}UserGroup.h" ∂ - "{CIncludes}Types.h" ∂ - "{CIncludes}Files.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}ToolUtils.h" ∂ - "{IntCIncludes}BTEqu.h" ∂ - "{CIncludes}OSUtils.h" ∂ - "{CIncludes}Devices.h" ∂ - "{CIncludes}AppleTalk.h" ∂ - "{CIncludes}ADSP.h" ∂ - "{CIncludes}PPCToolbox.h" ∂ "{PPCDir}PPCDsp.c" C {StdCOpts} -o "{Targ}" "{PPCDir}PPCDsp.c" "{ObjDir}PPCEntry.c.o" ƒ "{PPCDir}PPCCommon.h" ∂ "{PPCDir}UserGroup.h" ∂ - "{CIncludes}Types.h" ∂ - "{CIncludes}Files.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}ToolUtils.h" ∂ - "{IntCIncludes}BTEqu.h" ∂ - "{CIncludes}OSUtils.h" ∂ - "{CIncludes}Devices.h" ∂ - "{CIncludes}AppleTalk.h" ∂ - "{CIncludes}ADSP.h" ∂ - "{CIncludes}PPCToolbox.h" ∂ "{PPCDir}PPCEntry.c" C {StdCOpts} -o "{Targ}" "{PPCDir}PPCEntry.c" "{ObjDir}PPCInit.c.o" ƒ "{PPCDir}PPCCommon.h" ∂ "{PPCDir}UserGroup.h" ∂ - "{CIncludes}Types.h" ∂ - "{CIncludes}Files.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}ToolUtils.h" ∂ - "{IntCIncludes}BTEqu.h" ∂ - "{CIncludes}OSUtils.h" ∂ - "{CIncludes}Devices.h" ∂ - "{CIncludes}AppleTalk.h" ∂ - "{CIncludes}ADSP.h" ∂ - "{CIncludes}PPCToolbox.h" ∂ "{PPCDir}PPCInit.c" C {StdCOpts} -o "{Targ}" "{PPCDir}PPCInit.c" "{ObjDir}PPCLoader.c.o" ƒ "{PPCDir}PPCCommon.h" ∂ "{PPCDir}UserGroup.h" ∂ - "{CIncludes}Types.h" ∂ - "{CIncludes}Files.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}ToolUtils.h" ∂ - "{IntCIncludes}BTEqu.h" ∂ - "{CIncludes}OSUtils.h" ∂ - "{CIncludes}Devices.h" ∂ - "{CIncludes}AppleTalk.h" ∂ - "{CIncludes}ADSP.h" ∂ - "{CIncludes}PPCToolbox.h" ∂ "{PPCDir}PPCLoader.c" C {StdCOpts} -o "{Targ}" "{PPCDir}PPCLoader.c" "{ObjDir}PPCLocal.c.o" ƒ "{PPCDir}PPCCommon.h" ∂ "{PPCDir}UserGroup.h" ∂ - "{CIncludes}Types.h" ∂ - "{CIncludes}Files.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}ToolUtils.h" ∂ - "{IntCIncludes}BTEqu.h" ∂ - "{CIncludes}OSUtils.h" ∂ - "{CIncludes}Devices.h" ∂ - "{CIncludes}AppleTalk.h" ∂ - "{CIncludes}ADSP.h" ∂ - "{CIncludes}PPCToolbox.h" ∂ "{PPCDir}PPCLocal.c" C {StdCOpts} -o "{Targ}" "{PPCDir}PPCLocal.c" "{ObjDir}PPCNbp.c.o" ƒ "{PPCDir}PPCCommon.h" ∂ "{PPCDir}UserGroup.h" ∂ - "{CIncludes}Types.h" ∂ - "{CIncludes}Files.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}ToolUtils.h" ∂ - "{IntCIncludes}BTEqu.h" ∂ - "{CIncludes}OSUtils.h" ∂ - "{CIncludes}Devices.h" ∂ - "{CIncludes}AppleTalk.h" ∂ - "{CIncludes}ADSP.h" ∂ - "{CIncludes}PPCToolbox.h" ∂ "{PPCDir}PPCNbp.c" C {StdCOpts} -o "{Targ}" "{PPCDir}PPCNbp.c" "{ObjDir}PPCNetwork.c.o" ƒ "{PPCDir}PPCCommon.h" ∂ "{PPCDir}UserGroup.h" ∂ - "{CIncludes}Types.h" ∂ - "{CIncludes}Files.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}ToolUtils.h" ∂ - "{IntCIncludes}BTEqu.h" ∂ - "{CIncludes}OSUtils.h" ∂ - "{CIncludes}Devices.h" ∂ - "{CIncludes}AppleTalk.h" ∂ - "{CIncludes}ADSP.h" ∂ - "{CIncludes}PPCToolbox.h" ∂ "{PPCDir}PPCNetwork.c" C {StdCOpts} -o "{Targ}" "{PPCDir}PPCNetwork.c" -"{ObjDir}PPCInstall.a.o" ƒ "{PPCDir}PPCInstall.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}GestaltEqu.a" ∂ - "{AIncludes}ShutDown.a" +"{ObjDir}PPCInstall.a.o" ƒ "{PPCDir}PPCInstall.a" Asm {StdAOpts} -o "{Targ}" "{PPCDir}PPCInstall.a" "{ObjDir}PPCPort.c.o" ƒ "{PPCDir}PPCCommon.h" ∂ "{PPCDir}UserGroup.h" ∂ - "{CIncludes}Types.h" ∂ - "{CIncludes}Files.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}ToolUtils.h" ∂ - "{IntCIncludes}BTEqu.h" ∂ - "{CIncludes}OSUtils.h" ∂ - "{CIncludes}Devices.h" ∂ - "{CIncludes}AppleTalk.h" ∂ - "{CIncludes}ADSP.h" ∂ - "{CIncludes}PPCToolbox.h" ∂ "{PPCDir}PPCPort.c" C {StdCOpts} -o "{Targ}" "{PPCDir}PPCPort.c" "{ObjDir}PPCSession.c.o" ƒ "{PPCDir}PPCCommon.h" ∂ "{PPCDir}UserGroup.h" ∂ - "{CIncludes}Types.h" ∂ - "{CIncludes}Files.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}ToolUtils.h" ∂ - "{IntCIncludes}BTEqu.h" ∂ - "{CIncludes}OSUtils.h" ∂ - "{CIncludes}Devices.h" ∂ - "{CIncludes}AppleTalk.h" ∂ - "{CIncludes}ADSP.h" ∂ - "{CIncludes}PPCToolbox.h" ∂ "{PPCDir}PPCSession.c" C {StdCOpts} -o "{Targ}" "{PPCDir}PPCSession.c" "{ObjDir}StoreAndForward.c.o" ƒ "{PPCDir}PPCCommon.h" ∂ - "{CIncludes}Types.h" ∂ - "{CIncludes}Files.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}ToolUtils.h" ∂ - "{IntCIncludes}BTEqu.h" ∂ - "{CIncludes}OSUtils.h" ∂ - "{CIncludes}Devices.h" ∂ - "{CIncludes}AppleTalk.h" ∂ - "{CIncludes}ADSP.h" ∂ - "{CIncludes}PPCToolbox.h" ∂ "{PPCDir}StoreAndForward.c" C {StdCOpts} -o "{Targ}" "{PPCDir}StoreAndForward.c" @@ -282,49 +138,24 @@ PPCBrowserObjs = "{ObjDir}PPCBrowser.a.o" ∂ C {StdCOpts} -o "{Targ}" "{PPCDir}PPCUtilities.c" -"{ObjDir}PPCUtil.a.o" ƒ "{AIncludes}Traps.a" ∂ - "{AIncludes}ToolUtils.a" ∂ - "{AIncludes}PPCToolbox.a" ∂ - "{AIncludes}QuickDraw.a" ∂ - "{PPCDir}PPCUtil.a" +"{ObjDir}PPCUtil.a.o" ƒ "{PPCDir}PPCUtil.a" Asm {StdAOpts} -o "{Targ}" "{PPCDir}PPCUtil.a" -"{ObjDir}PromptForUser.a.o" ƒ "{AIncludes}Traps.a" ∂ - "{AIncludes}QuickDraw.a" ∂ - "{AIncludes}SysErr.a" ∂ - "{AIncludes}ToolUtils.a" ∂ - "{AIncludes}FSEqu.a" ∂ - "{AIncludes}AppleTalk.a" ∂ - "{PPCDir}PromptForUserEqu.a" ∂ +"{ObjDir}PromptForUser.a.o" ƒ "{PPCDir}PromptForUserEqu.a" ∂ "{PPCDir}PromptForUser.a" Asm {StdAOpts} -o "{Targ}" "{PPCDir}PromptForUser.a" -"{ObjDir}PPCBrowserPackEntry.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}DispatchHelperPriv.a" ∂ - "{PPCDir}PPCBrowserPackEntry.a" +"{ObjDir}PPCBrowserPackEntry.a.o" ƒ "{PPCDir}PPCBrowserPackEntry.a" Asm {StdAOpts} -o "{Targ}" "{PPCDir}PPCBrowserPackEntry.a" -"{ObjDir}PPCBrowser.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}Packages.a" ∂ - "{PPCDir}PPCBrowser.a" +"{ObjDir}PPCBrowser.a.o" ƒ "{PPCDir}PPCBrowser.a" Asm {StdAOpts} -o "{Targ}" "{PPCDir}PPCBrowser.a" "{ObjDir}PPCBrowser.c.o" ƒ "{PPCDir}PPCBrowserPriv.h" ∂ - "{CIncludes}Types.h" ∂ - "{CIncludes}stdio.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}Files.h" ∂ - "{CIncludes}ToolUtils.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}Packages.h" ∂ - "{CIncludes}Lists.h" ∂ - "{IntCIncludes}IntlUtilsPriv.h" ∂ - "{CIncludes}PPCToolbox.h" ∂ "{PPCDir}PPCBrowser.c" C {StdCOpts} -o "{Targ}" "{PPCDir}PPCBrowser.c" diff --git a/OS/PowerMgr/PowerMgr.make b/OS/PowerMgr/PowerMgr.make --- a/OS/PowerMgr/PowerMgr.make +++ b/OS/PowerMgr/PowerMgr.make @@ -14,37 +14,9 @@ # -"{ObjDir}PowerMgr.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}PowerPrivEqu.a" ∂ - "{AIncludes}AppleTalk.a" ∂ - "{AIncludes}Notification.a" ∂ - "{IntAIncludes}IopEqu.a" ∂ - "{IntAIncludes}EgretEqu.a" ∂ - "{IntAIncludes}AppleDeskBusPriv.a" ∂ - "{IntAIncludes}MMUEqu.a" ∂ - "{IntAIncludes}IOPrimitiveEqu.a" ∂ - "{AIncludes}LAPEqu.a" ∂ - "{IntAIncludes}DockingEqu.a" ∂ - "{AIncludes}Slots.a" ∂ - "{PowerMgrDir}PowerMgr.a" +"{ObjDir}PowerMgr.a.o" ƒ "{PowerMgrDir}PowerMgr.a" Asm {StdAOpts} -o "{Targ}" "{PowerMgrDir}PowerMgr.a" -"{ObjDir}PwrControlsPatches.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}PowerPrivEqu.a" ∂ - "{AIncludes}AppleTalk.a" ∂ - "{AIncludes}Notification.a" ∂ - "{IntAIncludes}IopEqu.a" ∂ - "{IntAIncludes}EgretEqu.a" ∂ - "{IntAIncludes}AppleDeskBusPriv.a" ∂ - "{IntAIncludes}MMUEqu.a" ∂ - "{IntAIncludes}IOPrimitiveEqu.a" ∂ - "{AIncludes}LAPEqu.a" ∂ - "{IntAIncludes}DockingEqu.a" ∂ - "{AIncludes}Slots.a" ∂ - "{PowerMgrDir}PwrControlsPatches.a" +"{ObjDir}PwrControlsPatches.o" ƒ "{PowerMgrDir}PwrControlsPatches.a" Asm {StdAOpts} -o "{Targ}" "{PowerMgrDir}PwrControlsPatches.a" diff --git a/OS/SCSIMgr/SCSIMgr.make b/OS/SCSIMgr/SCSIMgr.make --- a/OS/SCSIMgr/SCSIMgr.make +++ b/OS/SCSIMgr/SCSIMgr.make @@ -42,206 +42,79 @@ SCSIObjects = "{ObjDir}scsiboot.a.o" ∂ Lib {StdLibOpts} -o "{Targ}" {SCSIObjects} -"{ObjDir}SCSIBoot.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{AIncludes}SCSI.a" ∂ - "{SCSIDir}SCSIBoot.a" +"{ObjDir}SCSIBoot.a.o" ƒ "{SCSIDir}SCSIBoot.a" Asm {StdAOpts} -o "{Targ}" "{SCSIDir}SCSIBoot.a" -"{ObjDir}SCSIDiskMode.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{AIncludes}SCSI.a" ∂ - "{IntAIncludes}PowerPrivEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{AIncludes}Video.a" ∂ - "{IntAIncludes}DockingEqu.a" ∂ - "{IntAIncludes}SCSIDiskModeEqu.a" ∂ - "{SCSIDir}SCSIDiskMode.a" +"{ObjDir}SCSIDiskMode.a.o" ƒ "{SCSIDir}SCSIDiskMode.a" Asm {StdAOpts} -o "{Targ}" "{SCSIDir}SCSIDiskMode.a" -"{ObjDir}SCSIMgrHW.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}SCSI.a" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}SCSIPriv.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{SCSIDir}SCSIMgrHW.a" +"{ObjDir}SCSIMgrHW.a.o" ƒ "{SCSIDir}SCSIMgrHW.a" Asm {StdAOpts} -o "{Targ}" "{SCSIDir}SCSIMgrHW.a" -"{ObjDir}SCSILinkPatch.a.o" ƒ "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}SCSIPriv.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}SCSI.a" ∂ - "{SCSIDir}SCSILinkPatch.a" +"{ObjDir}SCSILinkPatch.a.o" ƒ "{SCSIDir}SCSILinkPatch.a" Asm {StdAOpts} -o "{Targ}" "{SCSIDir}SCSILinkPatch.a" -"{ObjDir}SCSIMgrHW96.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}PowerPrivEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{Aincludes}SCSI.a" ∂ - "{IntAIncludes}SCSIPriv.a" ∂ - "{IntAIncludes}SCSIEqu96.a" ∂ - "{SCSIDir}SCSIMgrHW96.a" +"{ObjDir}SCSIMgrHW96.a.o" ƒ "{SCSIDir}SCSIMgrHW96.a" Asm {StdAOpts} -o "{Targ}" "{SCSIDir}SCSIMgrHW96.a" -"{ObjDir}SCSIMgrHWPSC.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{Aincludes}SCSI.a" ∂ - "{IntAIncludes}SCSIPriv.a" ∂ - "{IntAIncludes}SCSIEqu96.a" ∂ - "{IntAIncludes}MC680x0.a" ∂ - "{SCSIDir}SCSIMgrHWPSC.a" +"{ObjDir}SCSIMgrHWPSC.a.o" ƒ "{SCSIDir}SCSIMgrHWPSC.a" Asm {StdAOpts} -o "{Targ}" "{SCSIDir}SCSIMgrHWPSC.a" -"{ObjDir}SCSIMgrInit.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}SCSI.a" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}SCSIPriv.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{AIncludes}GestaltEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{IntAIncludes}SCSIEqu96.a" ∂ - "{SCSIDir}SCSIMgrInit.a" +"{ObjDir}SCSIMgrInit.a.o" ƒ "{SCSIDir}SCSIMgrInit.a" Asm {StdAOpts} -o "{Targ}" "{SCSIDir}SCSIMgrInit.a" -l -lo "{ObjDir}SCSIMgrInit.a.lst" -"{ObjDir}SCSIMgrInit96.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{Aincludes}SCSI.a" ∂ - "{IntAIncludes}SCSIPriv.a" ∂ - "{IntAIncludes}PowerPrivEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}SCSIEqu96.a" ∂ - "{SCSIDir}SCSIMgrInit96.a" +"{ObjDir}SCSIMgrInit96.a.o" ƒ "{SCSIDir}SCSIMgrInit96.a" Asm {StdAOpts} -o "{Targ}" "{SCSIDir}SCSIMgrInit96.a" -"{ObjDir}SCSIMgrInitPSC.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{Aincludes}SCSI.a" ∂ - "{IntAIncludes}SCSIPriv.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}SCSIEqu96.a" ∂ - "{SCSIDir}SCSIMgrInitPSC.a" +"{ObjDir}SCSIMgrInitPSC.a.o" ƒ "{SCSIDir}SCSIMgrInitPSC.a" Asm {StdAOpts} -o "{Targ}" "{SCSIDir}SCSIMgrInitPSC.a" -"{ObjDir}SCSIMgrInitFlags.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}SCSI.a" ∂ - "{AIncludes}GestaltEqu.a" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{SCSIDir}SCSIMgrInitFlags.a" +"{ObjDir}SCSIMgrInitFlags.a.o" ƒ "{SCSIDir}SCSIMgrInitFlags.a" Asm {StdAOpts} -o "{Targ}" "{SCSIDir}SCSIMgrInitFlags.a" -"{ObjDir}SCSIEqu96.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{Aincludes}SCSI.a" ∂ - "{IntAIncludes}SCSIPriv.a" ∂ - "{IntAIncludes}PowerPrivEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{SCSIDir}SCSIEqu96.a" +"{ObjDir}SCSIEqu96.a.o" ƒ "{SCSIDir}SCSIEqu96.a" Asm {StdAOpts} -o "{Targ}" "{SCSIDir}SCSIEqu96.a" -"{ObjDir}SCSIMgrPSC.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{Aincludes}SCSI.a" ∂ - "{IntAIncludes}SCSIPriv.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}MC680x0.a" ∂ - "{IntAIncludes}SCSIEqu96.a" ∂ - "{SCSIDir}SCSIMgrPSC.a" +"{ObjDir}SCSIMgrPSC.a.o" ƒ "{SCSIDir}SCSIMgrPSC.a" Asm {StdAOpts} -o "{Targ}" "{SCSIDir}SCSIMgrPSC.a" -"{ObjDir}SCSIMgr96.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{Aincludes}SCSI.a" ∂ - "{IntAIncludes}SCSIPriv.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}MC680x0.a" ∂ - "{IntAIncludes}SCSIEqu96.a" ∂ - "{SCSIDir}SCSIMgr96.a" +"{ObjDir}SCSIMgr96.a.o" ƒ "{SCSIDir}SCSIMgr96.a" Asm {StdAOpts} -o "{Targ}" "{SCSIDir}SCSIMgr96.a" -"{ObjDir}SCSIMgrNew.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}SCSI.a" ∂ - "{IntAIncludes}SCSIPriv.a" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{IntAIncludes}SCSIEqu96.a" ∂ - "{SCSIDir}SCSIMgrNew.a" +"{ObjDir}SCSIMgrNew.a.o" ƒ "{SCSIDir}SCSIMgrNew.a" Asm {StdAOpts} -o "{Targ}" "{SCSIDir}SCSIMgrNew.a" -"{ObjDir}SCSIMgrOld.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}SCSI.a" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}SCSIPriv.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{SCSIDir}SCSIMgrOld.a" +"{ObjDir}SCSIMgrOld.a.o" ƒ "{SCSIDir}SCSIMgrOld.a" Asm {StdAOpts} -o "{Targ}" "{SCSIDir}SCSIMgrOld.a" -"{ObjDir}scsiLateLoad.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}SCSIPriv.a" ∂ - "{AIncludes}FSEqu.a" ∂ - "{SCSIDir}scsiLateLoad.a" +"{ObjDir}scsiLateLoad.a.o" ƒ "{SCSIDir}scsiLateLoad.a" Asm {StdAOpts} -o "{Targ}" "{SCSIDir}scsiLateLoad.a" -"{ObjDir}SCSIMgr96BIOS.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{Aincludes}SCSI.a" ∂ - "{IntAIncludes}SCSIPriv.a" ∂ - "{IntAIncludes}PowerPrivEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}SCSIEqu96.a" +"{ObjDir}SCSIMgr96BIOS.a.o" ƒ Asm {StdAOpts} -o "{Targ}" "{SCSIDir}SCSIMgr96BIOS.a" -"{ObjDir}SCSIMgrHW96BIOS.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}PowerPrivEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{Aincludes}SCSI.a" ∂ - "{IntAIncludes}SCSIPriv.a" ∂ - "{IntAIncludes}SCSIEqu96.a" +"{ObjDir}SCSIMgrHW96BIOS.a.o" ƒ Asm {StdAOpts} -o "{Targ}" "{SCSIDir}SCSIMgrHW96BIOS.a" -"{ObjDir}SCSIMgrInit96BIOS.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{Aincludes}SCSI.a" ∂ - "{IntAIncludes}SCSIPriv.a" ∂ - "{IntAIncludes}PowerPrivEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}SCSIEqu96.a" +"{ObjDir}SCSIMgrInit96BIOS.a.o" ƒ Asm {StdAOpts} -o "{Targ}" "{SCSIDir}SCSIMgrInit96BIOS.a" -"{ObjDir}SCSIMgrInitDB.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{Aincludes}SCSI.a" ∂ - "{IntAIncludes}SCSIPriv.a" ∂ - "{IntAIncludes}PowerPrivEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" +"{ObjDir}SCSIMgrInitDB.a.o" ƒ Asm {StdAOpts} -o "{Targ}" "{SCSIDir}SCSIMgrInitDB.a" -"{ObjDir}SCSIMgrDB.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{Aincludes}SCSI.a" ∂ - "{IntAIncludes}SCSIPriv.a" ∂ - "{IntAIncludes}PowerPrivEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" +"{ObjDir}SCSIMgrDB.a.o" ƒ Asm {StdAOpts} -o "{Targ}" "{SCSIDir}SCSIMgrDB.a" diff --git a/OS/SCSIMgr4pt3/SCSIMgr4pt3.make b/OS/SCSIMgr4pt3/SCSIMgr4pt3.make --- a/OS/SCSIMgr4pt3/SCSIMgr4pt3.make +++ b/OS/SCSIMgr4pt3/SCSIMgr4pt3.make @@ -78,18 +78,13 @@ SCSI4pt3Objects = "{ObjDir}BootItt.a.o" ∂ -o "{Targ}" {SCSI4pt3Objects} -"{ObjDir}BootItt.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{SCSI4pt3Dir}Debug.a" ∂ - "{AIncludes}SCSI.a" ∂ +"{ObjDir}BootItt.a.o" ƒ "{SCSI4pt3Dir}Debug.a" ∂ "{SCSI4pt3Dir}ACAM.a" ∂ "{SCSI4pt3Dir}BootItt.a" Asm {StdAOpts} -o "{Targ}" "{SCSI4pt3Dir}BootItt.a" -"{ObjDir}HALc96.a.o" ƒ "{AIncludes}SysEqu.a" ∂ - "{AIncludes}SysErr.a" ∂ - "{SCSI4pt3Dir}Debug.a" ∂ - "{AIncludes}SCSI.a" ∂ +"{ObjDir}HALc96.a.o" ƒ "{SCSI4pt3Dir}Debug.a" ∂ "{SCSI4pt3Dir}SCSIEqu53c96.a" ∂ "{SCSI4pt3Dir}ACAM.a" ∂ "{SCSI4pt3Dir}SIMCoreEqu.a" ∂ @@ -99,7 +94,6 @@ SCSI4pt3Objects = "{ObjDir}BootItt.a.o" ∂ "{ObjDir}HALc96AMIC.a.o" ƒ "{SCSI4pt3Dir}Debug.a" ∂ - "{AIncludes}SCSI.a" ∂ "{SCSI4pt3Dir}SCSIEqu53c96.a" ∂ "{SCSI4pt3Dir}ACAM.a" ∂ "{SCSI4pt3Dir}SIMCoreEqu.a" ∂ @@ -108,13 +102,8 @@ SCSI4pt3Objects = "{ObjDir}BootItt.a.o" ∂ Asm {StdAOpts} -o "{Targ}" "{SCSI4pt3Dir}HALc96AMIC.a" -"{ObjDir}HALc96BIOS.a.o" ƒ "{AIncludes}SysErr.a" ∂ - "{AIncludes}SysEqu.a" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}MC680x0.a" ∂ - "{SCSI4pt3Dir}Debug.a" ∂ +"{ObjDir}HALc96BIOS.a.o" ƒ "{SCSI4pt3Dir}Debug.a" ∂ "{SCSI4pt3Dir}ACAM.a" ∂ - "{AIncludes}SCSI.a" ∂ "{SCSI4pt3Dir}XPTEqu.a" ∂ "{SCSI4pt3Dir}SCSIEqu53c96.a" ∂ "{SCSI4pt3Dir}SIMCoreEqu.a" ∂ @@ -123,9 +112,7 @@ SCSI4pt3Objects = "{ObjDir}BootItt.a.o" ∂ Asm {StdAOpts} -o "{Targ}" "{SCSI4pt3Dir}HALc96BIOS.a" -"{ObjDir}HALc96Data.a.o" ƒ "{AIncludes}SysErr.a" ∂ - "{SCSI4pt3Dir}Debug.a" ∂ - "{AIncludes}SCSI.a" ∂ +"{ObjDir}HALc96Data.a.o" ƒ "{SCSI4pt3Dir}Debug.a" ∂ "{SCSI4pt3Dir}SCSIEqu53c96.a" ∂ "{SCSI4pt3Dir}ACAM.a" ∂ "{SCSI4pt3Dir}SIMCoreEqu.a" ∂ @@ -135,9 +122,7 @@ SCSI4pt3Objects = "{ObjDir}BootItt.a.o" ∂ Asm {StdAOpts} -o "{Targ}" "{SCSI4pt3Dir}HALc96Data.a" -"{ObjDir}HALc96DMA.a.o" ƒ "{AIncludes}SysErr.a" ∂ - "{SCSI4pt3Dir}Debug.a" ∂ - "{AIncludes}SCSI.a" ∂ +"{ObjDir}HALc96DMA.a.o" ƒ "{SCSI4pt3Dir}Debug.a" ∂ "{SCSI4pt3Dir}SCSIEqu53c96.a" ∂ "{SCSI4pt3Dir}ACAM.a" ∂ "{SCSI4pt3Dir}SIMCoreEqu.a" ∂ @@ -147,17 +132,11 @@ SCSI4pt3Objects = "{ObjDir}BootItt.a.o" ∂ "{ObjDir}HALc96GC.a.o" ƒ "{SCSI4pt3Dir}HALc96GC.a" ∂ - "{AIncludes}DBDMA.a" ∂ - "{SCSI4pt3Dir}HALc96equ.a" ∂ - "{IntAIncludes}GrandCentralPriv.a" + "{SCSI4pt3Dir}HALc96equ.a" Asm -case on {StdAOpts} -o "{Targ}" "{SCSI4pt3Dir}HALc96GC.a" -"{ObjDir}HALc96HWInit.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{SCSI4pt3Dir}Debug.a" ∂ - "{AIncludes}SCSI.a" ∂ +"{ObjDir}HALc96HWInit.a.o" ƒ "{SCSI4pt3Dir}Debug.a" ∂ "{SCSI4pt3Dir}SCSIEqu53c96.a" ∂ "{SCSI4pt3Dir}HALc96equ.a" ∂ "{SCSI4pt3Dir}HALc96HWInit.a" @@ -165,7 +144,6 @@ SCSI4pt3Objects = "{ObjDir}BootItt.a.o" ∂ "{ObjDir}HALc96Init.a.o" ƒ "{SCSI4pt3Dir}Debug.a" ∂ - "{AIncludes}SCSI.a" ∂ "{SCSI4pt3Dir}SCSIEqu53c96.a" ∂ "{SCSI4pt3Dir}HALc96equ.a" ∂ "{SCSI4pt3Dir}ACAM.a" ∂ @@ -173,27 +151,17 @@ SCSI4pt3Objects = "{ObjDir}BootItt.a.o" ∂ Asm {StdAOpts} -o "{Targ}" "{SCSI4pt3Dir}HALc96Init.a" -"{ObjDir}HALc96PSC.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{SCSI4pt3Dir}Debug.a" ∂ - "{AIncludes}SCSI.a" ∂ +"{ObjDir}HALc96PSC.a.o" ƒ "{SCSI4pt3Dir}Debug.a" ∂ "{SCSI4pt3Dir}SCSIEqu53c96.a" ∂ "{SCSI4pt3Dir}ACAM.a" ∂ "{SCSI4pt3Dir}SIMCoreEqu.a" ∂ "{SCSI4pt3Dir}HALc96equ.a" ∂ - "{IntAIncludes}PSCequ.a" ∂ "{SCSI4pt3Dir}HALc96PSC.a" Asm {StdAOpts} -o "{Targ}" "{SCSI4pt3Dir}HALc96PSC.a" -"{ObjDir}HALc96Routines.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}MC680x0.a" ∂ - "{SCSI4pt3Dir}Debug.a" ∂ +"{ObjDir}HALc96Routines.a.o" ƒ "{SCSI4pt3Dir}Debug.a" ∂ "{SCSI4pt3Dir}ACAM.a" ∂ - "{AIncludes}SCSI.a" ∂ "{SCSI4pt3Dir}XPTEqu.a" ∂ "{SCSI4pt3Dir}SCSIEqu53c96.a" ∂ "{SCSI4pt3Dir}SIMCoreEqu.a" ∂ @@ -202,45 +170,33 @@ SCSI4pt3Objects = "{ObjDir}BootItt.a.o" ∂ Asm {StdAOpts} -o "{Targ}" "{SCSI4pt3Dir}HALc96Routines.a" -"{ObjDir}IttInit.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{AIncludes}SCSI.a" ∂ - "{SCSI4pt3Dir}Debug.a" ∂ +"{ObjDir}IttInit.a.o" ƒ "{SCSI4pt3Dir}Debug.a" ∂ "{SCSI4pt3Dir}ACAM.a" ∂ "{SCSI4pt3Dir}XPTEqu.a" ∂ "{SCSI4pt3Dir}IttInit.a" Asm {StdAOpts} -o "{Targ}" "{SCSI4pt3Dir}IttInit.a" -"{ObjDir}QueueUtils.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{SCSI4pt3Dir}Debug.a" ∂ +"{ObjDir}QueueUtils.a.o" ƒ "{SCSI4pt3Dir}Debug.a" ∂ "{SCSI4pt3Dir}QueueUtils.a" Asm {StdAOpts} -o "{Targ}" "{SCSI4pt3Dir}QueueUtils.a" -"{ObjDir}Recorder.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{SCSI4pt3Dir}Debug.a" ∂ +"{ObjDir}Recorder.a.o" ƒ "{SCSI4pt3Dir}Debug.a" ∂ "{SCSI4pt3Dir}ACAM.a" ∂ "{SCSI4pt3Dir}XPTEqu.a" ∂ "{SCSI4pt3Dir}Recorder.a" Asm {StdAOpts} -o "{Targ}" "{SCSI4pt3Dir}Recorder.a" -"{ObjDir}SCSIGlue.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{SCSI4pt3Dir}Debug.a" ∂ +"{ObjDir}SCSIGlue.a.o" ƒ "{SCSI4pt3Dir}Debug.a" ∂ "{SCSI4pt3Dir}ACAM.a" ∂ - "{AIncludes}SCSI.a" ∂ "{SCSI4pt3Dir}XPTEqu.a" ∂ "{SCSI4pt3Dir}SCSIGlue.a" Asm {StdAOpts} -o "{Targ}" "{SCSI4pt3Dir}SCSIGlue.a" -"{ObjDir}SIMmachine.a.o" ƒ "{AIncludes}SysEqu.a" ∂ - "{AIncludes}Traps.a" ∂ - "{SCSI4pt3Dir}Debug.a" ∂ +"{ObjDir}SIMmachine.a.o" ƒ "{SCSI4pt3Dir}Debug.a" ∂ "{SCSI4pt3Dir}ACAM.a" ∂ "{SCSI4pt3Dir}HALc96equ.a" ∂ "{SCSI4pt3Dir}SIMmachine.a" @@ -260,17 +216,14 @@ SCSI4pt3Objects = "{ObjDir}BootItt.a.o" ∂ Asm {StdAOpts} -o "{Targ}" "{SCSI4pt3Dir}timeout.a" -"{ObjDir}XPT.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{SCSI4pt3Dir}Debug.a" ∂ +"{ObjDir}XPT.a.o" ƒ "{SCSI4pt3Dir}Debug.a" ∂ "{SCSI4pt3Dir}ACAM.a" ∂ "{SCSI4pt3Dir}XPTEqu.a" ∂ "{SCSI4pt3Dir}XPT.a" Asm {StdAOpts} -o "{Targ}" "{SCSI4pt3Dir}XPT.a" -"{ObjDir}XPTSCSIXlate.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{SCSI4pt3Dir}Debug.a" ∂ - "{AIncludes}SCSI.a" ∂ +"{ObjDir}XPTSCSIXlate.a.o" ƒ "{SCSI4pt3Dir}Debug.a" ∂ "{SCSI4pt3Dir}ACAM.a" ∂ "{SCSI4pt3Dir}XPTEqu.a" ∂ "{SCSI4pt3Dir}HALc96equ.a" ∂ @@ -278,20 +231,7 @@ SCSI4pt3Objects = "{ObjDir}BootItt.a.o" ∂ Asm {StdAOpts} -o "{Targ}" "{SCSI4pt3Dir}XPTSCSIXlate.a" -"{ObjDir}BootItt.c.o" ƒ "{CIncludes}Devices.h" ∂ - "{CIncludes}Types.h" ∂ - "{CIncludes}Traps.h" ∂ - "{IntCIncludes}TrapsPrivate.h" ∂ - "{CIncludes}Packages.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}SysEqu.h" ∂ - "{CIncludes}SCSIStandard.h" ∂ - "{CIncludes}SCSI.h" ∂ - "{CIncludes}OSUtils.h" ∂ - "{CIncludes}Devices.h" ∂ - "{CIncludes}Slots.h" ∂ - "{CIncludes}Start.h" ∂ - "{SCSI4pt3Dir}StandardGlue.h" ∂ +"{ObjDir}BootItt.c.o" ƒ "{SCSI4pt3Dir}StandardGlue.h" ∂ "{SCSI4pt3Dir}SCSIDebug.h" ∂ "{SCSI4pt3Dir}ACAM.h" ∂ "{SCSI4pt3Dir}XPT.h" ∂ @@ -301,12 +241,7 @@ SCSI4pt3Objects = "{ObjDir}BootItt.a.o" ∂ C {StdCOpts} -o "{Targ}" "{SCSI4pt3Dir}BootItt.c" -"{ObjDir}HALc96.c.o" ƒ "{CIncludes}Types.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}SCSIStandard.h" ∂ - "{CIncludes}SCSI.h" ∂ - "{SCSI4pt3Dir}ACAM.h" ∂ +"{ObjDir}HALc96.c.o" ƒ "{SCSI4pt3Dir}ACAM.h" ∂ "{SCSI4pt3Dir}XPT.h" ∂ "{SCSI4pt3Dir}XPTpriv.h" ∂ "{SCSI4pt3Dir}SIMCore.h" ∂ @@ -316,14 +251,7 @@ SCSI4pt3Objects = "{ObjDir}BootItt.a.o" ∂ C {StdCOpts} -o "{Targ}" "{SCSI4pt3Dir}HALc96.c" -"{ObjDir}HALc96AMIC.c.o" ƒ "{CIncludes}Types.h" ∂ - "{CIncludes}Traps.h" ∂ - "{IntCIncludes}TrapsPrivate.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}SCSI.h" ∂ - "{CIncludes}SCSIStandard.h" ∂ - "{SCSI4pt3Dir}ACAM.h" ∂ +"{ObjDir}HALc96AMIC.c.o" ƒ "{SCSI4pt3Dir}ACAM.h" ∂ "{SCSI4pt3Dir}SIMCore.h" ∂ "{SCSI4pt3Dir}HALc96.h" ∂ "{SCSI4pt3Dir}SIMCorePriv.h" ∂ @@ -333,24 +261,13 @@ SCSI4pt3Objects = "{ObjDir}BootItt.a.o" ∂ "{ObjDir}HALc96GC.c.o" ƒ "{SCSI4pt3Dir}HALc96GC.c" ∂ "{SCSI4pt3Dir}SIMCorePriv.h" ∂ - "{CIncludes}SCSI.h" ∂ "{SCSI4pt3Dir}SIMCore.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Timer.h" ∂ - "{CIncludes}OSUtils.h" ∂ "{SCSI4pt3Dir}ACAM.h" ∂ - "{CIncludes}Types.h" ∂ - "{CIncludes}Traps.h" ∂ "{SCSI4pt3Dir}HALc96.h" C {StdCOpts} -o "{Targ}" "{SCSI4pt3Dir}HALc96GC.c" -"{ObjDir}HALc96PSC.c.o" ƒ "{CIncludes}Types.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}SCSI.h" ∂ - "{CIncludes}SCSIStandard.h" ∂ - "{SCSI4pt3Dir}ACAM.h" ∂ +"{ObjDir}HALc96PSC.c.o" ƒ "{SCSI4pt3Dir}ACAM.h" ∂ "{SCSI4pt3Dir}SIMCore.h" ∂ "{SCSI4pt3Dir}HALc96.h" ∂ "{SCSI4pt3Dir}SIMCorePriv.h" ∂ @@ -358,14 +275,7 @@ SCSI4pt3Objects = "{ObjDir}BootItt.a.o" ∂ C {StdCOpts} -o "{Targ}" "{SCSI4pt3Dir}HALc96PSC.c" -"{ObjDir}InitItt.c.o" ƒ "{CIncludes}SysEqu.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Start.h" ∂ - "{CIncludes}SCSIStandard.h" ∂ - "{CIncludes}GestaltEqu.h" ∂ - "{IntCIncludes}GestaltPrivateEqu.h" ∂ - "{IntCIncludes}GrandCentralPriv.h" ∂ - "{SCSI4pt3Dir}SCSIDebug.h" ∂ +"{ObjDir}InitItt.c.o" ƒ "{SCSI4pt3Dir}SCSIDebug.h" ∂ "{SCSI4pt3Dir}ACAM.h" ∂ "{SCSI4pt3Dir}XPT.h" ∂ "{SCSI4pt3Dir}SIMCore.h" ∂ @@ -376,14 +286,7 @@ SCSI4pt3Objects = "{ObjDir}BootItt.a.o" ∂ C {StdCOpts} -o "{Targ}" "{SCSI4pt3Dir}InitItt.c" -"{ObjDir}SIMCore.c.o" ƒ "{CIncludes}Types.h" ∂ - "{CIncludes}Traps.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Timer.h" ∂ - "{CIncludes}SCSI.h" ∂ - "{CIncludes}SCSIStandard.h" ∂ - "{SCSI4pt3Dir}ACAM.h" ∂ +"{ObjDir}SIMCore.c.o" ƒ "{SCSI4pt3Dir}ACAM.h" ∂ "{SCSI4pt3Dir}XPT.h" ∂ "{SCSI4pt3Dir}CUtils.h" ∂ "{SCSI4pt3Dir}SIMCore.h" ∂ @@ -397,12 +300,7 @@ SCSI4pt3Objects = "{ObjDir}BootItt.a.o" ∂ C {StdCOpts} -o "{Targ}" "{SCSI4pt3Dir}SIMCore.c" -"{ObjDir}SIMmachine.c.o" ƒ "{CIncludes}Types.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}SCSIStandard.h" ∂ - "{CIncludes}SCSI.h" ∂ - "{SCSI4pt3Dir}ACAM.h" ∂ +"{ObjDir}SIMmachine.c.o" ƒ "{SCSI4pt3Dir}ACAM.h" ∂ "{SCSI4pt3Dir}XPT.h" ∂ "{SCSI4pt3Dir}XPTpriv.h" ∂ "{SCSI4pt3Dir}CUtils.h" ∂ @@ -416,12 +314,7 @@ SCSI4pt3Objects = "{ObjDir}BootItt.a.o" ∂ C {StdCOpts} -o "{Targ}" "{SCSI4pt3Dir}SIMmachine.c" -"{ObjDir}SIMQ.c.o" ƒ "{CIncludes}Types.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}SCSIStandard.h" ∂ - "{CIncludes}SCSI.h" ∂ - "{SCSI4pt3Dir}ACAM.h" ∂ +"{ObjDir}SIMQ.c.o" ƒ "{SCSI4pt3Dir}ACAM.h" ∂ "{SCSI4pt3Dir}CUtils.h" ∂ "{SCSI4pt3Dir}QueueUtils.h" ∂ "{SCSI4pt3Dir}XPT.h" ∂ @@ -435,12 +328,7 @@ SCSI4pt3Objects = "{ObjDir}BootItt.a.o" ∂ C {StdCOpts} -o "{Targ}" "{SCSI4pt3Dir}SIMQ.c" -"{ObjDir}Timeout.c.o" ƒ "{CIncludes}Types.h" ∂ - "{CIncludes}Packages.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}SCSIStandard.h" ∂ - "{CIncludes}SCSI.h" ∂ - "{SCSI4pt3Dir}ACAM.h" ∂ +"{ObjDir}Timeout.c.o" ƒ "{SCSI4pt3Dir}ACAM.h" ∂ "{SCSI4pt3Dir}Recorder.h" ∂ "{SCSI4pt3Dir}SIMCore.h" ∂ "{SCSI4pt3Dir}SIMCorePriv.h" ∂ @@ -449,14 +337,7 @@ SCSI4pt3Objects = "{ObjDir}BootItt.a.o" ∂ C {StdCOpts} -o "{Targ}" "{SCSI4pt3Dir}Timeout.c" -"{ObjDir}XPT.c.o" ƒ "{CIncludes}Types.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}OSUtils.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}SCSIStandard.h" ∂ - "{CIncludes}SCSI.h" ∂ - "{CIncludes}Slots.h" ∂ - "{SCSI4pt3Dir}ACAM.h" ∂ +"{ObjDir}XPT.c.o" ƒ "{SCSI4pt3Dir}ACAM.h" ∂ "{SCSI4pt3Dir}SCSIDebug.h" ∂ "{SCSI4pt3Dir}SCSIGlue.h" ∂ "{SCSI4pt3Dir}SIMCore.h" ∂ @@ -468,20 +349,13 @@ SCSI4pt3Objects = "{ObjDir}BootItt.a.o" ∂ C {StdCOpts} -o "{Targ}" "{SCSI4pt3Dir}XPT.c" -"{ObjDir}XPTfunctions.c.o" ƒ "{CIncludes}Types.h" ∂ - "{CIncludes}Memory.h" ∂ - "{SCSI4pt3Dir}ACAM.h" ∂ +"{ObjDir}XPTfunctions.c.o" ƒ "{SCSI4pt3Dir}ACAM.h" ∂ "{SCSI4pt3Dir}XPT.h" ∂ "{SCSI4pt3Dir}XPTfunctions.c" C {StdCOpts} -o "{Targ}" "{SCSI4pt3Dir}XPTfunctions.c" -"{ObjDir}XPToldCall.c.o" ƒ "{CIncludes}Types.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}OSUtils.h" ∂ - "{CIncludes}SCSIStandard.h" ∂ - "{CIncludes}SCSI.h" ∂ - "{SCSI4pt3Dir}ACAM.h" ∂ +"{ObjDir}XPToldCall.c.o" ƒ "{SCSI4pt3Dir}ACAM.h" ∂ "{SCSI4pt3Dir}SCSIDebug.h" ∂ "{SCSI4pt3Dir}CUtils.h" ∂ "{SCSI4pt3Dir}XPT.h" ∂ diff --git a/OS/SlotMgr/SlotMgr.make b/OS/SlotMgr/SlotMgr.make --- a/OS/SlotMgr/SlotMgr.make +++ b/OS/SlotMgr/SlotMgr.make @@ -22,33 +22,14 @@ SlotMgrObjs = "{ObjDir}SlotInterrupts.a.o" ∂ -"{ObjDir}SlotInterrupts.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}SlotMgrEqu.a" ∂ - "{AIncludes}Slots.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{SlotMgrDir}SlotInterrupts.a" +"{ObjDir}SlotInterrupts.a.o" ƒ "{SlotMgrDir}SlotInterrupts.a" Asm {StdAOpts} -o "{Targ}" "{SlotMgrDir}SlotInterrupts.a" -"{ObjDir}SlotMgrInit.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{AIncludes}RomEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}SlotMgrEqu.a" ∂ - "{AIncludes}Slots.a" ∂ - "{IntAIncludes}ComVideoEqu.a" ∂ - "{SlotMgrDir}SlotMgrInit.a" +"{ObjDir}SlotMgrInit.a.o" ƒ "{SlotMgrDir}SlotMgrInit.a" Asm {StdAOpts} -o "{Targ}" "{SlotMgrDir}SlotMgrInit.a" -"{ObjDir}SlotMgr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{AIncludes}RomEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}SlotMgrEqu.a" ∂ - "{AIncludes}Slots.a" ∂ - "{IntAIncludes}ComVideoEqu.a" ∂ - "{SlotMgrDir}SlotMgr.a" +"{ObjDir}SlotMgr.a.o" ƒ "{SlotMgrDir}SlotMgr.a" Asm {StdAOpts} -o "{Targ}" "{SlotMgrDir}SlotMgr.a" diff --git a/OS/StartMgr/StartMgr.make b/OS/StartMgr/StartMgr.make --- a/OS/StartMgr/StartMgr.make +++ b/OS/StartMgr/StartMgr.make @@ -59,48 +59,19 @@ Boot3Objects = "{ObjDir}Boot3.a.o" ∂ Lib {StdLibOpts} {StartTestObjs} -o "{Targ}" -"{ObjDir}StartAlert.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{StartDir}StartAlert.a" +"{ObjDir}StartAlert.a.o" ƒ "{StartDir}StartAlert.a" Asm {StdAOpts} -o "{Targ}" "{StartDir}StartAlert.a" -"{ObjDir}StartBoot.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{AIncludes}FixMath.a" ∂ - "{AIncludes}Slots.a" ∂ - "{IntAIncludes}SlotMgrEqu.a" ∂ - "{AIncludes}ROMEqu.a" ∂ - "{IntAIncludes}ColorEqu.a" ∂ - "{AIncludes}Aliases.a" ∂ - "{AIncludes}Displays.a" ∂ - "{IntAIncludes}DisplaysPriv.a" ∂ - "{AIncludes}GestaltEqu.a" ∂ - "{IntAIncludes}AtalkPrivateEQU.a" ∂ - "{IntAIncludes}EDiskEqu.a" ∂ - "{IntAIncludes}MMUEqu.a" ∂ - "{IntAincludes}BootEqu.a" ∂ - "{StartDir}StartBoot.a" +"{ObjDir}StartBoot.a.o" ƒ "{StartDir}StartBoot.a" Asm {StdAOpts} -o "{Targ}" "{StartDir}StartBoot.a" -"{ObjDir}StartErr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}MMUEqu.a" ∂ - "{IntAincludes}BootEqu.a" ∂ - "{StartDir}StartErr.a" +"{ObjDir}StartErr.a.o" ƒ "{StartDir}StartErr.a" Asm {StdAOpts} -o "{Targ}" "{StartDir}StartErr.a" -"{ObjDir}StartFail.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{AIncludes}Slots.a" ∂ - "{IntAIncludes}SlotMgrEqu.a" ∂ - "{AIncludes}ROMEqu.a" ∂ - "{AIncludes}Video.a" ∂ - "{StartDir}StartFail.a" +"{ObjDir}StartFail.a.o" ƒ "{StartDir}StartFail.a" Asm {StdAOpts} -o "{Targ}" "{StartDir}StartFail.a" @@ -110,72 +81,21 @@ Boot3Objects = "{ObjDir}Boot3.a.o" ∂ "{ObjDir}StartInit.a.o" ƒ "{MakeDir}Universal.make" ∂ "{MakeDir}RISC.make" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ "{MemoryMgrDir}MemoryMgrPriv.a" ∂ - "{AIncludes}SCSI.a" ∂ - "{IntAIncludes}MMUEqu.a" ∂ - "{IntAincludes}BootEqu.a" ∂ - "{AIncludes}ROMEqu.a" ∂ - "{AIncludes}Slots.a" ∂ - "{IntAIncludes}SlotMgrEqu.a" ∂ - "{AIncludes}Video.a" ∂ - "{IntAincludes}DepVideoEqu.a" ∂ - "{IntAIncludes}ColorEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}ReliabilityEqu.a" ∂ - "{IntAIncludes}EgretEqu.a" ∂ - "{IntAIncludes}EDiskEqu.a" ∂ - "{IntAIncludes}SCSIEqu96.a" ∂ - "{IntAIncludes}PowerPrivEqu.a" ∂ - "{IntAIncludes}PSCEqu.a" ∂ - "{AIncludes}GestaltEqu.a" ∂ - "{IntAIncludes}GestaltPrivateEqu.a" ∂ - "{AIncludes}AppleTalk.a" ∂ - "{IntAIncludes}AtalkPrivateEQU.a" ∂ "{StartDir}StartInit.a" -# Both part of StandardEqu.d -# "{AIncludes}FSEqu.a" ∂ -# "{AIncludes}FSPrivate.a" ∂ Asm {StdAOpts} -o "{Targ}" "{StartDir}StartInit.a" -i "{MemoryMgrDir}" -"{ObjDir}StartSearch.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{AIncludes}Devices.a" ∂ - "{IntAIncludes}PowerPrivEqu.a" ∂ - "{AIncludes}Slots.a" ∂ - "{IntAIncludes}SlotMgrEqu.a" ∂ - "{AIncludes}ROMEqu.a" ∂ - "{AIncludes}SCSI.a" ∂ - "{StartDir}StartSearch.a" +"{ObjDir}StartSearch.a.o" ƒ "{StartDir}StartSearch.a" Asm {StdAOpts} -o "{Targ}" "{StartDir}StartSearch.a" -"{ObjDir}SizeMem.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{StartDir}STEqu.a" ∂ - "{IntAIncludes}MMUEqu.a" ∂ - "{IntAincludes}BootEqu.a" ∂ +"{ObjDir}SizeMem.a.o" ƒ "{StartDir}STEqu.a" ∂ "{StartDir}SizeMem.a" Asm {StdAOpts} -o "{Targ}" "{StartDir}SizeMem.a" "{ObjDir}USTStartTest.a.o" ƒ "{StartDir}STEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{IntAIncludes}BootEqu.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}SoundPrivate.a" ∂ - "{IntAIncludes}MMUEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}PowerPrivEqu.a" ∂ - "{IntAIncludes}EgretEqu.a" ∂ - "{IntAIncludes}SCSIEqu96.a" ∂ - "{IntAIncludes}IOPrimitiveEqu.a" ∂ "{StartDir}USTStartUp.a" ∂ "{StartDir}USTCritTests.a" ∂ "{StartDir}USTNonCritTsts.a" ∂ @@ -237,18 +157,11 @@ Boot3Objects = "{ObjDir}Boot3.a.o" ∂ C {StdCOpts} -o "{Targ}" "{StartDir}UnivTestEnv:SONIC_Test.c" -i "{StartDir}UnivTestEnv:" -"{ObjDir}Boot3.a.o" ƒ "{IntAIncludes}LinkedPatchMacros.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}Folders.a" ∂ - "{AIncludes}TextServices.a" ∂ - "{IntAIncludes}BootEqu.a" ∂ - "{IntAIncludes}ScriptPriv.a" ∂ - "{StartDir}Boot3.a" +"{ObjDir}Boot3.a.o" ƒ "{StartDir}Boot3.a" Asm {StdAOpts} -d SONYNONPORTABLE=1 -o "{Targ}" "{StartDir}Boot3.a" -"{ObjDir}DispatchPatch.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{TrapDispDir}DispatchPatch.a" +"{ObjDir}DispatchPatch.a.o" ƒ "{TrapDispDir}DispatchPatch.a" Asm {StdAOpts} -o "{targ}" "{TrapDispDir}DispatchPatch.a" diff --git a/OS/TimeMgr/TimeMgr.make b/OS/TimeMgr/TimeMgr.make --- a/OS/TimeMgr/TimeMgr.make +++ b/OS/TimeMgr/TimeMgr.make @@ -18,14 +18,10 @@ TimeMgrObjs = "{ObjDir}TimeMgr.a.o" ∂ Lib {StdLibOpts} -o "{Targ}" {TimeMgrObjs} -"{ObjDir}TimeMgr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{TimeMgrDir}TimeMgr.a" +"{ObjDir}TimeMgr.a.o" ƒ "{TimeMgrDir}TimeMgr.a" Asm {StdAOpts} -o "{Targ}" "{TimeMgrDir}TimeMgr.a" -"{ObjDir}TimeMgrPatch.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{TimeMgrDir}TimeMgrPatch.a" +"{ObjDir}TimeMgrPatch.a.o" ƒ "{TimeMgrDir}TimeMgrPatch.a" Asm {StdAOpts} -o "{Targ}" "{TimeMgrDir}TimeMgrPatch.a" diff --git a/OS/TrapDispatcher/TrapDispatcher.make b/OS/TrapDispatcher/TrapDispatcher.make --- a/OS/TrapDispatcher/TrapDispatcher.make +++ b/OS/TrapDispatcher/TrapDispatcher.make @@ -11,9 +11,6 @@ # # -"{ObjDir}Dispatch.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{TrapDispDir}Dispatch.a" +"{ObjDir}Dispatch.a.o" ƒ "{TrapDispDir}Dispatch.a" Asm {StdAOpts} -o "{Targ}" "{TrapDispDir}Dispatch.a" diff --git a/OS/VDig/VDig.make b/OS/VDig/VDig.make --- a/OS/VDig/VDig.make +++ b/OS/VDig/VDig.make @@ -40,10 +40,7 @@ VDigCObjects = "{ObjDir}VDigC.c.o" ∂ -"{RsrcDir}VDigT.rsrc" ƒƒ "{VDigDir}Cyclone_VDig.r" ∂ - "{RIncludes}Types.r" ∂ - "{RIncludes}MPWTypes.r" ∂ - "{RIncludes}ImageCodec.r" +"{RsrcDir}VDigT.rsrc" ƒƒ "{VDigDir}Cyclone_VDig.r" Rez {StdROpts} -o "{Targ}" "{VDigDir}Cyclone_VDig.r" || Exit 1 @@ -66,47 +63,21 @@ VDigCObjects = "{ObjDir}VDigC.c.o" ∂ # Identify dependencies for the source files as well # (BTW - why is "EgretEqu.h" local to {VDigDir}? It should be in {CIncludes}) -"{VDigDir}Cyclone.c" ƒ "{CIncludes}Devices.h" ∂ - "{CIncludes}Files.h" ∂ - "{CIncludes}FixMath.h" ∂ - "{CIncludes}GestaltEqu.h" ∂ - "{IntCIncludes}GestaltPrivateEqu.h" ∂ - "{CIncludes}Math.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}RomDefs.h" ∂ - "{CIncludes}Slots.h" ∂ - "{CIncludes}ToolUtils.h" ∂ - "{CIncludes}Components.h" ∂ - "{CIncludes}QTComponents.h" ∂ - "{VDigDir}EgretEqu.h" ∂ +"{VDigDir}Cyclone.c" ƒ "{VDigDir}EgretEqu.h" ∂ "{VDigDir}I2C.h" ∂ "{VDigDir}philips.h" ∂ "{VDigDir}Cyclone.h" ∂ - "{VDigDir}CycloneDigi.h" ∂ - "{IntCIncludes}DepVideo.h" + "{VDigDir}CycloneDigi.h" SetFile -m . {Targ} -"{VDigDir}VDigUtils.c" ƒ "{CIncludes}Devices.h" ∂ - "{IntCIncludes}DepVideo.h" ∂ - "{CIncludes}Palettes.h" ∂ - "{CIncludes}RomDefs.h" ∂ - "{CIncludes}Slots.h" ∂ - "{CIncludes}ToolUtils.h" ∂ - "{CIncludes}Video.h" ∂ - "{VDigDir}Cyclone.h" +"{VDigDir}VDigUtils.c" ƒ "{VDigDir}Cyclone.h" SetFile -m . {Targ} -"{VDigDir}IICTest.a" ƒ "{AIncludes}SysEqu.a" ∂ - "{AIncludes}SysErr.a" ∂ - "{AIncludes}ToolUtils.a" ∂ - "{AIncludes}Traps.a" +"{VDigDir}IICTest.a" ƒ SetFile -m . {Targ} # "I just LOVE nested #include files. (NOT!)" -"{VDigDir}Cyclone.h" ƒ "{VDigDir}Philips.h" ∂ - "{CIncludes}Quickdraw.h" ∂ - "{CIncludes}QuickTimeComponents.h" +"{VDigDir}Cyclone.h" ƒ "{VDigDir}Philips.h" SetFile -m . {Targ} diff --git a/QuickDraw/ColorQD.make b/QuickDraw/ColorQD.make --- a/QuickDraw/ColorQD.make +++ b/QuickDraw/ColorQD.make @@ -36,26 +36,11 @@ CQDObjs = "{ObjDir}CheckDevicesINIT.a.o" ∂ Asm {StdAOpts} -o "{Targ}" "{ColorQDDir}CheckDevicesINIT.a" -"{ObjDir}DeviceLoop.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}LinkedPatchMacros.a" ∂ - "{ColorQDDir}DeviceLoop.a" +"{ObjDir}DeviceLoop.a.o" ƒ "{ColorQDDir}DeviceLoop.a" Asm {StdAOpts} -o "{Targ}" "{ColorQDDir}DeviceLoop.a" -"{ObjDir}CQD.a.o" ƒ "{IntAIncludes}ColorEqu.a" ∂ - "{AIncludes}Slots.a" ∂ - "{IntAIncludes}SlotMgrEqu.a" ∂ - "{AIncludes}QuickDraw.a" ∂ - "{AIncludes}SysEqu.a" ∂ - "{IntAIncludes}SysPrivateEqu.a" ∂ - "{AIncludes}syserr.a" ∂ - "{AIncludes}ToolUtils.a" ∂ - "{AIncludes}ROMEqu.a" ∂ - "{AIncludes}Video.a" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{AIncludes}Palettes.a" ∂ - "{ColorQDDir}ANGLES.a" ∂ +"{ObjDir}CQD.a.o" ƒ "{ColorQDDir}ANGLES.a" ∂ "{ColorQDDir}Arith8Blt.a" ∂ "{ColorQDDir}ARCS.a" ∂ "{ColorQDDir}BITBLT.a" ∂ diff --git a/QuickDraw/PictUtilities/PictUtilities.make b/QuickDraw/PictUtilities/PictUtilities.make --- a/QuickDraw/PictUtilities/PictUtilities.make +++ b/QuickDraw/PictUtilities/PictUtilities.make @@ -72,7 +72,5 @@ PictUtilObjs = "{ObjDir}puDispatch.a.o" ∂ C {StdCOpts} -o "{Targ}" "{PictUtilsDir}puMedian.c" -"{ObjDir}puPackEntry.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}DispatchHelperPriv.a" ∂ - "{PictUtilsDir}puPackEntry.a" +"{ObjDir}puPackEntry.a.o" ƒ "{PictUtilsDir}puPackEntry.a" Asm {StdAOpts} -o "{Targ}" "{PictUtilsDir}puPackEntry.a" diff --git a/Resources/Resources.make b/Resources/Resources.make --- a/Resources/Resources.make +++ b/Resources/Resources.make @@ -17,8 +17,7 @@ # 2/22/93 CSS Correct spelling of Resource (from Resoruce). -"{RsrcDir}ROMFonts.rsrc" ƒ "{ResourceDir}ROMFonts.r" ∂ - "{RIncludes}SysTypes.r" +"{RsrcDir}ROMFonts.rsrc" ƒ "{ResourceDir}ROMFonts.r" Rez {StdROpts} "{ResourceDir}ROMFonts.r" -o "{Targ}" @@ -26,11 +25,7 @@ Rez {StdROpts} "{ResourceDir}ROMApple2Fonts.r" -o "{Targ}" -"{RsrcDir}MiscROMRsrcs.rsrc" ƒ "{ResourceDir}MiscROMRsrcs.r" ∂ - "{RIncludes}GestaltEqu.h" ∂ - "{IntRIncludes}GestaltPriv.r" ∂ - "{RIncludes}SysTypes.r" ∂ - "{RIncludes}Types.r" +"{RsrcDir}MiscROMRsrcs.rsrc" ƒ "{ResourceDir}MiscROMRsrcs.r" Rez {StdROpts} "{ResourceDir}MiscROMRsrcs.r" -o "{Targ}" diff --git a/Tidbits/ROM_EM/ROM_EM.OS.make b/Tidbits/ROM_EM/ROM_EM.OS.make --- a/Tidbits/ROM_EM/ROM_EM.OS.make +++ b/Tidbits/ROM_EM/ROM_EM.OS.make @@ -89,20 +89,11 @@ OSObjs = "{ObjDir}clock.a.o" ∂ Lib {StdLibOpts} {OSObjs} -o "{Targ}" -"{ObjDir}clock.a.o" ƒ "{OSDir}clock.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}IOPrimitiveEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" +"{ObjDir}clock.a.o" ƒ "{OSDir}clock.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}clock.a" -"{ObjDir}CrsrDev.a.o" ƒ "{OSDir}CrsrDev.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}EgretEqu.a" ∂ - "{IntAIncludes}IOPEqu.a" ∂ - "{IntAIncludes}AppleDeskBusPriv.a" ∂ - "{IntAIncludes}CrsrDevEqu.a" +"{ObjDir}CrsrDev.a.o" ƒ "{OSDir}CrsrDev.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}CrsrDev.a" @@ -110,155 +101,73 @@ OSObjs = "{ObjDir}clock.a.o" ∂ Asm {StdAOpts} -o "{Targ}" "{OSDir}CudaMgr.a" -"{ObjDir}DeferredTaskMgr.a.o" ƒ "{OSDir}DeferredTaskMgr.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}HardwareEqu.a" +"{ObjDir}DeferredTaskMgr.a.o" ƒ "{OSDir}DeferredTaskMgr.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}DeferredTaskMgr.a" -"{ObjDir}DeviceMgr.a.o" ƒ "{OSDir}DeviceMgr.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{AIncludes}ROMEqu.a" ∂ - "{AIncludes}Slots.a" ∂ - "{AIncludes}FSEqu.a" +"{ObjDir}DeviceMgr.a.o" ƒ "{OSDir}DeviceMgr.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}DeviceMgr.a" -"{ObjDir}DispatchHelper.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{OSDir}DispatchHelper.a" +"{ObjDir}DispatchHelper.a.o" ƒ "{OSDir}DispatchHelper.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}DispatchHelper.a" -"{ObjDir}DispTable.a.o" ƒ "{OSDir}DispTable.a" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{AIncludes}HardwareEqu.a" +"{ObjDir}DispTable.a.o" ƒ "{OSDir}DispTable.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}DispTable.a" -"{ObjDir}DMAMgr.a.o" ƒ "{OSDir}DMAMgr.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}DMAMgrEqu.a" ∂ - "{IntAIncludes}PSCEqu.a" +"{ObjDir}DMAMgr.a.o" ƒ "{OSDir}DMAMgr.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}DMAMgr.a" -"{ObjDir}DockingMgr.a.o" ƒ "{OSDir}DockingMgr.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}PowerPrivEqu.a" ∂ - "{AIncludes}ROMEqu.a" ∂ - "{AIncludes}Slots.a" ∂ - "{AIncludes}SCSI.a" ∂ - "{IntAIncludes}SCSIPriv.a" ∂ - "{IntAIncludes}DockingEqu.a" +"{ObjDir}DockingMgr.a.o" ƒ "{OSDir}DockingMgr.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}DockingMgr.a" -"{ObjDir}EgretMgr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}InternalOnlyEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{IntAIncludes}IOPEqu.a" ∂ - "{IntAIncludes}AppleDeskBusPriv.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}EgretEqu.a" ∂ - "{OSDir}EgretMgr.a" +"{ObjDir}EgretMgr.a.o" ƒ "{OSDir}EgretMgr.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}EgretMgr.a" -"{ObjDir}HwPriv.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{OSDir}HwPriv.a" +"{ObjDir}HwPriv.a.o" ƒ "{OSDir}HwPriv.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}HwPriv.a" -"{ObjDir}InterruptHandlers.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}IOPrimitiveEqu.a" ∂ - "{IntAIncludes}PowerPrivEqu.a" ∂ - "{IntAIncludes}EgretEqu.a" ∂ - "{IntAIncludes}PSCEqu.a" ∂ - "{IntAIncludes}SysPrivateEqu.a" ∂ - "{AIncludes}Shutdown.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{OSDir}InterruptHandlers.a" +"{ObjDir}InterruptHandlers.a.o" ƒ "{OSDir}InterruptHandlers.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}InterruptHandlers.a" -"{ObjDir}IOPMgr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}IOPequ.a" ∂ - "{OSDir}IOPMgr.a" +"{ObjDir}IOPMgr.a.o" ƒ "{OSDir}IOPMgr.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}IOPMgr.a" -"{ObjDir}OverPatch.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}Slots.a" ∂ - "{AIncludes}ROMEqu.a" ∂ - "{AIncludes}Video.a" ∂ - "{OSDir}OverPatch.a" +"{ObjDir}OverPatch.a.o" ƒ "{OSDir}OverPatch.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}OverPatch.a" -"{ObjDir}OSEventMgr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{OSDir}OSEventMgr.a" +"{ObjDir}OSEventMgr.a.o" ƒ "{OSDir}OSEventMgr.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}OSEventMgr.a" -"{ObjDir}Queue.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{OSDir}Queue.a" +"{ObjDir}Queue.a.o" ƒ "{OSDir}Queue.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}Queue.a" -"{ObjDir}sysUtil.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}GestaltEqu.a" ∂ - "{IntAIncludes}IOPrimitiveEqu.a" ∂ - "{IntAIncludes}ReliabilityEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{OSDir}sysUtil.a" +"{ObjDir}sysUtil.a.o" ƒ "{OSDir}sysUtil.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}sysUtil.a" -"{ObjDir}Universal.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{AIncludes}Slots.a" ∂ - "{OSDir}Universal.a" +"{ObjDir}Universal.a.o" ƒ "{OSDir}Universal.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}Universal.a" -i "{OSDir}StartMgr" -"{ObjDir}UniversalTables.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{AIncludes}Slots.a" ∂ - "{IntAincludes}DepVideoEqu.a" ∂ - "{OSDir}UniversalTables.a" +"{ObjDir}UniversalTables.a.o" ƒ "{OSDir}UniversalTables.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}UniversalTables.a" -"{ObjDir}VerticalRetraceMgr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}Slots.a" ∂ - "{IntAIncludes}SlotMgrEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{OSDir}VerticalRetraceMgr.a" +"{ObjDir}VerticalRetraceMgr.a.o" ƒ "{OSDir}VerticalRetraceMgr.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}VerticalRetraceMgr.a" -"{ObjDir}WallyWorld.a.o" ƒ "{AIncludes}Private.a" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{OSDir}WallyWorld.a" +"{ObjDir}WallyWorld.a.o" ƒ "{OSDir}WallyWorld.a" Asm {StdAOpts} -o "{Targ}" "{OSDir}WallyWorld.a" diff --git a/Toolbox/AliasMgr/AliasMgr.make b/Toolbox/AliasMgr/AliasMgr.make --- a/Toolbox/AliasMgr/AliasMgr.make +++ b/Toolbox/AliasMgr/AliasMgr.make @@ -24,73 +24,34 @@ AliasMgrObjects = "{ObjDir}alDlogUtil.a.o" ∂ Lib {StdLibOpts} -o "{Targ}" {AliasMgrObjects} -"{ObjDir}alDlogUtil.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AliasMgrDir}alDlogUtil.a" +"{ObjDir}alDlogUtil.a.o" ƒ "{AliasMgrDir}alDlogUtil.a" Asm {StdAOpts} -o "{Targ}" "{AliasMgrDir}alDlogUtil.a" -"{ObjDir}alExt.c.o" ƒ "{CIncludes}Aliases.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Files.h" ∂ - "{CIncludes}errors.h" ∂ - "{CIncludes}String.h" ∂ - "{CIncludes}ToolUtils.h" ∂ - "{CIncludes}OSUtils.h" ∂ - "{CIncludes}Resources.h" ∂ - "{AliasMgrDir}aliasPriv.h" ∂ +"{ObjDir}alExt.c.o" ƒ "{AliasMgrDir}aliasPriv.h" ∂ "{AliasMgrDir}alExt.c" C {StdCOpts} -o "{Targ}" "{AliasMgrDir}alExt.c" -"{ObjDir}alFill.c.o" ƒ "{CIncludes}Aliases.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}files.h" ∂ - "{CIncludes}errors.h" ∂ - "{AliasMgrDir}aliasPriv.h" ∂ +"{ObjDir}alFill.c.o" ƒ "{AliasMgrDir}aliasPriv.h" ∂ "{AliasMgrDir}alFill.c" C {StdCOpts} -o "{Targ}" "{AliasMgrDir}alFill.c" -"{ObjDir}alFind.c.o" ƒ "{CIncludes}Aliases.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}files.h" ∂ - "{CIncludes}errors.h" ∂ - "{CIncludes}String.h" ∂ - "{CIncludes}ToolUtils.h" ∂ - "{CIncludes}OSUtils.h" ∂ - "{CIncludes}StdLib.h" ∂ - "{AliasMgrDir}aliasPriv.h" ∂ +"{ObjDir}alFind.c.o" ƒ "{AliasMgrDir}aliasPriv.h" ∂ "{AliasMgrDir}alFind.c" C {StdCOpts} -o "{Targ}" "{AliasMgrDir}alFind.c" -"{ObjDir}alUtil.c.o" ƒ "{CIncludes}Aliases.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}errors.h" ∂ - "{CIncludes}Dialogs.h" ∂ - "{CIncludes}ToolUtils.h" ∂ - "{AliasMgrDir}aliasPriv.h" ∂ +"{ObjDir}alUtil.c.o" ƒ "{AliasMgrDir}aliasPriv.h" ∂ "{AliasMgrDir}aliasDlogPriv.h" ∂ "{AliasMgrDir}alUtil.c" C {StdCOpts} -o "{Targ}" "{AliasMgrDir}alUtil.c" -"{ObjDir}AliasMgr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}GestaltEqu.a" ∂ - "{AIncludes}AppleTalk.a" ∂ - "{IntAIncludes}InternalMacros.a" ∂ - "{IntAIncludes}LinkedPatchMacros.a" ∂ - "{AliasMgrDir}AliasMgr.a" +"{ObjDir}AliasMgr.a.o" ƒ "{AliasMgrDir}AliasMgr.a" Asm {StdAOpts} -o "{Targ}" "{AliasMgrDir}AliasMgr.a" -"{ObjDir}FolderMgr.a.o" ƒ "{AIncludes}SysEqu.a" ∂ - "{IntAIncludes}SysPrivateEqu.a" ∂ - "{AIncludes}ToolUtils.a" ∂ - "{AIncludes}SysErr.a" ∂ - "{AIncludes}Traps.a" ∂ - "{IntAIncludes}InternalMacros.a" ∂ - "{AIncludes}Folders.a" ∂ - "{AIncludes}GestaltEqu.a" ∂ - "{AliasMgrDir}FolderMgr.a" +"{ObjDir}FolderMgr.a.o" ƒ "{AliasMgrDir}FolderMgr.a" Asm {StdAOpts} -o "{Targ}" "{AliasMgrDir}FolderMgr.a" diff --git a/Toolbox/AppleEventMgr/AppleEventMgr.make b/Toolbox/AppleEventMgr/AppleEventMgr.make --- a/Toolbox/AppleEventMgr/AppleEventMgr.make +++ b/Toolbox/AppleEventMgr/AppleEventMgr.make @@ -36,45 +36,36 @@ AppleEventMgrObjs = "{ObjDir}AEDFGlue.a.o" ∂ Link {StdLOpts} {StdAlign} -o "{Targ}" -rt PACK=8 -sn Main="AevtMgr" {AppleEventMgrObjs} -"{ObjDir}AEDFGlue.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AppleEventDir}AEDFGlue.a" +"{ObjDir}AEDFGlue.a.o" ƒ "{AppleEventDir}AEDFGlue.a" Asm {StdAOpts} -o "{Targ}" "{AppleEventDir}AEDFGlue.a" -"{ObjDir}AEHashTable.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AppleEventDir}AEHashTable.a" +"{ObjDir}AEHashTable.a.o" ƒ "{AppleEventDir}AEHashTable.a" Asm {StdAOpts} -o "{Targ}" "{AppleEventDir}AEHashTable.a" -"{ObjDir}AEUtil.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AppleEventDir}AEUtil.a" +"{ObjDir}AEUtil.a.o" ƒ "{AppleEventDir}AEUtil.a" Asm {StdAOpts} -o "{Targ}" "{AppleEventDir}AEUtil.a" -"{ObjDir}AEHandlerTable.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AppleEventDir}AEHandlerTable.a" +"{ObjDir}AEHandlerTable.a.o" ƒ "{AppleEventDir}AEHandlerTable.a" Asm {StdAOpts} -o "{Targ}" "{AppleEventDir}AEHandlerTable.a" -"{ObjDir}AEDFWrapper.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AppleEventDir}AEDFWrapper.a" +"{ObjDir}AEDFWrapper.a.o" ƒ "{AppleEventDir}AEDFWrapper.a" Asm {StdAOpts} -o "{Targ}" "{AppleEventDir}AEDFWrapper.a" "{ObjDir}AEUtil.p.o" ƒ "{AppleEventDir}AEUtil.p" ∂ "{AppleEventDir}AEUtil.inc1.p" ∂ - "{AppleEventDir}AEHashTable.p" ∂ - "{PInterfaces}AppleEvents.p" ∂ - "{IntPInterfaces}StandardEqu.p" + "{AppleEventDir}AEHashTable.p" Pascal {StdPOpts} -o "{Targ}" "{AppleEventDir}AEUtil.p" "{ObjDir}AEHandlerTable.p.o" ƒ "{AppleEventDir}AEHandlerTable.p" ∂ "{AppleEventDir}AEHandlerTable.inc1.p" ∂ "{AppleEventDir}AEUtil.inc1.p" ∂ - "{AppleEventDir}AEHashTable.p" ∂ - "{PInterfaces}AppleEvents.p" ∂ - "{IntPInterfaces}StandardEqu.p" + "{AppleEventDir}AEHashTable.p" Pascal {StdPOpts} -o "{Targ}" "{AppleEventDir}AEHandlerTable.p" @@ -82,9 +73,7 @@ AppleEventMgrObjs = "{ObjDir}AEDFGlue.a.o" ∂ "{AppleEventDir}AECoercion.inc1.p" ∂ "{AppleEventDir}AEUtil.inc1.p" ∂ "{AppleEventDir}AEHashTable.p" ∂ - "{AppleEventDir}AEHandlerTable.p" ∂ - "{PInterfaces}AppleEvents.p" ∂ - "{IntPInterfaces}StandardEqu.p" + "{AppleEventDir}AEHandlerTable.p" Pascal {StdPOpts} -o "{Targ}" "{AppleEventDir}AECoercion.p" @@ -93,9 +82,7 @@ AppleEventMgrObjs = "{ObjDir}AEDFGlue.a.o" ∂ "{AppleEventDir}AEUtil.inc1.p" ∂ "{AppleEventDir}AEHashTable.p" ∂ "{AppleEventDir}AEHandlerTable.p" ∂ - "{AppleEventDir}AECoercion.p" ∂ - "{PInterfaces}AppleEvents.p" ∂ - "{IntPInterfaces}StandardEqu.p" + "{AppleEventDir}AECoercion.p" Pascal {StdPOpts} -o "{Targ}" "{AppleEventDir}AEDFWrapper.p" @@ -105,9 +92,7 @@ AppleEventMgrObjs = "{ObjDir}AEDFGlue.a.o" ∂ "{AppleEventDir}AEHashTable.p" ∂ "{AppleEventDir}AEHandlerTable.p" ∂ "{AppleEventDir}AECoercion.p" ∂ - "{AppleEventDir}AEDFWrapper.p" ∂ - "{PInterfaces}AppleEvents.p" ∂ - "{IntPInterfaces}StandardEqu.p" + "{AppleEventDir}AEDFWrapper.p" Pascal {StdPOpts} -o "{Targ}" "{AppleEventDir}AEDF.p" @@ -117,15 +102,11 @@ AppleEventMgrObjs = "{ObjDir}AEDFGlue.a.o" ∂ "{AppleEventDir}AEHashTable.p" ∂ "{AppleEventDir}AECoercion.p" ∂ "{AppleEventDir}AEDFWrapper.p" ∂ - "{AppleEventDir}AEDF.p" ∂ - "{PInterfaces}AppleEvents.p" ∂ - "{IntPInterfaces}StandardEqu.p" + "{AppleEventDir}AEDF.p" Pascal {StdPOpts} -o "{Targ}" "{AppleEventDir}AEInteract.p" -"{ObjDir}AEPackEntry.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AppleEventDir}AEPackEntry.a" ∂ - "{IntAIncludes}DispatchHelperPriv.a" +"{ObjDir}AEPackEntry.a.o" ƒ "{AppleEventDir}AEPackEntry.a" Asm {StdAOpts} -o "{Targ}" "{AppleEventDir}AEPackEntry.a" diff --git a/Toolbox/ColorPicker/ColorPicker.make b/Toolbox/ColorPicker/ColorPicker.make --- a/Toolbox/ColorPicker/ColorPicker.make +++ b/Toolbox/ColorPicker/ColorPicker.make @@ -21,8 +21,7 @@ ColorPickerObjs = "{ObjDir}ColorPicker.a.o" ∂ "{PLibraries}PasLib.o" -"{RsrcDir}ColorPicker.rsrc" ƒƒ "{RIncludes}Types.r" ∂ - "{ColorPickerDir}ColorPicker.r" ∂ +"{RsrcDir}ColorPicker.rsrc" ƒƒ "{ColorPickerDir}ColorPicker.r" ∂ "{ColorPickerDir}ColorPickerWedge.r" Rez -a {StdROpts} -o "{Targ}" "{ColorPickerDir}ColorPicker.r" "{ColorPickerDir}ColorPickerWedge.r" || Exit 1 @@ -34,60 +33,19 @@ ColorPickerObjs = "{ObjDir}ColorPicker.a.o" ∂ # Since these guys use the obsolete MemTypes, QuickDraw, OSIntf, ToolIntf, PackIntf # they depend on a *huge* number of .p files. -MQOTPUnits = "{PInterfaces}MemTypes.p" ∂ - "{PInterfaces}Types.p" ∂ - "{PInterfaces}QuickDraw.p" ∂ - "{PInterfaces}OSIntf.p" ∂ - "{PInterfaces}Events.p" ∂ - "{PInterfaces}OSUtils.p" ∂ - "{PInterfaces}Files.p" ∂ - "{PInterfaces}Devices.p" ∂ - "{PInterfaces}DeskBus.p" ∂ - "{PInterfaces}DiskInit.p" ∂ - "{PInterfaces}Disks.p" ∂ - "{PInterfaces}Errors.p" ∂ - "{PInterfaces}Memory.p" ∂ - "{PInterfaces}OSEvents.p" ∂ - "{PInterfaces}Retrace.p" ∂ - "{PInterfaces}SegLoad.p" ∂ - "{PInterfaces}Serial.p" ∂ - "{PInterfaces}ShutDown.p" ∂ - "{PInterfaces}Slots.p" ∂ - "{PInterfaces}Sound.p" ∂ - "{PInterfaces}Start.p" ∂ - "{PInterfaces}Timer.p" ∂ - "{PInterfaces}ToolIntf.p" ∂ - "{PInterfaces}Controls.p" ∂ - "{PInterfaces}Desk.p" ∂ - "{PInterfaces}Windows.p" ∂ - "{PInterfaces}TextEdit.p" ∂ - "{PInterfaces}Dialogs.p" ∂ - "{PInterfaces}Fonts.p" ∂ - "{PInterfaces}Lists.p" ∂ - "{PInterfaces}Menus.p" ∂ - "{PInterfaces}Resources.p" ∂ - "{PInterfaces}Scrap.p" ∂ - "{PInterfaces}ToolUtils.p" ∂ - "{PInterfaces}PackIntf.p" ∂ - "{PInterfaces}Packages.p" +MQOTPUnits = ColorConvertUnits = {MQOTPUnits} ∂ - "{PInterfaces}PaletteMgr.p" ∂ - "{PInterfaces}FixMath.p" ∂ "{ColorPickerDir}ColorConvert.p" ColorPickerUnits = {ColorConvertUnits} ∂ - "{PInterfaces}QDOffScreen.p" ∂ - "{PInterfaces}SysEqu.p" ∂ - "{PInterfaces}GestaltEqu.p" ∂ "{ColorPickerDir}ColorPicker.p" "{ObjDir}ColorConvert.p.o" ƒ {ColorConvertUnits} Pascal {StdPOpts} -o "{targ}" "{ColorPickerDir}ColorConvert.p" -"{ObjDir}ColorPicker.a.o" ƒ "{AIncludes}Traps.a" ∂ - "{ColorPickerDir}ColorPicker.a" +"{ObjDir}ColorPicker.a.o" ƒ "{ColorPickerDir}ColorPicker.a" Asm {StdAOpts} -o "{Targ}" "{ColorPickerDir}ColorPicker.a" diff --git a/Toolbox/CommToolbox/CommToolbox.make b/Toolbox/CommToolbox/CommToolbox.make --- a/Toolbox/CommToolbox/CommToolbox.make +++ b/Toolbox/CommToolbox/CommToolbox.make @@ -140,111 +140,47 @@ CommToolboxPatchObjs = "{ObjDir}CommToolboxDispatcher.a.o" ∂ Link {StdLOpts} {StdAlign} -o "{Targ}" -rt LDEF=-32510 {StandardNBPLDEFObjs} || Exit 1 -"{RsrcDir}CommToolbox.rsrc" ƒƒ "{CommTerminalDir}TerminalClick.r" ∂ - "{RIncludes}SysTypes.r" ∂ - "{IntRIncludes}CommToolboxPriv.r" +"{RsrcDir}CommToolbox.rsrc" ƒƒ "{CommTerminalDir}TerminalClick.r" Rez -a {StdROpts} -o "{Targ}" "{CommTerminalDir}TerminalClick.r" || Exit 1 -"{RsrcDir}CommToolbox.rsrc" ƒƒ "{CommChooseDir}Choose.r" ∂ - "{RIncludes}SysTypes.r" ∂ - "{RIncludes}Types.r" ∂ - "{RIncludes}CTBTypes.r" ∂ - "{IntRIncludes}CommToolboxPriv.r" +"{RsrcDir}CommToolbox.rsrc" ƒƒ "{CommChooseDir}Choose.r" Rez -a {StdROpts} -o "{Targ}" "{CommChooseDir}Choose.r" || Exit 1 -"{RsrcDir}CommToolbox.rsrc" ƒƒ "{CommNBPDir}StandardNBP.r" ∂ - "{RIncludes}Types.r" ∂ - "{RIncludes}CTBTypes.r" ∂ - "{RIncludes}PICT.r" ∂ - "{IntRIncludes}CommToolboxPriv.r" +"{RsrcDir}CommToolbox.rsrc" ƒƒ "{CommNBPDir}StandardNBP.r" Rez -a {StdROpts} -o "{Targ}" "{CommNBPDir}StandardNBP.r" || Exit 1 -"{ObjDir}CommToolboxUtilityRoutines.c.o" ƒ "{CIncludes}Menus.h" ∂ - "{CIncludes}Dialogs.h" ∂ - "{CIncludes}QuickDraw.h" ∂ - "{CIncludes}Fonts.h" ∂ - "{CIncludes}SysEqu.h" ∂ - "{CIncludes}CTBUtilities.h" ∂ - "{CIncludes}CommResources.h" ∂ - "{IntCIncludes}CommToolboxPriv.h" ∂ - "{CommUtilityDir}CommToolboxUtilityRoutines.c" +"{ObjDir}CommToolboxUtilityRoutines.c.o" ƒ "{CommUtilityDir}CommToolboxUtilityRoutines.c" C {StdCOpts} -o "{Targ}" "{CommUtilityDir}CommToolboxUtilityRoutines.c" -"{ObjDir}CommResourceMgr.a.o" ƒ "{AIncludes}traps.a" ∂ - "{AIncludes}CommResources.a" ∂ - "{CommResourceDir}CommResourceMgr.a" +"{ObjDir}CommResourceMgr.a.o" ƒ "{CommResourceDir}CommResourceMgr.a" Asm {StdAOpts} -o "{targ}" "{CommResourceDir}CommResourceMgr.a" -"{ObjDir}CommResourceMgr.c.o" ƒ "{CIncludes}SysEqu.h" ∂ - "{CIncludes}Types.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}OSUtils.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}Folders.h" ∂ - "{CIncludes}CommResources.h" ∂ - "{CIncludes}Folders.h" ∂ - "{CIncludes}Files.h" ∂ - "{IntCIncludes}CommToolboxPriv.h" ∂ - "{CommResourceDir}CommResourceMgrExtensions.c" ∂ +"{ObjDir}CommResourceMgr.c.o" ƒ "{CommResourceDir}CommResourceMgrExtensions.c" ∂ "{CommResourceDir}CommResourceMgr.h" ∂ "{CommResourceDir}CommResourceMgr.c" C {StdCOpts} -o "{targ}" "{CommResourceDir}CommResourceMgr.c" -"{ObjDir}CommResourceMgr.p.o" ƒ "{PInterfaces}MemTypes.p" ∂ - "{PInterfaces}Types.p" ∂ - "{PInterfaces}Quickdraw.p" ∂ - "{PInterfaces}OSIntf.p" ∂ - "{PInterfaces}ToolIntf.p" ∂ - "{PInterfaces}PackIntf.p" ∂ - "{PInterfaces}SysEqu.p" ∂ - "{PInterfaces}Appletalk.p" ∂ - "{PInterfaces}CTBUtilities.p" ∂ - "{IntPInterfaces}CommToolboxPriv.p" ∂ - "{CommResourceDir}CommResourceMgr.p" +"{ObjDir}CommResourceMgr.p.o" ƒ "{CommResourceDir}CommResourceMgr.p" Pascal {StdPOpts} -o "{targ}" "{CommResourceDir}CommResourceMgr.p" -"{ObjDir}CommResourceMgrUtilities.a.o" ƒ "{AIncludes}SysEqu.a" ∂ - "{IntAIncludes}SysPrivateEqu.a" ∂ - "{AIncludes}SysErr.a" ∂ - "{AIncludes}ToolUtils.a" ∂ - "{AIncludes}Traps.a" ∂ - "{AIncludes}Aliases.a" ∂ - "{IntAIncludes}CommToolboxPriv.a" ∂ - "{CommResourceDir}CommResourceMgrUtilities.a" +"{ObjDir}CommResourceMgrUtilities.a.o" ƒ "{CommResourceDir}CommResourceMgrUtilities.a" Asm {StdAOpts} -o "{targ}" "{CommResourceDir}CommResourceMgrUtilities.a" -"{ObjDir}CommToolboxUtilities.a.o" ƒ "{AIncludes}traps.a" ∂ - "{AIncludes}CTBUtilities.a" ∂ - "{IntAIncludes}CommToolboxPriv.a" ∂ - "{CommUtilityDir}CommToolboxUtilities.a" +"{ObjDir}CommToolboxUtilities.a.o" ƒ "{CommUtilityDir}CommToolboxUtilities.a" Asm {StdAOpts} -o "{targ}" "{CommUtilityDir}CommToolboxUtilities.a" -"{ObjDir}CommToolboxUtilities.c.o" ƒ "{CIncludes}Memory.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}Dialogs.h" ∂ - "{CIncludes}Events.h" ∂ - "{CIncludes}AppleTalk.h" ∂ - "{CIncludes}CommResources.h" ∂ - "{CIncludes}CTBUtilities.h" ∂ - "{IntCIncludes}CommToolboxPriv.h" ∂ - "{CommUtilityDir}CommToolboxUtilities.c" +"{ObjDir}CommToolboxUtilities.c.o" ƒ "{CommUtilityDir}CommToolboxUtilities.c" C {StdCOpts} -o "{targ}" "{CommUtilityDir}CommToolboxUtilities.c" -"{ObjDir}CommToolboxCore.c.o" ƒ "{IntCIncludes}CommToolboxPriv.h" ∂ - "{CIncludes}CommResources.h" ∂ - "{CIncludes}CTBUtilities.h" ∂ - "{IntCIncludes}ConnectionsExtensions.h" ∂ - "{CIncludes}ConnectionTools.h" ∂ - "{CommUtilityDir}CommToolboxCore.c" +"{ObjDir}CommToolboxCore.c.o" ƒ "{CommUtilityDir}CommToolboxCore.c" C {StdCOpts} -o "{targ}" "{CommUtilityDir}CommToolboxCore.c" @@ -252,33 +188,15 @@ CommToolboxPatchObjs = "{ObjDir}CommToolboxDispatcher.a.o" ∂ Asm {StdAOpts} -o "{targ}" "{CommChooseDir}ChooseUtilities.a" -"{ObjDir}Choose.a.o" ƒ "{IntAIncludes}CommToolboxPriv.a" ∂ - "{CommChooseDir}Choose.a" +"{ObjDir}Choose.a.o" ƒ "{CommChooseDir}Choose.a" Asm {StdAOpts} -o "{targ}" "{CommChooseDir}Choose.a" -"{ObjDir}Choose.p.o" ƒ "{PInterfaces}MemTypes.p" ∂ - "{PInterfaces}QuickDraw.p" ∂ - "{PInterfaces}OSIntf.p" ∂ - "{PInterfaces}ToolIntf.p" ∂ - "{PInterfaces}PackIntf.p" ∂ - "{PInterfaces}AppleTalk.p" ∂ - "{PInterfaces}SysEqu.p" ∂ - "{PInterfaces}Files.p" ∂ - "{PInterfaces}Aliases.p" ∂ - "{PInterfaces}Terminals.p" ∂ - "{PInterfaces}CommResources.p" ∂ - "{PInterfaces}Connections.p" ∂ - "{PInterfaces}FileTransfers.p" ∂ - "{PInterfaces}CTBUtilities.p" ∂ - "{IntPInterfaces}DialogsPriv.p" ∂ - "{IntPInterfaces}CommToolboxPriv.p" ∂ - "{CommChooseDir}Choose.p" +"{ObjDir}Choose.p.o" ƒ "{CommChooseDir}Choose.p" Pascal {StdPOpts} -o "{targ}" "{CommChooseDir}Choose.p" -"{ObjDir}StandardNBP.a.o" ƒ "{CommNBPDir}StandardNBP.a" ∂ - "{IntAIncludes}CommToolboxPriv.a" +"{ObjDir}StandardNBP.a.o" ƒ "{CommNBPDir}StandardNBP.a" Asm {StdAOpts} -o "{targ}" "{CommNBPDir}StandardNBP.a" @@ -286,63 +204,24 @@ CommToolboxPatchObjs = "{ObjDir}CommToolboxDispatcher.a.o" ∂ "{CommNBPDir}StandardNBPStructures.p" ∂ "{CommNBPDir}ListUtilities.p" ∂ "{CommNBPDir}NBPUtilities.p" ∂ - "{CommNBPDir}ZipUtilities.p" ∂ - "{PInterfaces}MemTypes.p" ∂ - "{PInterfaces}QuickDraw.p" ∂ - "{PInterfaces}OSIntf.p" ∂ - "{PInterfaces}ToolIntf.p" ∂ - "{PInterfaces}PackIntf.p" ∂ - "{PInterfaces}AppleTalk.p" ∂ - "{PInterfaces}Script.p" ∂ - "{PInterfaces}Traps.p" ∂ - "{PInterfaces}CTBUtilities.p" ∂ - "{IntPInterfaces}DialogsPriv.p" ∂ - "{IntPInterfaces}IntlUtilsPriv.p" ∂ - "{IntPInterfaces}CommToolboxPriv.p" + "{CommNBPDir}ZipUtilities.p" Pascal {StdPOpts} -o "{targ}" "{CommNBPDir}StandardNBP.p" "{ObjDir}ListUtilities.p.o" ƒ "{CommNBPDir}ListUtilities.p" ∂ - "{CommNBPDir}StandardNBPStructures.p" ∂ - "{PInterfaces}MemTypes.p" ∂ - "{PInterfaces}QuickDraw.p" ∂ - "{PInterfaces}OSIntf.p" ∂ - "{PInterfaces}ToolIntf.p" ∂ - "{PInterfaces}PackIntf.p" ∂ - "{PInterfaces}AppleTalk.p" ∂ - "{PInterfaces}CTBUtilities.p" ∂ - "{IntPInterfaces}IntlUtilsPriv.p" ∂ - "{IntPInterfaces}CommToolboxPriv.p" + "{CommNBPDir}StandardNBPStructures.p" Pascal {StdPOpts} -o "{targ}" "{CommNBPDir}ListUtilities.p" "{ObjDir}ZIPUtilities.p.o" ƒ "{CommNBPDir}ZIPUtilities.p" ∂ "{CommNBPDir}StandardNBPStructures.p" ∂ - "{CommNBPDir}ListUtilities.p" ∂ - "{PInterfaces}MemTypes.p" ∂ - "{PInterfaces}QuickDraw.p" ∂ - "{PInterfaces}OSIntf.p" ∂ - "{PInterfaces}ToolIntf.p" ∂ - "{PInterfaces}PackIntf.p" ∂ - "{PInterfaces}AppleTalk.p" ∂ - "{PInterfaces}CTBUtilities.p" ∂ - "{IntPInterfaces}IntlUtilsPriv.p" ∂ - "{IntPInterfaces}CommToolboxPriv.p" + "{CommNBPDir}ListUtilities.p" Pascal {StdPOpts} -o "{targ}" "{CommNBPDir}ZIPUtilities.p" "{ObjDir}NBPUtilities.p.o" ƒ "{CommNBPDir}NBPUtilities.p" ∂ "{CommNBPDir}StandardNBPStructures.p" ∂ - "{CommNBPDir}ListUtilities.p" ∂ - "{PInterfaces}MemTypes.p" ∂ - "{PInterfaces}QuickDraw.p" ∂ - "{PInterfaces}OSIntf.p" ∂ - "{PInterfaces}ToolIntf.p" ∂ - "{PInterfaces}PackIntf.p" ∂ - "{PInterfaces}AppleTalk.p" ∂ - "{PInterfaces}CTBUtilities.p" ∂ - "{IntPInterfaces}IntlUtilsPriv.p" ∂ - "{IntPInterfaces}CommToolboxPriv.p" + "{CommNBPDir}ListUtilities.p" Pascal {StdPOpts} -o "{targ}" "{CommNBPDir}NBPUtilities.p" @@ -350,163 +229,70 @@ CommToolboxPatchObjs = "{ObjDir}CommToolboxDispatcher.a.o" ∂ Asm {StdAOpts} -o "{targ}" "{CommNBPDir}StandardNBPUtilities.a" -"{ObjDir}StandardNBPLDEF.a.o" ƒ "{CommNBPDir}StandardNBPLDEF.a" ∂ - "{IntAIncludes}CommToolboxPriv.a" +"{ObjDir}StandardNBPLDEF.a.o" ƒ "{CommNBPDir}StandardNBPLDEF.a" Asm {StdAOpts} -o "{Targ}" "{CommNBPDir}StandardNBPLDEF.a" "{ObjDir}StandardNBPLDEF.p.o" ƒ "{CommNBPDir}StandardNBPLDEF.p" ∂ - "{PInterfaces}MemTypes.p" ∂ - "{PInterfaces}QuickDraw.p" ∂ - "{PInterfaces}OSIntf.p" ∂ - "{PInterfaces}ToolIntf.p" ∂ - "{PInterfaces}PackIntf.p" ∂ - "{PInterfaces}AppleTalk.p" ∂ - "{PInterfaces}Script.p" ∂ - "{PInterfaces}Traps.p" ∂ - "{PInterfaces}SysEqu.p" ∂ - "{PInterfaces}CTBUtilities.p" ∂ - "{IntPInterfaces}CommToolboxPriv.p" ∂ - "{IntPInterfaces}IntlUtilsPriv.p" ∂ "{CommNBPDir}StandardNBPStructures.p" Pascal {StdPOpts} -o "{targ}" "{CommNBPDir}StandardNBPLDEF.p" -"{ObjDir}CommToolboxLDEF.a.o" ƒ "{CommUtilityDir}CommToolboxLDEF.a" ∂ - "{IntAIncludes}CommToolboxPriv.a" +"{ObjDir}CommToolboxLDEF.a.o" ƒ "{CommUtilityDir}CommToolboxLDEF.a" Asm {StdAOpts} -o "{targ}" "{CommUtilityDir}CommToolboxLDEF.a" -"{ObjDir}CommToolboxLDEF.p.o" ƒ "{CommUtilityDir}CommToolboxLDEF.p" ∂ - "{PInterfaces}MemTypes.p" ∂ - "{PInterfaces}QuickDraw.p" ∂ - "{PInterfaces}OSIntf.p" ∂ - "{PInterfaces}ToolIntf.p" ∂ - "{PInterfaces}PackIntf.p" ∂ - "{PInterfaces}AppleTalk.p" ∂ - "{PInterfaces}Script.p" ∂ - "{PInterfaces}Traps.p" ∂ - "{PInterfaces}SysEqu.p" ∂ - "{IntPInterfaces}CommToolboxPriv.p" +"{ObjDir}CommToolboxLDEF.p.o" ƒ "{CommUtilityDir}CommToolboxLDEF.p" Pascal {StdPOpts} -o "{targ}" "{CommUtilityDir}CommToolboxLDEF.p" -"{ObjDir}DITL.a.o" ƒ "{CommUtilityDir}DITL.a" ∂ - "{IntAIncludes}CommToolboxPriv.a" +"{ObjDir}DITL.a.o" ƒ "{CommUtilityDir}DITL.a" Asm {StdAOpts} -o "{targ}" "{CommUtilityDir}DITL.a" -"{ObjDir}DITL.p.o" ƒ "{CommUtilityDir}DITL.p" ∂ - "{PInterfaces}MemTypes.p" ∂ - "{PInterfaces}QuickDraw.p" ∂ - "{PInterfaces}OSIntf.p" ∂ - "{PInterfaces}ToolIntf.p" ∂ - "{PInterfaces}PackIntf.p" ∂ - "{PInterfaces}AppleTalk.p" ∂ - "{PInterfaces}CTBUtilities.p" ∂ - "{IntPInterfaces}CommToolboxPriv.p" +"{ObjDir}DITL.p.o" ƒ "{CommUtilityDir}DITL.p" Pascal {StdPOpts} -o "{targ}" "{CommUtilityDir}DITL.p" -"{ObjDir}ConnectionMgr.a.o" ƒ "{CommConnectionDir}ConnectionMgr.a" ∂ - "{AIncludes}Connections.a" ∂ - "{AIncludes}CTBUtilities.a" ∂ - "{AIncludes}ConnectionTools.a" ∂ - "{AIncludes}traps.a" ∂ - "{IntAIncludes}CommToolboxPriv.a" +"{ObjDir}ConnectionMgr.a.o" ƒ "{CommConnectionDir}ConnectionMgr.a" Asm {StdAOpts} -o "{targ}" "{CommConnectionDir}ConnectionMgr.a" "{ObjDir}ConnectionMgr.c.o" ƒ "{CommConnectionDir}ConnectionMgr.c" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}OSUtils.h" ∂ - "{CIncludes}SysEqu.h" ∂ - "{CIncludes}CTBUtilities.h" ∂ - "{CIncludes}CommResources.h" ∂ - "{CIncludes}Connections.h" ∂ - "{CIncludes}ConnectionTools.h" ∂ - "{IntCIncludes}ConnectionsExtensions.h" ∂ - "{IntCIncludes}ConnectionsPriv.h" ∂ - "{IntCIncludes}CommToolboxPriv.h" ∂ "{CommConnectionDir}ConnectionMgrUtilities.c" ∂ "{CommConnectionDir}ConnectionMgrExtensions.c" C {StdCOpts} -o "{targ}" "{CommConnectionDir}ConnectionMgr.c" -"{ObjDir}TerminalMgr.a.o" ƒ "{CommTerminalDir}TerminalMgr.a" ∂ - "{AIncludes}Terminals.a" ∂ - "{AIncludes}traps.a" ∂ - "{IntAIncludes}CommToolboxPriv.a" +"{ObjDir}TerminalMgr.a.o" ƒ "{CommTerminalDir}TerminalMgr.a" Asm {StdAOpts} -o "{targ}" "{CommTerminalDir}TerminalMgr.a" "{ObjDir}TerminalMgr.c.o" ƒ "{CommTerminalDir}TerminalMgr.c" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}ToolUtils.h" ∂ - "{CIncludes}SysEqu.h" ∂ - "{CIncludes}CTBUtilities.h" ∂ - "{CIncludes}CommResources.h" ∂ - "{CIncludes}Terminals.h" ∂ - "{CIncludes}TerminalTools.h" ∂ - "{IntCIncludes}TerminalsPriv.h" ∂ - "{IntCIncludes}TerminalToolsPriv.h" ∂ - "{IntCIncludes}CommToolboxPriv.h" ∂ "{CommTerminalDir}TerminalMgrUtilities.c" ∂ "{CommTerminalDir}TerminalMgrExtensions.c" C {StdCOpts} -o "{targ}" "{CommTerminalDir}TerminalMgr.c" -"{ObjDir}FileTransferMgr.a.o" ƒ "{CommFileTransferDir}FileTransferMgr.a" ∂ - "{AIncludes}FileTransfers.a" ∂ - "{AIncludes}CTBUtilities.a" ∂ - "{AIncludes}traps.a" ∂ - "{IntAIncludes}CommToolboxPriv.a" +"{ObjDir}FileTransferMgr.a.o" ƒ "{CommFileTransferDir}FileTransferMgr.a" Asm {StdAOpts} -o "{targ}" "{CommFileTransferDir}FileTransferMgr.a" "{ObjDir}FileTransferMgr.c.o" ƒ "{CommFileTransferDir}FileTransferMgr.c" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}Types.h" ∂ - "{CIncludes}SysEqu.h" ∂ - "{CIncludes}CTBUtilities.h" ∂ - "{CIncludes}CommResources.h" ∂ - "{CIncludes}FileTransfers.h" ∂ - "{CIncludes}FileTransferTools.h" ∂ - "{IntCIncludes}FileTransferToolsPriv.h" ∂ - "{IntCIncludes}CommToolboxPriv.h" ∂ "{CommFileTransferDir}FileTransferMgrUtilities.c" ∂ "{CommFileTransferDir}FileTransferMgrExtensions.c" C {StdCOpts} -o "{targ}" "{CommFileTransferDir}FileTransferMgr.c" -"{ObjDir}CommToolboxDispatcher.a.o" ƒ "{CommStartupDir}CommToolboxDispatcher.a" ∂ - "{AIncludes}Traps.a" ∂ - "{AIncludes}ToolUtils.a" ∂ - "{AIncludes}SysEqu.a" ∂ - "{IntAIncludes}SysPrivateEqu.a" ∂ - "{AIncludes}CommResources.a" ∂ - "{IntAIncludes}CommToolboxPriv.a" +"{ObjDir}CommToolboxDispatcher.a.o" ƒ "{CommStartupDir}CommToolboxDispatcher.a" Asm {StdAOpts} -o "{targ}" "{CommStartupDir}CommToolboxDispatcher.a" -"{ObjDir}CRMBuiltInSerial.c.o" ƒ "{CommStartupDir}CRMBuiltInSerial.c" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}ToolUtils.h" ∂ - "{CIncludes}OSUtils.h" ∂ - "{CIncludes}CommResources.h" ∂ - "{CIncludes}CRMSerialDevices.h" ∂ - "{IntCIncludes}CommToolboxPriv.h" ∂ - "{IntCIncludes}IconUtilsPriv.h" +"{ObjDir}CRMBuiltInSerial.c.o" ƒ "{CommStartupDir}CRMBuiltInSerial.c" C {StdCOpts} -o "{targ}" "{CommStartupDir}CRMBuiltInSerial.c" "{ObjDir}CommToolboxPatches.c.o" ƒ "{CommStartupDir}CommToolboxPatches.c" ∂ - "{IntCIncludes}CommToolboxPriv.h" ∂ "{CommResourceDir}CommResourceMgr.h" C {StdCOpts} -o "{Targ}" "{CommStartupDir}CommToolboxPatches.c" -i "{CommResourceDir}" diff --git a/Toolbox/ComponentMgr/ComponentMgr.make b/Toolbox/ComponentMgr/ComponentMgr.make --- a/Toolbox/ComponentMgr/ComponentMgr.make +++ b/Toolbox/ComponentMgr/ComponentMgr.make @@ -28,30 +28,12 @@ ComponentMgrObjects = "{ObjDir}ThingManagerDispatcher.a.o" ∂ "{ObjDir}ThingManagerDispatcher.a.o" ƒ "{ComponentMgrDir}ThingManagerDispatcher.a" ∂ "{ComponentMgrDir}ComponentMgr.make" ∂ - "{ComponentMgrDir}ComponentManagerSelectors.h" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}Components.a" ∂ - "{IntAIncludes}LinkedPatchMacros.a" + "{ComponentMgrDir}ComponentManagerSelectors.h" Asm {StdAOpts} "{ComponentMgrDir}ThingManagerDispatcher.a" -o "{Targ}" "{ObjDir}ThingManager.c.o" ƒ "{ComponentMgrDir}ThingManager.c" ∂ "{ComponentMgrDir}ComponentMgr.make" ∂ - "{CIncludes}Types.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}OSUtils.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}Files.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}GestaltEqu.h" ∂ - "{CIncludes}SysEqu.h" ∂ - "{CIncludes}Traps.h" ∂ - "{IntCIncludes}MemoryMgrPriv.h" ∂ - "{IntCIncludes}FigmentMemory.h" ∂ - "{IntCIncludes}ExpandMemPriv.h" ∂ - "{IntCIncludes}TrapsPrivate.h" ∂ - "{CIncludes}LowMem.h" ∂ - "{CIncludes}FragLoad.h" ∂ "{ComponentMgrDir}Components.h" ∂ "{ComponentMgrDir}ComponentManagerSelectors.h" ∂ "{ComponentMgrDir}PrivateThingManager.h" @@ -61,25 +43,11 @@ ComponentMgrObjects = "{ObjDir}ThingManagerDispatcher.a.o" ∂ "{ObjDir}ThingSearch.c.o" ƒ "{ComponentMgrDir}ThingSearch.c" ∂ "{ComponentMgrDir}ComponentMgr.make" ∂ "{ComponentMgrDir}ComponentManagerSelectors.h" ∂ - "{ComponentMgrDir}Components.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}SysEqu.h" ∂ - "{CIncludes}Aliases.h" ∂ - "{CIncludes}Finder.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}Folders.h" + "{ComponentMgrDir}Components.h" C {StdCOpts} "{ComponentMgrDir}ThingSearch.c" -o "{Targ}" "{ObjDir}ThingFiles.c.o" ƒ "{ComponentMgrDir}ThingFiles.c" ∂ "{ComponentMgrDir}ComponentMgr.make" ∂ - "{CIncludes}Files.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}SysEqu.h" ∂ - "{CIncludes}TextUtils.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}Icons.h" ∂ "{ComponentMgrDir}Components.h" ∂ "{ComponentMgrDir}ComponentManagerSelectors.h" ∂ "{ComponentMgrDir}PrivateThingManager.h" diff --git a/Toolbox/ControlMgr/ControlMgr.make b/Toolbox/ControlMgr/ControlMgr.make --- a/Toolbox/ControlMgr/ControlMgr.make +++ b/Toolbox/ControlMgr/ControlMgr.make @@ -28,27 +28,17 @@ ControlMgrObjs = "{ObjDir}ControlMgr.a.o" ∂ Lib {StdLibOpts} -o "{Targ}" {ControlMgrObjs} -"{ObjDir}ControlMgr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}LinkedPatchMacros.a" ∂ - "{IntAIncludes}ControlPriv.a" ∂ - "{ControlMgrDir}ControlMgr.a" +"{ObjDir}ControlMgr.a.o" ƒ "{ControlMgrDir}ControlMgr.a" Asm {StdAOpts} -o "{Targ}" "{ControlMgrDir}ControlMgr.a" -"{ObjDir}ControlMgrExtensions.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}LinkedPatchMacros.a" ∂ - "{IntAIncludes}ControlPriv.a" ∂ - "{ControlMgrDir}ControlMgrExtensions.a" +"{ObjDir}ControlMgrExtensions.a.o" ƒ "{ControlMgrDir}ControlMgrExtensions.a" Asm {StdAOpts} -o "{Targ}" "{ControlMgrDir}ControlMgrExtensions.a" -"{ObjDir}ScrollBarCDEF.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}ColorEqu.a" ∂ - "{ControlMgrDir}ScrollBarCDEF.a" +"{ObjDir}ScrollBarCDEF.a.o" ƒ "{ControlMgrDir}ScrollBarCDEF.a" Asm {StdAOpts} -o "{Targ}" "{ControlMgrDir}ScrollBarCDEF.a" -"{ObjDir}ButtonCDEF.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}ColorEqu.a" ∂ - "{ControlMgrDir}ButtonCDEF.a" +"{ObjDir}ButtonCDEF.a.o" ƒ "{ControlMgrDir}ButtonCDEF.a" Asm {StdAOpts} -o "{Targ}" "{ControlMgrDir}ButtonCDEF.a" diff --git a/Toolbox/DataAccessMgr/DataAccessMgr.make b/Toolbox/DataAccessMgr/DataAccessMgr.make --- a/Toolbox/DataAccessMgr/DataAccessMgr.make +++ b/Toolbox/DataAccessMgr/DataAccessMgr.make @@ -41,39 +41,27 @@ DataAccessCompObjs = "{ObjDir}DataAccessCompletion.a.o" Link {StdLOpts} {StdAlign} -o "{Targ}" -rt proc=-5727 -ra =resSysHeap -m DataAccessCR {DataAccessCompObjs} || Exit 1 -"{ObjDir}DataAccessMgr.a.o" ƒ "{DataAccessDir}DataAccessMgr.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}DatabaseAccess.a" +"{ObjDir}DataAccessMgr.a.o" ƒ "{DataAccessDir}DataAccessMgr.a" Asm {StdAOpts} -o "{Targ}" "{DataAccessDir}DataAccessMgr.a" "{ObjDir}DataAccessMgr.c.o" ƒ "{DataAccessDir}DataAccessMgr.c" ∂ - "{DataAccessDir}DatabaseAccessPriv.h" ∂ - "{CIncludes}DatabaseAccess.h" ∂ - "{IntCIncludes}DDEV.h" + "{DataAccessDir}DatabaseAccessPriv.h" C {StdCOpts} -o "{Targ}" "{DataAccessDir}DataAccessMgr.c" -"{ObjDir}DataAccessResultsHandlers.a.o" ƒ "{DataAccessDir}DataAccessResultsHandlers.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}DatabaseAccess.a" +"{ObjDir}DataAccessResultsHandlers.a.o" ƒ "{DataAccessDir}DataAccessResultsHandlers.a" Asm {StdAOpts} -o "{Targ}" "{DataAccessDir}DataAccessResultsHandlers.a" "{ObjDir}DataAccessResultsHandlers.c.o" ƒ "{DataAccessDir}DataAccessResultsHandlers.c" ∂ - "{DataAccessDir}DatabaseAccessPriv.h" ∂ - "{CIncludes}DatabaseAccess.h" + "{DataAccessDir}DatabaseAccessPriv.h" C {StdCOpts} -o "{Targ}" "{DataAccessDir}DataAccessResultsHandlers.c" -"{ObjDir}DataAccessCompletion.a.o" ƒ "{DataAccessDir}DataAccessCompletion.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}DatabaseAccess.a" +"{ObjDir}DataAccessCompletion.a.o" ƒ "{DataAccessDir}DataAccessCompletion.a" Asm {StdAOpts} -o "{Targ}" "{DataAccessDir}DataAccessCompletion.a" -"{ObjDir}DataAccessPackEntry.a.o" ƒ "{DataAccessDir}DataAccessPackEntry.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}DatabaseAccess.a" ∂ - "{IntAIncludes}DispatchHelperPriv.a" +"{ObjDir}DataAccessPackEntry.a.o" ƒ "{DataAccessDir}DataAccessPackEntry.a" Asm {StdAOpts} -o "{targ}" "{DataAccessDir}DataAccessPackEntry.a" diff --git a/Toolbox/DataPubsMgr/EditionMgr.make b/Toolbox/DataPubsMgr/EditionMgr.make --- a/Toolbox/DataPubsMgr/EditionMgr.make +++ b/Toolbox/DataPubsMgr/EditionMgr.make @@ -34,9 +34,7 @@ EditionMgrObjs = "{ObjDir}dpDispatcher.a.o" ∂ "{RsrcDir}EditionMgr.rsrc" ƒƒ "{EditionMgrDir}dpResources.r" ∂ - "{StandardFileDir}StandardFileTypes.r" ∂ - "{RIncludes}Types.r" ∂ - "{RIncludes}BalloonTypes.r" + "{StandardFileDir}StandardFileTypes.r" Rez {StdROpts} -o "{Targ}" "{EditionMgrDir}dpResources.r" ∂ -i "{StandardFileDir}" -append || Exit 1 @@ -45,27 +43,17 @@ EditionMgrObjs = "{ObjDir}dpDispatcher.a.o" ∂ Link {StdLOpts} {StdAlign} -o "{Targ}" -rt PACK=11 -m PACKENTRY {EditionMgrObjs} || Exit 1 -"{ObjDir}dpPackEntry.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{EditionMgrDir}dpPackEntry.a" ∂ - "{IntAIncludes}DispatchHelperPriv.a" +"{ObjDir}dpPackEntry.a.o" ƒ "{EditionMgrDir}dpPackEntry.a" Asm {StdAOpts} -o "{targ}" "{EditionMgrDir}dpPackEntry.a" -"{ObjDir}dpDispatcher.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}EditionsPrivate.a" ∂ - "{EditionMgrDir}dpCompileOptions.inc.a" ∂ +"{ObjDir}dpDispatcher.a.o" ƒ "{EditionMgrDir}dpCompileOptions.inc.a" ∂ "{EditionMgrDir}dpDispatcher.a" Asm {StdAOpts} -o "{targ}" "{EditionMgrDir}dpDispatcher.a" "{ObjDir}dpEvents.p.o" ƒ "{EditionMgrDir}dpEvents.inc.p" ∂ "{EditionMgrDir}dpCompileOptions.inc.p" ∂ - "{IntPInterfaces}StandardEqu.p" ∂ - "{PInterfaces}Editions.p" ∂ - "{PInterfaces}Aliases.p" ∂ - "{IntPInterfaces}AppleEventsInternal.p" ∂ - "{IntPInterfaces}EditionsPrivate.p" ∂ - "{IntPInterfaces}MFPrivate.p" ∂ "{EditionMgrDir}dpMisc.p" ∂ "{EditionMgrDir}dpPubControlBlock.p" ∂ "{EditionMgrDir}dpPubIO.p" ∂ @@ -76,37 +64,25 @@ EditionMgrObjs = "{ObjDir}dpDispatcher.a.o" ∂ "{ObjDir}dpInit.p.o" ƒ "{EditionMgrDir}dpInit.inc.p" ∂ "{EditionMgrDir}dpCompileOptions.inc.p" ∂ - "{IntPInterfaces}StandardEqu.p" ∂ - "{PInterfaces}Editions.p" ∂ - "{PInterfaces}Aliases.p" ∂ - "{IntPInterfaces}EditionsPrivate.p" ∂ "{EditionMgrDir}dpMisc.p" ∂ "{EditionMgrDir}dpPubControlBlock.p" ∂ "{EditionMgrDir}dpInit.p" Pascal {StdPOpts} -o "{targ}" "{EditionMgrDir}dpInit.p" -"{ObjDir}dpMisc.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}EditionsPrivate.a" ∂ - "{EditionMgrDir}dpCompileOptions.inc.a" ∂ +"{ObjDir}dpMisc.a.o" ƒ "{EditionMgrDir}dpCompileOptions.inc.a" ∂ "{EditionMgrDir}dpMisc.a" Asm {StdAOpts} -o "{targ}" "{EditionMgrDir}dpMisc.a" "{ObjDir}dpMisc.p.o" ƒ "{EditionMgrDir}dpMisc.inc.p" ∂ "{EditionMgrDir}dpCompileOptions.inc.p" ∂ - "{IntPInterfaces}StandardEqu.p" ∂ - "{PInterfaces}Editions.p" ∂ - "{IntPInterfaces}EditionsPrivate.p" ∂ "{EditionMgrDir}dpMisc.p" Pascal {StdPOpts} -o "{Targ}" "{EditionMgrDir}dpMisc.p" "{ObjDir}dpPubControlBlock.p.o" ƒ "{EditionMgrDir}dpPubControlBlock.inc.p" ∂ "{EditionMgrDir}dpCompileOptions.inc.p" ∂ - "{IntPInterfaces}StandardEqu.p" ∂ - "{PInterfaces}Editions.p" ∂ - "{IntPInterfaces}EditionsPrivate.p" ∂ "{EditionMgrDir}dpMisc.p" ∂ "{EditionMgrDir}dpPubIO.p" ∂ "{EditionMgrDir}dpPubControlBlock.p" @@ -115,11 +91,6 @@ EditionMgrObjs = "{ObjDir}dpDispatcher.a.o" ∂ "{ObjDir}dpPubIO.p.o" ƒ "{EditionMgrDir}dpPubIO.inc.p" ∂ "{EditionMgrDir}dpCompileOptions.inc.p" ∂ - "{IntPInterfaces}StandardEqu.p" ∂ - "{PInterfaces}Editions.p" ∂ - "{PInterfaces}Aliases.p" ∂ - "{IntPInterfaces}EditionsPrivate.p" ∂ - "{IntPInterfaces}MFPrivate.p" ∂ "{EditionMgrDir}dpMisc.p" ∂ "{EditionMgrDir}dpEvents.p" ∂ "{EditionMgrDir}dpSectionIO.p" ∂ @@ -131,10 +102,6 @@ EditionMgrObjs = "{ObjDir}dpDispatcher.a.o" ∂ "{ObjDir}dpSection.p.o" ƒ "{EditionMgrDir}dpSection.inc.p" ∂ "{EditionMgrDir}dpCompileOptions.inc.p" ∂ - "{IntPInterfaces}StandardEqu.p" ∂ - "{PInterfaces}Editions.p" ∂ - "{PInterfaces}Aliases.p" ∂ - "{IntPInterfaces}EditionsPrivate.p" ∂ "{EditionMgrDir}dpMisc.p" ∂ "{EditionMgrDir}dpPubControlBlock.p" ∂ "{EditionMgrDir}dpEvents.p" ∂ @@ -145,9 +112,6 @@ EditionMgrObjs = "{ObjDir}dpDispatcher.a.o" ∂ "{ObjDir}dpSectionIO.p.o" ƒ "{EditionMgrDir}dpSectionIO.inc.p" ∂ "{EditionMgrDir}dpCompileOptions.inc.p" ∂ - "{IntPInterfaces}StandardEqu.p" ∂ - "{PInterfaces}Editions.p" ∂ - "{IntPInterfaces}EditionsPrivate.p" ∂ "{EditionMgrDir}dpMisc.p" ∂ "{EditionMgrDir}dpSection.p" ∂ "{EditionMgrDir}dpPubIO.p" ∂ @@ -157,15 +121,6 @@ EditionMgrObjs = "{ObjDir}dpDispatcher.a.o" ∂ "{ObjDir}dpDialogs.p.o" ƒ "{EditionMgrDir}dpDialogs.inc.p" ∂ "{EditionMgrDir}dpCompileOptions.inc.p" ∂ - "{IntPInterfaces}StandardEqu.p" ∂ - "{PInterfaces}Editions.p" ∂ - "{PInterfaces}StandardFile.p" ∂ - "{PInterfaces}CTBUtilities.p" ∂ - "{IntPInterfaces}EditionsPrivate.p" ∂ - "{IntPInterfaces}IconUtilsPriv.p" ∂ - "{PInterfaces}Icons.p" ∂ - "{IntPInterfaces}Layers.p" ∂ - "{IntPInterfaces}DialogsPriv.p" ∂ "{EditionMgrDir}dpMisc.p" ∂ "{EditionMgrDir}dpPubIO.p" ∂ "{EditionMgrDir}dpEvents.p" ∂ diff --git a/Toolbox/DialogMgr/DialogMgr.make b/Toolbox/DialogMgr/DialogMgr.make --- a/Toolbox/DialogMgr/DialogMgr.make +++ b/Toolbox/DialogMgr/DialogMgr.make @@ -23,53 +23,25 @@ DialogMgrObjects = "{ObjDir}DialogMgr.a.o" ∂ Lib {StdLibOpts} -o "{Targ}" {DialogMgrObjects} -"{ObjDir}DialogMgr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}ColorEqu.a" ∂ - "{IntAIncludes}DialogsPriv.a" ∂ - "{DialogDir}DialogMgr.a" +"{ObjDir}DialogMgr.a.o" ƒ "{DialogDir}DialogMgr.a" Asm {StdAOpts} -o "{Targ}" "{DialogDir}DialogMgr.a" -"{ObjDir}DialogMgrExtensions.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}Processes.a" ∂ - "{DialogDir}DialogMgrExtensions.a" +"{ObjDir}DialogMgrExtensions.a.o" ƒ "{DialogDir}DialogMgrExtensions.a" Asm {StdAOpts} -o "{Targ}" "{DialogDir}DialogMgrExtensions.a" -"{ObjDir}DialogMgrExtensions.c.o" ƒ "{CIncludes}Memory.h" ∂ - "{CIncludes}ToolUtils.h" ∂ - "{CIncludes}Script.h" ∂ - "{IntCIncludes}ScriptPriv.h" ∂ - "{IntCIncludes}DialogsPriv.h" ∂ - "{DialogDir}DialogMgrExtensions.c" +"{ObjDir}DialogMgrExtensions.c.o" ƒ "{DialogDir}DialogMgrExtensions.c" C {StdCOpts} -o "{Targ}" "{DialogDir}DialogMgrExtensions.c" -"{ObjDir}ModalDialogMenuExtensions.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}BalloonsPriv.a" ∂ - "{IntAIncludes}ScriptPriv.a" ∂ - "{IntAIncludes}MenuMgrPriv.a" ∂ - "{DialogDir}ModalDialogMenuExtensions.a" +"{ObjDir}ModalDialogMenuExtensions.a.o" ƒ "{DialogDir}ModalDialogMenuExtensions.a" Asm {StdAOpts} -i "{HelpMgrDir}" -o "{Targ}" "{DialogDir}ModalDialogMenuExtensions.a" -"{ObjDir}ModalDialogMenuExtensions.c.o" ƒ "{CIncludes}Memory.h" ∂ - "{CIncludes}OSUtils.h" ∂ - "{CIncludes}TextUtils.h" ∂ - "{CIncludes}Menus.h" ∂ - "{IntCIncludes}MenuMgrPriv.h" ∂ - "{CIncludes}Windows.h" ∂ - "{CIncludes}Processes.h" ∂ - "{CIncludes}Dialogs.h" ∂ - "{IntCIncludes}DialogsPriv.h" ∂ - "{CIncludes}Events.h" ∂ - "{DialogDir}ModalDialogMenuExtensions.c" +"{ObjDir}ModalDialogMenuExtensions.c.o" ƒ "{DialogDir}ModalDialogMenuExtensions.c" C {StdCOpts} -o "{Targ}" "{DialogDir}ModalDialogMenuExtensions.c" -"{ObjDir}DialogDispatch.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}InternalMacros.a" ∂ - "{IntAIncludes}LinkedPatchMacros.a" ∂ - "{IntAIncludes}DialogsPriv.a" ∂ - "{DialogDir}DialogDispatch.a" +"{ObjDir}DialogDispatch.a.o" ƒ "{DialogDir}DialogDispatch.a" Asm {StdAOpts} -o "{Targ}" "{DialogDir}DialogDispatch.a" diff --git a/Toolbox/DictionaryMgr/DictionaryMgr.make b/Toolbox/DictionaryMgr/DictionaryMgr.make --- a/Toolbox/DictionaryMgr/DictionaryMgr.make +++ b/Toolbox/DictionaryMgr/DictionaryMgr.make @@ -23,9 +23,7 @@ DictMgrPackObjs = "{ObjDir}DictionaryMgr.a.o" ∂ Link -o {Targ} {DictMgrPackObjs} {StdLOpts} -rt dimg=-16385 -m DictionaryMgrPackEntry -"{ObjDir}DictionaryMgr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}DispatchHelperPriv.a" ∂ - "{DictionaryMgrDir}DictionaryMgr.a" +"{ObjDir}DictionaryMgr.a.o" ƒ "{DictionaryMgrDir}DictionaryMgr.a" Asm {StdAOpts} -o "{Targ}" "{DictionaryMgrDir}DictionaryMgr.a" diff --git a/Toolbox/DisplayMgr/DisplayMgr.make b/Toolbox/DisplayMgr/DisplayMgr.make --- a/Toolbox/DisplayMgr/DisplayMgr.make +++ b/Toolbox/DisplayMgr/DisplayMgr.make @@ -60,95 +60,24 @@ DisplayMgrAOpts = {StdAOpts} Lib {LibWarnings} -o {Targ} {DisplayExtensionObjs} -"{IntCIncludes}DisplaysPriv.h" ƒ ∂ - "{CIncludes}Components.h" ∂ - "{CIncludes}Displays.h" ∂ - "{CIncludes}Events.h" ∂ - "{IntCIncludes}Layers.h" ∂ - "{CIncludes}Processes.h" ∂ - "{CIncludes}Video.h" ∂ - "{CIncludes}Windows.h" ∂ - "{DisplayMgrDir}DisplayComponents.h" - Setfile -m . {Targ} - - -"{ObjDir}DisplayMgr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}InternalMacros.a" ∂ - "{AIncludes}GestaltEqu.a" ∂ - "{AIncludes}Video.a" ∂ - "{IntAIncludes}LinkedPatchMacros.a" ∂ - "{AIncludes}Displays.a" ∂ - "{IntAIncludes}DisplaysPriv.a" ∂ - "{IntAIncludes}MenuMgrPriv.a" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{IntAIncludes}DepVideoEqu.a" ∂ - "{IntAIncludes}TrapsPrivate.a" ∂ - "{DisplayMgrDir}DisplayMgr.a" +"{ObjDir}DisplayMgr.a.o" ƒ "{DisplayMgrDir}DisplayMgr.a" Asm -o {Targ} "{DisplayMgrDir}DisplayMgr.a" {DisplayMgrAOpts} -"{ObjDir}DisplayMgrUtils.c.o" ƒ "{CIncludes}AppleEvents.h" ∂ - "{CIncludes}GestaltEqu.h" ∂ - "{CIncludes}Menus.h" ∂ - "{CIncludes}Processes.h" ∂ - "{CIncludes}QDOffscreen.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}Retrace.h" ∂ - "{CIncludes}ToolUtils.h" ∂ - "{CIncludes}SysEqu.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}Palettes.h" ∂ - "{CIncludes}Slots.h" ∂ - "{CIncludes}Video.h" ∂ - "{CIncludes}ROMDefs.h" ∂ - "{CIncludes}Devices.h" ∂ - "{IntCIncludes}MenuMgrPriv.h" ∂ - "{IntCIncludes}PalettesPriv.h" ∂ - "{IntCIncludes}ProcessesPriv.h" ∂ - "{ProcessMgrDir}Data.h" ∂ - "{CIncludes}Displays.h" ∂ - "{IntCIncludes}DisplaysPriv.h" ∂ - "{IntCIncludes}ExpandMemPriv.h" ∂ +"{ObjDir}DisplayMgrUtils.c.o" ƒ "{ProcessMgrDir}Data.h" ∂ "{DisplayMgrDir}DisplayMgrUtils.c" C "{DisplayMgrDir}DisplayMgrUtils.c" {DisplayMgrCOpts} -o {Targ} "{ObjDir}DisplayMgrCompatibility.c.o" ƒ ∂ - "{CIncludes}GestaltEqu.h" ∂ - "{CIncludes}Notification.h" ∂ - "{CIncludes}QDOffscreen.h" ∂ - "{IntCIncludes}DisplaysPriv.h" ∂ "{DisplayMgrDir}DisplayMgrCompatibility.c" C "{DisplayMgrDir}DisplayMgrCompatibility.c" {DisplayMgrCOpts} -o {Targ} "{ObjDir}DisplayMgrOverlap.c.o" ƒ ∂ - "{CIncludes}Types.h" ∂ - "{CIncludes}GestaltEqu.h" ∂ - "{IntCIncludes}DisplaysPriv.h" ∂ - "{IntCIncludes}ExpandMemPriv.h" ∂ "{DisplayMgrDir}DisplayMgrOverlap.c" C "{DisplayMgrDir}DisplayMgrOverlap.c" {DisplayMgrCOpts} -o {Targ} -"{ObjDir}DisplayMgr.c.o" ƒ "{CIncludes}AppleEvents.h" ∂ - "{CIncludes}GestaltEqu.h" ∂ - "{CIncludes}Menus.h" ∂ - "{CIncludes}Processes.h" ∂ - "{CIncludes}QDOffscreen.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}Retrace.h" ∂ - "{CIncludes}ToolUtils.h" ∂ - "{CIncludes}SysEqu.h" ∂ - "{CIncludes}Errors.h" ∂ - "{CIncludes}Palettes.h" ∂ - "{CIncludes}Devices.h" ∂ - "{IntCIncludes}MenuMgrPriv.h" ∂ - "{IntCIncludes}PalettesPriv.h" ∂ - "{IntCIncludes}ProcessesPriv.h" ∂ - "{ProcessMgrDir}Data.h" ∂ - "{CIncludes}Displays.h" ∂ - "{IntCIncludes}DisplaysPriv.h" ∂ - "{IntCIncludes}ExpandMemPriv.h" ∂ - "{IntCIncludes}CrsrDevPriv.h" ∂ +"{ObjDir}DisplayMgr.c.o" ƒ "{ProcessMgrDir}Data.h" ∂ "{DisplayMgrDir}DisplayMgr.c" C "{DisplayMgrDir}DisplayMgr.c" {DisplayMgrCOpts} -o {Targ} diff --git a/Toolbox/ExpansionBusMgr/ExpansionBusMgr.Make b/Toolbox/ExpansionBusMgr/ExpansionBusMgr.Make --- a/Toolbox/ExpansionBusMgr/ExpansionBusMgr.Make +++ b/Toolbox/ExpansionBusMgr/ExpansionBusMgr.Make @@ -27,8 +27,7 @@ ExpansionBusMgrAOpts = {StdAOpts} "{ExpansionBusMgrLibDir}ExpansionBusMgr.lib" ƒ {ExpansionBusObjs} Lib {LibWarnings} -o {Targ} {ExpansionBusObjs} -"{ObjDir}ExpansionBusMgr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{ExpansionBusMgrDir}ExpansionBusMgr.a" +"{ObjDir}ExpansionBusMgr.a.o" ƒ "{ExpansionBusMgrDir}ExpansionBusMgr.a" Asm -o {Targ} "{ExpansionBusMgrDir}ExpansionBusMgr.a" {ExpansionBusMgrAOpts} "{ObjDir}ExpansionBusMgr.c.o" ƒ "{ExpansionBusMgrDir}ExpansionMgrInternal.h" ∂ diff --git a/Toolbox/FontMgr/FontMgr.make b/Toolbox/FontMgr/FontMgr.make --- a/Toolbox/FontMgr/FontMgr.make +++ b/Toolbox/FontMgr/FontMgr.make @@ -65,53 +65,22 @@ FontMgrObjs = "{ObjDir}fnt.c.o" ∂ Lib {StdLibOpts} {FontMgrObjs} -o "{Targ}" -"{ObjDir}FontFolderExtension.a.o" ƒ "{IntAIncludes}LinkedPatchMacros.a" ∂ - "{AIncludes}Traps.a" ∂ - "{AIncludes}ToolUtils.a" ∂ - "{AIncludes}Folders.a" ∂ - "{IntAIncludes}ResourceMgrPriv.a" ∂ - "{FontMgrDir}FontFolderExtension.a" +"{ObjDir}FontFolderExtension.a.o" ƒ "{FontMgrDir}FontFolderExtension.a" Asm {StdAOpts} -o "{Targ}" "{FontMgrDir}FontFolderExtension.a" -"{ObjDir}BassExtensions.a.o" ƒ "{IntAIncludes}LinkedPatchMacros.a" ∂ - "{IntAIncludes}fontPrivate.a" ∂ - "{AIncludes}QuickDraw.a" ∂ - "{IntAIncludes}ColorEqu.a" ∂ - "{AIncludes}SysEqu.a" ∂ - "{IntAIncludes}SysPrivateEqu.a" ∂ - "{AIncludes}SysErr.a" ∂ - "{AIncludes}Traps.a" ∂ - "{AIncludes}ToolUtils.a" ∂ - "{AIncludes}GestaltEqu.a" ∂ - "{FontMgrDir}SplineDefines.a" ∂ +"{ObjDir}BassExtensions.a.o" ƒ "{FontMgrDir}SplineDefines.a" ∂ "{FontMgrDir}BassExtensions.a" Asm {StdAOpts} -o "{Targ}" "{FontMgrDir}BassExtensions.a" -d NEED_JSTDTXMEAS=0 "{ObjDir}Bass_Allocate.a.o" ƒ "{FontMgrDir}SplineDefines.a" ∂ - "{IntAIncludes}fontPrivate.a" ∂ "{ColorQDDir}qdHooks.a" ∂ - "{AIncludes}QuickDraw.a" ∂ - "{AIncludes}Traps.a" ∂ - "{AIncludes}SysEqu.a" ∂ - "{IntAIncludes}MFPrivate.a" ∂ "{FontMgrDir}Bass_Allocate.a" Asm {StdAOpts} -o "{Targ}" "{FontMgrDir}Bass_Allocate.a" -i "{ColorQDDir}" -"{ObjDir}Bass_Cache.c.o" ƒ "{CIncludes}Types.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}QuickDraw.h" ∂ - "{CIncludes}FixMath.h" ∂ - "{CIncludes}ToolUtils.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}Script.h" ∂ - "{CIncludes}ShutDown.h" ∂ - "{CIncludes}Fonts.h" ∂ - "{CIncludes}GestaltEqu.h" ∂ - "{IntCIncludes}MFPrivate.h" ∂ - "{FontMgrDir}FSCdefs.h" ∂ +"{ObjDir}Bass_Cache.c.o" ƒ "{FontMgrDir}FSCdefs.h" ∂ "{FontMgrDir}FontScaler.h" ∂ "{FontMgrDir}embeddedBitmap.h" ∂ "{FontMgrDir}MacExtra.h" ∂ @@ -125,10 +94,7 @@ FontMgrObjs = "{ObjDir}fnt.c.o" ∂ C {StdCOpts} -o "{Targ}" {FntIncOpts} "{FontMgrDir}Bass_Cache.c" -"{ObjDir}DoubleByteBassCache.c.o" ƒ "{CIncludes}Fonts.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Script.h" ∂ - "{FontMgrDir}FSCdefs.h" ∂ +"{ObjDir}DoubleByteBassCache.c.o" ƒ "{FontMgrDir}FSCdefs.h" ∂ "{FontMgrDir}FontScaler.h" ∂ "{FontMgrDir}Bass_Cache.h" ∂ "{FontMgrDir}DoubleByteBassCache.h" ∂ @@ -136,25 +102,12 @@ FontMgrObjs = "{ObjDir}fnt.c.o" ∂ C {StdCOpts} -o "{Targ}" "{FontMgrDir}DoubleByteBassCache.c" -i "{PartialIfDir}" -"{ObjDir}DoubleByteSupport.a.o" ƒ "{AIncludes}Script.a" ∂ - "{AIncludes}SysEqu.a" ∂ - "{AIncludes}ToolUtils.a" ∂ - "{FontMgrDir}DoubleByteSupport.a" +"{ObjDir}DoubleByteSupport.a.o" ƒ "{FontMgrDir}DoubleByteSupport.a" Asm {StdAOpts} -o "{Targ}" "{FontMgrDir}DoubleByteSupport.a" "{ObjDir}FontMgr.a.o" ƒ "{FontMgrDir}SplineDefines.a" ∂ - "{IntAIncludes}fontPrivate.a" ∂ - "{AIncludes}QuickDraw.a" ∂ - "{IntAIncludes}ColorEqu.a" ∂ "{ColorQDDir}qdHooks.a" ∂ - "{AIncludes}ToolUtils.a" ∂ - "{AIncludes}SysEqu.a" ∂ - "{IntAIncludes}SysPrivateEqu.a" ∂ - "{AIncludes}Traps.a" ∂ - "{AIncludes}Script.a" ∂ - "{IntAIncludes}ScriptPriv.a" ∂ - "{IntAIncludes}ResourceMgrPriv.a" ∂ "{FontMgrDir}FontMgr.a" ∂ "{FontMgrDir}FontMgrShell.a" Asm {StdAOpts} -o "{Targ}" "{FontMgrDir}FontMgrShell.a" -i "{ColorQDDir}" -d NOT_68000=1 -d HAS_COLOR=1 -i "{FontMgrDir}" @@ -162,7 +115,6 @@ FontMgrObjs = "{ObjDir}fnt.c.o" ∂ "{ObjDir}FontScaler.c.o" ƒ "{FontMgrDir}FontScaler.h" ∂ "{FontMgrDir}privateSFNT.h" ∂ - "{Cincludes}FixMath.h" ∂ "{FontMgrDir}FSCdefs.h" ∂ "{FontMgrDir}FontMath.h" ∂ "{FontMgrDir}privateFontScaler.h" ∂ @@ -177,9 +129,7 @@ FontMgrObjs = "{ObjDir}fnt.c.o" ∂ "{ObjDir}fnt.c.o" ƒ "{FontMgrDir}fnt.h" ∂ - "{Cincludes}FixMath.h" ∂ "{FontMgrDir}FontMath.h" ∂ - "{Cincludes}setjmp.h" ∂ "{FontMgrDir}FSCdefs.h" ∂ "{FontMgrDir}sc.h" ∂ "{FontMgrDir}FSError.h" ∂ @@ -189,8 +139,6 @@ FontMgrObjs = "{ObjDir}fnt.c.o" ∂ "{ObjDir}FSglue.c.o" ƒ "{FontMgrDir}sc.h" ∂ "{FontMgrDir}privateSFNT.h" ∂ - "{CIncludes}ToolUtils.h" ∂ - "{Cincludes}FixMath.h" ∂ "{FontMgrDir}FontMath.h" ∂ "{FontMgrDir}fnt.h" ∂ "{FontMgrDir}FSCdefs.h" ∂ @@ -227,12 +175,6 @@ FontMgrObjs = "{ObjDir}fnt.c.o" ∂ "{FontMgrDir}FontMath.h" ∂ "{FontMgrDir}FSError.h" ∂ "{FontMgrDir}Bass_Cache.h" ∂ - "{Cincludes}SetJmp.h" ∂ - "{Cincludes}FixMath.h" ∂ - "{Cincludes}ToolUtils.h" ∂ - "{Cincludes}Memory.h" ∂ - "{Cincludes}Fonts.h" ∂ - "{Cincludes}Script.h" ∂ "{FontMgrDir}MacExtra.c" C {StdCOpts} -o "{Targ}" "{FontMgrDir}MacExtra.c" -i "{PartialIfDir}" -i "{PartialPtDir}" @@ -243,13 +185,7 @@ FontMgrObjs = "{ObjDir}fnt.c.o" ∂ C {StdCOpts} -o "{Targ}" "{FontMgrDir}MapString.c" -"{ObjDir}OutlineMetrics.a.o" ƒ "{AIncludes}SysEqu.a" ∂ - "{IntAIncludes}SysPrivateEqu.a" ∂ - "{AIncludes}Traps.a" ∂ - "{AIncludes}QuickDraw.a" ∂ - "{AIncludes}ToolUtils.a" ∂ - "{IntAIncludes}FontPrivate.a" ∂ - "{FontMgrDir}SplineDefines.a" ∂ +"{ObjDir}OutlineMetrics.a.o" ƒ "{FontMgrDir}SplineDefines.a" ∂ "{FontMgrDir}OutlineMetrics.a" Asm {StdAOpts} -o "{Targ}" "{FontMgrDir}OutlineMetrics.a" @@ -263,7 +199,6 @@ FontMgrObjs = "{ObjDir}fnt.c.o" ∂ "{ObjDir}sfnt.c.o" ƒ "{FontMgrDir}sfnt.h" ∂ "{FontMgrDir}privateSFNT.h" ∂ - "{Cincludes}FixMath.h" ∂ "{FontMgrDir}FontMath.h" ∂ "{FontMgrDir}sfnt_enum.h" ∂ "{FontMgrDir}FSCdefs.h" ∂ @@ -301,8 +236,6 @@ FontMgrObjs = "{ObjDir}fnt.c.o" ∂ "{ObjDir}Fragment.c.o" ƒ "{PartialDir}Source:Fragment.c" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Resources.h" ∂ "{FontLibIfDir}Assertion.h" ∂ "{FontLibIfDir}BaseIncludes.h" ∂ "{FontLibIfDir}ZoneHandle.h" ∂ @@ -315,8 +248,6 @@ FontMgrObjs = "{ObjDir}fnt.c.o" ∂ "{ObjDir}FragmentTable.c.o" ƒ "{PartialDir}Source:FragmentTable.c" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Types.h" ∂ "{FontLibIfDir}Assertion.h" ∂ "{FontLibIfDir}BaseIncludes.h" ∂ "{FontLibIfDir}ZoneHandle.h" ∂ @@ -329,7 +260,6 @@ FontMgrObjs = "{ObjDir}fnt.c.o" ∂ "{ObjDir}PartialFontExtensions.c.o" ƒ "{PartialDir}Source:PartialFontExtensions.c" ∂ - "{CIncludes}Memory.h" ∂ "{FontMgrDir}FSCdefs.h" ∂ "{FontMgrDir}MapString.h" ∂ "{FontMgrDir}sfnt.h" ∂ diff --git a/Toolbox/HelpMgr/HelpMgr.make b/Toolbox/HelpMgr/HelpMgr.make --- a/Toolbox/HelpMgr/HelpMgr.make +++ b/Toolbox/HelpMgr/HelpMgr.make @@ -37,34 +37,20 @@ BalloonWDEFObjs = "{ObjDir}BalloonWDEF.a.o" ∂ Link {StdLOpts} {StdAlign} -rt WDEF=126 -o "{Targ}" {BalloonWDEFObjs} || Exit 1 -"{RsrcDir}HelpMgr.rsrc" ƒƒ "{RIncludes}Types.r" ∂ - "{RIncludes}BalloonTypes.r" ∂ - "{HelpMgrDir}Balloon.r" +"{RsrcDir}HelpMgr.rsrc" ƒƒ "{HelpMgrDir}Balloon.r" Rez {StdROpts} -a -o "{Targ}" "{HelpMgrDir}Balloon.r" || Exit 1 -"{ObjDir}BalloonPACK.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}MFPrivate.a" ∂ - "{IntAIncludes}LayerEqu.a" ∂ - "{IntAIncludes}ScriptPriv.a" ∂ - "{IntAIncludes}InternalMacros.a" ∂ - "{AIncludes}Processes.a" ∂ - "{AIncludes}SysEqu.a" ∂ - "{IntAIncludes}BalloonsPriv.a" ∂ - "{IntAIncludes}DialogsPriv.a" ∂ - "{HelpMgrDir}BalloonPACK.a" +"{ObjDir}BalloonPACK.a.o" ƒ "{HelpMgrDir}BalloonPACK.a" Asm {StdAOpts} -o "{targ}" "{HelpMgrDir}BalloonPACK.a" "{ObjDir}BalloonPACK.p.o" ƒ "{HelpMgrDir}BalloonPACK.p" ∂ - "{HelpMgrDir}BalloonDefs.p" ∂ - "{IntPInterfaces}MenuMgrPriv.p" ∂ - "{IntPInterfaces}MFPrivate.p" + "{HelpMgrDir}BalloonDefs.p" Pascal {StdPOpts} -o "{targ}" "{HelpMgrDir}BalloonPACK.p" -"{ObjDir}BalloonWDEF.a.o" ƒ "{IntAIncludes}BalloonsPriv.a" ∂ - "{HelpMgrDir}BalloonWDEF.a" +"{ObjDir}BalloonWDEF.a.o" ƒ "{HelpMgrDir}BalloonWDEF.a" Asm {StdAOpts} -o "{targ}" "{HelpMgrDir}BalloonWDEF.a" @@ -72,19 +58,10 @@ BalloonWDEFObjs = "{ObjDir}BalloonWDEF.a.o" ∂ Pascal {StdPOpts} -o "{targ}" "{HelpMgrDir}BalloonWDEF.p" -"{ObjDir}BalloonExtensions.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}GestaltEqu.a" ∂ - "{IntAIncludes}"IconUtilsPriv.a ∂ - "{IntAIncludes}BalloonsPriv.a" ∂ - "{HelpMgrDir}BalloonExtensions.a" ∂ - "{IntAIncludes}LinkedPatchMacros.a" +"{ObjDir}BalloonExtensions.a.o" ƒ "{HelpMgrDir}BalloonExtensions.a" Asm {StdAOpts} -o "{targ}" "{HelpMgrDir}BalloonExtensions.a" -"{ObjDir}Balloonptch28.p.o" ƒ "{PInterfaces}Balloons.p" ∂ - "{HelpMgrDir}BalloonDefs.p" ∂ - "{IntPInterfaces}DialogsPriv.p" ∂ - "{IntPInterfaces}MenuMgrPriv.p" ∂ - "{IntPInterfaces}StandardEqu.p" ∂ +"{ObjDir}Balloonptch28.p.o" ƒ "{HelpMgrDir}BalloonDefs.p" ∂ "{HelpMgrDir}Balloonptch28.p" Pascal {StdPOpts} -o "{targ}" "{HelpMgrDir}Balloonptch28.p" diff --git a/Toolbox/InSANE/InSane.make b/Toolbox/InSANE/InSane.make --- a/Toolbox/InSANE/InSane.make +++ b/Toolbox/InSANE/InSane.make @@ -30,10 +30,7 @@ Link {StdLOpts} {StdAlign} -o "{Targ}" -rt PACK=4 "{ObjDir}FP020.a.o" || Exit 1 -"{ObjDir}FPPrivTrap.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}HardwarePrivateEqu.a" ∂ - "{InSaneDir}FPPrivTrap.a" +"{ObjDir}FPPrivTrap.a.o" ƒ "{InSaneDir}FPPrivTrap.a" Asm {StdAOpts} -o "{Targ}" "{InSaneDir}FPPrivTrap.a" @@ -52,10 +49,6 @@ "{RsrcDir}FPHW.rsrc" ƒ "{InSaneDir}FPHW.a" ∂ "{InSaneDir}FPHWEqus.a" ∂ - "{AIncludes}ToolUtils.a" ∂ - "{AIncludes}TRAPS.a" ∂ - "{AIncludes}SANEMACS.a" ∂ - "{AIncludes}SANEMacs881.a" ∂ "{InSaneDir}FPHWCtrl.a" ∂ "{InSaneDir}FPHWArith.a" ∂ "{InSaneDir}FPHWArith96.a" ∂ @@ -67,9 +60,7 @@ "{ObjDir}FPHW.a.o" ƒ "{InSaneDir}FPHW.a" Asm {StdAOpts} -d BackPatch=1 -o "{Targ}" "{InSaneDir}FPHW.a" -"{ObjDir}ELEMS020.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}SANEMACS.a" ∂ - "{InSaneDir}ELEMS020_1.a" ∂ +"{ObjDir}ELEMS020.a.o" ƒ "{InSaneDir}ELEMS020_1.a" ∂ "{InSaneDir}ELEMS020_2.a" ∂ "{InSaneDir}ELEMS020_3.a" ∂ "{InSaneDir}ELEMS020_C.a" ∂ @@ -77,9 +68,7 @@ Asm {StdAOpts} -o "{Targ}" "{InSaneDir}ELEMS020.a" -"{ObjDir}FP020.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{InSaneDir}FPEQUS.a" ∂ - "{AIncludes}SANEMACS.a" ∂ +"{ObjDir}FP020.a.o" ƒ "{InSaneDir}FPEQUS.a" ∂ "{InSaneDir}FPCTRL.a" ∂ "{InSaneDir}FPOPS.a" ∂ "{InSaneDir}FPBD.a" ∂ diff --git a/Toolbox/ListMgr/ListMgr.make b/Toolbox/ListMgr/ListMgr.make --- a/Toolbox/ListMgr/ListMgr.make +++ b/Toolbox/ListMgr/ListMgr.make @@ -27,30 +27,16 @@ Link {StdLOpts} {StdAlign} -o "{Targ}" -rt LDEF=0 "{ObjDir}TextLDEF.a.o" || Exit 1 -"{ObjDir}IconLDEF.a.o" ƒ "{ListMgrDir}IconLDEF.a" ∂ - "{AIncludes}SysEqu.a" ∂ - "{IntAIncludes}SysPrivateEqu.a" ∂ - "{AIncludes}QuickDraw.a" ∂ - "{AIncludes}Traps.a" ∂ - "{AIncludes}Packages.a" ∂ - "{AIncludes}Script.a" ∂ - "{IntAIncludes}IconUtilsPriv.a" +"{ObjDir}IconLDEF.a.o" ƒ "{ListMgrDir}IconLDEF.a" Asm {StdAOpts} -o "{Targ}" "{ListMgrDir}IconLDEF.a" -"{ObjDir}ListMgrPACK.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}Packages.a" ∂ - "{ListMgrDir}ListMgrPriv.a" ∂ +"{ObjDir}ListMgrPACK.a.o" ƒ "{ListMgrDir}ListMgrPriv.a" ∂ "{ListMgrDir}ListMgrPACK.a" Asm {StdAOpts} -o "{Targ}" "{ListMgrDir}ListMgrPACK.a" -"{ObjDir}TextLDEF.a.o" ƒ "{AIncludes}SysEqu.a" ∂ - "{IntAIncludes}SysPrivateEqu.a" ∂ - "{AIncludes}Traps.a" ∂ - "{AIncludes}QuickDraw.a" ∂ - "{AIncludes}Packages.a" ∂ - "{ListMgrDir}TextLDEF.a" +"{ObjDir}TextLDEF.a.o" ƒ "{ListMgrDir}TextLDEF.a" Asm {StdAOpts} -o "{Targ}" "{ListMgrDir}TextLDEF.a" diff --git a/Toolbox/MenuMgr/MenuMgr.make b/Toolbox/MenuMgr/MenuMgr.make --- a/Toolbox/MenuMgr/MenuMgr.make +++ b/Toolbox/MenuMgr/MenuMgr.make @@ -33,73 +33,33 @@ MenuMgrObjs = "{ObjDir}MenuMgr.a.o" ∂ Lib {StdLibOpts} -o "{Targ}" {MenuMgrObjs} -"{ObjDir}StandardMDEF.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}ColorEqu.a" ∂ - "{MenuMgrDir}StandardMDEF.a" +"{ObjDir}StandardMDEF.a.o" ƒ "{MenuMgrDir}StandardMDEF.a" Asm {StdAOpts} -o "{Targ}" "{MenuMgrDir}StandardMDEF.a" -"{ObjDir}StandardMBDF.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}ColorEqu.a" ∂ - "{MenuMgrDir}StandardMBDF.a" +"{ObjDir}StandardMBDF.a.o" ƒ "{MenuMgrDir}StandardMBDF.a" Asm {StdAOpts} -o "{Targ}" "{MenuMgrDir}StandardMBDF.a" "{ObjDir}MenuMgr.a.o" ƒ "{MenuMgrDir}IncludeMenuMgr.a" ∂ "{MenuMgrDir}MenuMgr.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}ColorEqu.a" ∂ - "{AIncludes}Packages.a" ∂ "{MenuMgrDir}MenuDispatch.a" Asm {StdAOpts} -o "{Targ}" "{MenuMgrDir}IncludeMenuMgr.a" -"{ObjDir}MenuDispatch.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}LinkedPatchMacros.a" ∂ - "{AIncludes}Menus.a" ∂ - "{IntAIncludes}MenuMgrPriv.a" ∂ - "{MenuMgrDir}MenuDispatch.a" +"{ObjDir}MenuDispatch.a.o" ƒ "{MenuMgrDir}MenuDispatch.a" Asm {StdAOpts} -o "{Targ}" "{MenuMgrDir}MenuDispatch.a" -"{ObjDir}MenuMgr.c.o" ƒ "{CIncludes}SysEqu.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}Types.h" ∂ - "{CIncludes}Files.h" ∂ - "{CIncludes}OSUtils.h" ∂ - "{CIncludes}SegLoad.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}Menus.h" ∂ - "{CIncludes}Quickdraw.h" ∂ - "{CIncludes}Script.h" ∂ - "{IntCIncludes}IntlUtilsPriv.h" ∂ - "{IntCIncludes}ScriptPriv.h" ∂ - "{CIncludes}Events.h" ∂ - "{CIncludes}Packages.h" ∂ - "{CIncludes}StandardFile.h" ∂ - "{CIncludes}Dialogs.h" ∂ - "{CIncludes}Windows.h" ∂ - "{CIncludes}Controls.h" ∂ - "{CIncludes}TextEdit.h" ∂ - "{MenuMgrDir}MenuMgr.c" +"{ObjDir}MenuMgr.c.o" ƒ "{MenuMgrDir}MenuMgr.c" C {StdCOpts} -o "{Targ}" "{MenuMgrDir}MenuMgr.c" -"{ObjDir}SaveRestoreBits.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}LinkedPatchMacros.a" ∂ - "{AIncludes}Menus.a" ∂ - "{IntAIncludes}MenuMgrPriv.a" ∂ - "{IntAIncludes}LayerEqu.a" ∂ - "{IntAIncludes}InternalMacros.a" ∂ - "{MenuMgrDir}SaveRestoreBits.a" +"{ObjDir}SaveRestoreBits.a.o" ƒ "{MenuMgrDir}SaveRestoreBits.a" Asm {StdAOpts} -o "{Targ}" "{MenuMgrDir}SaveRestoreBits.a" -"{ObjDir}SystemMenusPatch.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}LinkedPatchMacros.a" ∂ - "{AIncludes}Menus.a" ∂ - "{IntAIncludes}MenuMgrPriv.a" ∂ - "{MenuMgrDir}SystemMenusPatch.a" +"{ObjDir}SystemMenusPatch.a.o" ƒ "{MenuMgrDir}SystemMenusPatch.a" Asm {StdAOpts} -o "{Targ}" "{MenuMgrDir}SystemMenusPatch.a" diff --git a/Toolbox/NotificationMgr/NotificationMgr.make b/Toolbox/NotificationMgr/NotificationMgr.make --- a/Toolbox/NotificationMgr/NotificationMgr.make +++ b/Toolbox/NotificationMgr/NotificationMgr.make @@ -21,27 +21,13 @@ NotificationMgrObjs = "{ObjDir}NotificationMgr.c.o" ∂ -"{ObjDir}NotificationMgr.c.o" ƒ "{cincludes}Notification.h" ∂ - "{NotificationDir}kernel.h" ∂ +"{ObjDir}NotificationMgr.c.o" ƒ "{NotificationDir}kernel.h" ∂ "{NotificationDir}task.h" ∂ - "{CIncludes}Types.h" ∂ - "{CIncludes}Devices.h" ∂ - "{CIncludes}Memory.h" ∂ - "{CIncludes}OSUtils.h" ∂ - "{CIncludes}Events.h" ∂ - "{CIncludes}Resources.h" ∂ - "{CIncludes}Controls.h" ∂ - "{CIncludes}Dialogs.h" ∂ - "{CIncludes}Menus.h" ∂ - "{CIncludes}Sound.h" ∂ "{NotificationDir}NotificationMgr.c" C {StdCOpts} -o "{Targ}" "{NotificationDir}NotificationMgr.c" -"{ObjDir}NotificationMgr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{NotificationDir}NotificationMgr.a" +"{ObjDir}NotificationMgr.a.o" ƒ "{NotificationDir}NotificationMgr.a" Asm {StdAOpts} -o "{Targ}" "{NotificationDir}NotificationMgr.a" diff --git a/Toolbox/ResourceMgr/ResourceMgr.make b/Toolbox/ResourceMgr/ResourceMgr.make --- a/Toolbox/ResourceMgr/ResourceMgr.make +++ b/Toolbox/ResourceMgr/ResourceMgr.make @@ -21,26 +21,11 @@ ResourceMgrObjs = "{ObjDir}ResourceMgr.a.o" ∂ Lib {StdLibOpts} -o "{Targ}" {ResourceMgrObjs} -"{ObjDir}ResourceMgr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{IntAIncludes}Decompression.a" ∂ - "{IntAIncludes}ResourceMgrPriv.a" ∂ - "{IntAIncludes}UniversalEqu.a" ∂ - "{IntAIncludes}InternalOnlyEqu.a" ∂ - "{IntAIncludes}SysPrivateEqu.a" ∂ - "{ResourceMgrDir}ResourceMgr.a" +"{ObjDir}ResourceMgr.a.o" ƒ "{ResourceMgrDir}ResourceMgr.a" Asm {StdAOpts} -o "{Targ}" "{ResourceMgrDir}ResourceMgr.a" -"{ObjDir}ResourceMgrExtensions.a.o" ƒ "{AIncludes}SysEqu.a" ∂ - "{IntAIncludes}SysPrivateEqu.a" ∂ - "{AIncludes}SysErr.a" ∂ - "{AIncludes}ToolUtils.a" ∂ - "{AIncludes}Traps.a" ∂ - "{IntAIncludes}MFPrivate.a" ∂ - "{IntAIncludes}ResourceMgrPriv.a" ∂ - "{IntAIncludes}LinkedPatchMacros.a" ∂ - "{ResourceMgrDir}ResourceMgrExtensions.a" +"{ObjDir}ResourceMgrExtensions.a.o" ƒ "{ResourceMgrDir}ResourceMgrExtensions.a" Asm {StdAOpts} -o "{Targ}" "{ResourceMgrDir}ResourceMgrExtensions.a" diff --git a/Toolbox/SANE/SANE.make b/Toolbox/SANE/SANE.make --- a/Toolbox/SANE/SANE.make +++ b/Toolbox/SANE/SANE.make @@ -19,9 +19,7 @@ -"{ObjDir}BinDec.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}SANEMacs.a" ∂ - "{SANEDir}Str2Dec.a" ∂ +"{ObjDir}BinDec.a.o" ƒ "{SANEDir}Str2Dec.a" ∂ "{SANEDir}Dec2Str.a" ∂ "{SANEDir}BinDec.a" Asm {StdAOpts} -o "{Targ}" "{SANEDir}BinDec.a" diff --git a/Toolbox/ScriptMgr/ScriptMgr.make b/Toolbox/ScriptMgr/ScriptMgr.make --- a/Toolbox/ScriptMgr/ScriptMgr.make +++ b/Toolbox/ScriptMgr/ScriptMgr.make @@ -36,23 +36,15 @@ ScriptMgrObjects = "{ObjDir}ScriptMgrHeader.a.o" ∂ Lib {StdLibOpts} -o "{Targ}" {ScriptMgrObjects} -"{ObjDir}ScriptMgrDispatch.a.o" ƒ "{IntAIncludes}ScriptPriv.a" ∂ - "{IntAIncludes}IntlUtilsPriv.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{ScriptMgrDir}ScriptMgrDispatch.a" +"{ObjDir}ScriptMgrDispatch.a.o" ƒ "{ScriptMgrDir}ScriptMgrDispatch.a" Asm {StdAOpts} -o "{Targ}" "{ScriptMgrDir}ScriptMgrDispatch.a" -"{ObjDir}ScriptMgrHeader.a.o" ƒ "{IntAIncludes}ScriptPriv.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{ScriptMgrDir}ScriptMgrHeader.a" +"{ObjDir}ScriptMgrHeader.a.o" ƒ "{ScriptMgrDir}ScriptMgrHeader.a" Asm {StdAOpts} -o "{Targ}" "{ScriptMgrDir}ScriptMgrHeader.a" -"{ObjDir}ScriptMgrInit.a.o" ƒ "{IntAIncludes}ScriptPriv.a" ∂ - "{AIncludes}Packages.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{ScriptMgrDir}ScriptMgrInit.a" +"{ObjDir}ScriptMgrInit.a.o" ƒ "{ScriptMgrDir}ScriptMgrInit.a" Asm {StdAOpts} -o "{Targ}" "{ScriptMgrDir}ScriptMgrInit.a" @@ -60,102 +52,51 @@ ScriptMgrObjects = "{ObjDir}ScriptMgrHeader.a.o" ∂ Asm {StdAOpts} -o "{Targ}" "{ScriptMgrDir}ScriptMgrExtensions.a" -"{ObjDir}ScriptMgrKeyGetSet.a.o" ƒ "{IntAIncludes}ScriptPriv.a" ∂ - "{IntAIncludes}TSMPrivate.a" ∂ - "{IntAIncludes}MenuMgrPriv.a" ∂ - "{AIncludes}Components.a" ∂ - "{AIncludes}TextServices.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{ScriptMgrDir}ScriptMgrKeyGetSet.a" +"{ObjDir}ScriptMgrKeyGetSet.a.o" ƒ "{ScriptMgrDir}ScriptMgrKeyGetSet.a" Asm {StdAOpts} -o "{Targ}" "{ScriptMgrDir}ScriptMgrKeyGetSet.a" -"{ObjDir}ScriptMgrMisc.a.o" ƒ "{IntAIncludes}ScriptPriv.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}ApplDeskBus.a" ∂ - "{ScriptMgrDir}ScriptMgrMisc.a" +"{ObjDir}ScriptMgrMisc.a.o" ƒ "{ScriptMgrDir}ScriptMgrMisc.a" Asm {StdAOpts} -o "{Targ}" "{ScriptMgrDir}ScriptMgrMisc.a" -"{ObjDir}RomanUtil.a.o" ƒ "{IntAIncludes}ScriptPriv.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}Packages.a" ∂ - "{ScriptMgrDir}RomanUtil.a" +"{ObjDir}RomanUtil.a.o" ƒ "{ScriptMgrDir}RomanUtil.a" Asm {StdAOpts} -o "{Targ}" "{ScriptMgrDir}RomanUtil.a" -"{ObjDir}RomanNewJust.a.o" ƒ "{IntAIncludes}ScriptPriv.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}ColorEqu.a" ∂ - "{AIncludes}FixMath.a" ∂ - "{ScriptMgrDir}RomanNewJust.a" +"{ObjDir}RomanNewJust.a.o" ƒ "{ScriptMgrDir}RomanNewJust.a" Asm {StdAOpts} -o "{Targ}" "{ScriptMgrDir}RomanNewJust.a" -"{ObjDir}ScriptMgrUtilDate.a.o" ƒ "{IntAIncludes}ScriptPriv.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}Packages.a" ∂ - "{AIncludes}SANEMacs.a" ∂ - "{AIncludes}FixMath.a" ∂ - "{ScriptMgrDir}ScriptMgrUtilDate.a" +"{ObjDir}ScriptMgrUtilDate.a.o" ƒ "{ScriptMgrDir}ScriptMgrUtilDate.a" Asm {StdAOpts} -o "{Targ}" "{ScriptMgrDir}ScriptMgrUtilDate.a" -"{ObjDir}ScriptMgrUtilText.a.o" ƒ "{IntAIncludes}ScriptPriv.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{ScriptMgrDir}ScriptMgrUtilText.a" +"{ObjDir}ScriptMgrUtilText.a.o" ƒ "{ScriptMgrDir}ScriptMgrUtilText.a" Asm {StdAOpts} -o "{Targ}" "{ScriptMgrDir}ScriptMgrUtilText.a" -"{ObjDir}ScriptMgrTruncRepl.a.o" ƒ "{IntAIncludes}ScriptPriv.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}Packages.a" ∂ - "{ScriptMgrDir}ScriptMgrTruncRepl.a" +"{ObjDir}ScriptMgrTruncRepl.a.o" ƒ "{ScriptMgrDir}ScriptMgrTruncRepl.a" Asm {StdAOpts} -o "{Targ}" "{ScriptMgrDir}ScriptMgrTruncRepl.a" -"{ObjDir}ScriptMgrFindWord.c.o" ƒ "{CIncludes}Types.h" ∂ - "{CIncludes}Script.h" ∂ - "{IntCIncludes}ScriptPriv.h" ∂ - "{ScriptMgrDir}ScriptMgrFindWord.c" +"{ObjDir}ScriptMgrFindWord.c.o" ƒ "{ScriptMgrDir}ScriptMgrFindWord.c" C {StdCOpts} -o "{Targ}" "{ScriptMgrDir}ScriptMgrFindWord.c" -"{ObjDir}ScriptMgrKbdMenu.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}ScriptPriv.a" ∂ - "{IntAIncludes}IconUtilsPriv.a" ∂ - "{IntAIncludes}MenuMgrPriv.a" ∂ - "{AIncludes}Components.a" ∂ - "{AIncludes}TextServices.a" ∂ - "{AIncludes}Packages.a" ∂ - "{AIncludes}Icons.a" ∂ - "{ScriptMgrDir}ScriptMgrKbdMenu.a" +"{ObjDir}ScriptMgrKbdMenu.a.o" ƒ "{ScriptMgrDir}ScriptMgrKbdMenu.a" Asm {StdAOpts} -o "{Targ}" "{ScriptMgrDir}ScriptMgrKbdMenu.a" -"{ObjDir}ScriptMgrSysMenuPatch.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}ScriptPriv.a" ∂ - "{IntAIncludes}MFPrivate.a" ∂ - "{IntAIncludes}DialogsPriv.a" ∂ - "{IntAIncludes}MenuMgrPriv.a" ∂ - "{AIncludes}Components.a" ∂ - "{AIncludes}Icons.a" ∂ - "{ScriptMgrDir}ScriptMgrSysMenuPatch.a" +"{ObjDir}ScriptMgrSysMenuPatch.a.o" ƒ "{ScriptMgrDir}ScriptMgrSysMenuPatch.a" Asm {StdAOpts} -o "{Targ}" "{ScriptMgrDir}ScriptMgrSysMenuPatch.a" -"{ObjDir}DblByteCompat.a.o" ƒ "{AIncludes}SysEqu.a" ∂ - "{AIncludes}Script.a" ∂ - "{IntAIncludes}ScriptPriv.a" ∂ - "{ScriptMgrDir}DblByteCompat.a" +"{ObjDir}DblByteCompat.a.o" ƒ "{ScriptMgrDir}DblByteCompat.a" Asm {StdAOpts} -o "{Targ}" "{ScriptMgrDir}DblByteCompat.a" -"{ObjDir}ScriptMgrUtilNum.a.o" ƒ "{IntAIncludes}ScriptPriv.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}Packages.a" ∂ - "{AIncludes}SANEMacs.a" ∂ - "{ScriptMgrDir}ScriptMgrUtilNum.a" +"{ObjDir}ScriptMgrUtilNum.a.o" ƒ "{ScriptMgrDir}ScriptMgrUtilNum.a" Asm {StdAOpts} -o "{Targ}" "{ScriptMgrDir}ScriptMgrUtilNum.a" diff --git a/Toolbox/StandardFile/StandardFile.make b/Toolbox/StandardFile/StandardFile.make --- a/Toolbox/StandardFile/StandardFile.make +++ b/Toolbox/StandardFile/StandardFile.make @@ -15,10 +15,6 @@ "{RsrcDir}StandardFile.rsrc" ƒ "{StandardFileDir}StandardFile.r" ∂ "{StandardFileDir}StandardFileTypes.r" ∂ - "{RIncludes}Types.r" ∂ - "{RIncludes}BalloonTypes.r" ∂ - "{IntRIncludes}IconUtilsPrivTypes.r" ∂ - "{IntCIncludes}FinderPriv.h" ∂ "{RsrcDir}StandardFilePACK.rsrc" ∂ "{RsrcDir}StandardFileLDEF.rsrc" Rez {StdROpts} -o "{Targ}" "{StandardFileDir}StandardFile.r" -i "{IntCIncludes}" @@ -33,24 +29,10 @@ "{ObjDir}StandardFileLDEF.a.o" ƒ "{StandardFileDir}StandardFileLDEF.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}Packages.a" ∂ "{StandardFileDir}StandardFilePriv.a" Asm {StdAOpts} -o "{Targ}" "{StandardFileDir}StandardFileLDEF.a" "{ObjDir}StandardFilePACK.a.o" ƒ "{StandardFileDir}StandardFilePACK.a" ∂ - "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}Folders.a" ∂ - "{AIncludes}Aliases.a" ∂ - "{AIncludes}Balloons.a" ∂ - "{AIncludes}CTBUtilities.a" ∂ - "{AIncludes}Icons.a" ∂ - "{AIncludes}StandardFile.a" ∂ - "{IntAIncludes}LayerEqu.a" ∂ - "{IntAIncludes}IntlUtilsPriv.a" ∂ - "{IntAIncludes}IconUtilsPriv.a" ∂ - "{IntAIncludes}FinderPriv.a" ∂ - "{IntAIncludes}DialogsPriv.a" ∂ "{StandardFileDir}StandardFilePriv.a" Asm {StdAOpts} -o "{Targ}" "{StandardFileDir}StandardFilePACK.a" diff --git a/Toolbox/TextServicesMgr/TextServicesMgr.make b/Toolbox/TextServicesMgr/TextServicesMgr.make --- a/Toolbox/TextServicesMgr/TextServicesMgr.make +++ b/Toolbox/TextServicesMgr/TextServicesMgr.make @@ -21,31 +21,18 @@ TextServicesMgrObjs = "{ObjDir}TSMExtension.a.o" ∂ Lib {StdLibOpts} -o "{Targ}" {TextServicesMgrObjs} -"{ObjDir}TSMExtension.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}TextServices.a" ∂ - "{IntAIncludes}TSMPrivate.a" ∂ - "{TextServicesDir}TSMExtension.a" +"{ObjDir}TSMExtension.a.o" ƒ "{TextServicesDir}TSMExtension.a" Asm {StdAOpts} -o "{Targ}" "{TextServicesDir}TSMExtension.a" -{ObjDir}TSMFunctions.c.o ƒ "{TextServicesDir}TSMFunctions.c" ∂ - "{CIncludes}Components.h" ∂ - "{IntCIncludes}TSMPrivate.h" ∂ - "{CIncludes}TextServices.h" +{ObjDir}TSMFunctions.c.o ƒ "{TextServicesDir}TSMFunctions.c" C {StdCOpts} -o "{Targ}" "{TextServicesDir}TSMFunctions.c" -"{ObjDir}TSMUtility.c.o" ƒ "{TextServicesDir}TSMUtility.c" ∂ - "{CIncludes}Script.h" ∂ - "{CIncludes}Components.h" ∂ - "{IntCIncludes}TSMPrivate.h" ∂ - "{CIncludes}TextServices.h" +"{ObjDir}TSMUtility.c.o" ƒ "{TextServicesDir}TSMUtility.c" C {StdCOpts} -o "{Targ}" "{TextServicesDir}TSMUtility.c" -"{ObjDir}TSMInternalUtils.c.o" ƒ "{TextServicesDir}TSMInternalUtils.c" ∂ - "{CIncludes}Components.h" ∂ - "{IntCIncludes}TSMPrivate.h" ∂ - "{CIncludes}TextServices.h" +"{ObjDir}TSMInternalUtils.c.o" ƒ "{TextServicesDir}TSMInternalUtils.c" C {StdCOpts} -o "{Targ}" "{TextServicesDir}TSMInternalUtils.c" diff --git a/Toolbox/ToolboxEventMgr/ToolboxEventMgr.make b/Toolbox/ToolboxEventMgr/ToolboxEventMgr.make --- a/Toolbox/ToolboxEventMgr/ToolboxEventMgr.make +++ b/Toolbox/ToolboxEventMgr/ToolboxEventMgr.make @@ -22,8 +22,5 @@ ToolboxEventMgrObjs = "{ObjDir}ToolboxEventMgr.a.o" ∂ Asm {StdAOpts} -o "{Targ}" "{ToolboxEventDir}ToolboxEventMgrPatches.a" -"{ObjDir}ToolboxEventMgr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{AIncludes}SCSI.a" ∂ - "{AIncludes}HardwareEqu.a" ∂ - "{ToolboxEventDir}ToolboxEventMgr.a" +"{ObjDir}ToolboxEventMgr.a.o" ƒ "{ToolboxEventDir}ToolboxEventMgr.a" Asm {StdAOpts} -o "{Targ}" "{ToolboxEventDir}ToolboxEventMgr.a" \ No newline at end of file diff --git a/Toolbox/WindowMgr/WindowMgr.make b/Toolbox/WindowMgr/WindowMgr.make --- a/Toolbox/WindowMgr/WindowMgr.make +++ b/Toolbox/WindowMgr/WindowMgr.make @@ -40,36 +40,17 @@ WindowMgrObjs = "{ObjDir}WindowMgr.a.o" ∂ C {StdCOpts} -o "{Targ}" "{WindowMgrDir}LayerMgr.c" -"{ObjDir}RoundedWDEF.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}ColorEqu.a" ∂ - "{WindowMgrDir}RoundedWDEF.a" +"{ObjDir}RoundedWDEF.a.o" ƒ "{WindowMgrDir}RoundedWDEF.a" Asm {StdAOpts} -o "{Targ}" "{WindowMgrDir}RoundedWDEF.a" -"{ObjDir}WindowMgr.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}ColorEqu.a" ∂ - "{IntAIncludes}ScriptPriv.a" ∂ - "{AIncludes}Palettes.a" ∂ - "{IntAIncludes}PalettePriv.a" ∂ - "{AIncludes}Balloons.a" ∂ - "{IntAIncludes}BalloonsPriv.a" ∂ - "{IntAIncludes}ControlPriv.a" ∂ - "{AIncludes}Displays.a" ∂ - "{IntAIncludes}DisplaysPriv.a" ∂ - "{WindowMgrDir}WindowMgr.a" +"{ObjDir}WindowMgr.a.o" ƒ "{WindowMgrDir}WindowMgr.a" Asm {StdAOpts} -o "{Targ}" "{WindowMgrDir}WindowMgr.a" -"{ObjDir}WindowMgrExtensions.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}LayerEqu.a" ∂ - "{AIncludes}Palettes.a" ∂ - "{IntAIncludes}PalettePriv.a" ∂ - "{IntAIncludes}LinkedPatchMacros.a" ∂ - "{WindowMgrDir}WindowMgrExtensions.a" +"{ObjDir}WindowMgrExtensions.a.o" ƒ "{WindowMgrDir}WindowMgrExtensions.a" Asm {StdAOpts} -o "{Targ}" "{WindowMgrDir}WindowMgrExtensions.a" -"{ObjDir}StandardWDEF.a.o" ƒ "{ObjDir}StandardEqu.d" ∂ - "{IntAIncludes}ColorEqu.a" ∂ - "{WindowMgrDir}StandardWDEF.a" +"{ObjDir}StandardWDEF.a.o" ƒ "{WindowMgrDir}StandardWDEF.a" Asm {StdAOpts} -o "{Targ}" "{WindowMgrDir}StandardWDEF.a"