Now references external copies of CCache and other libs

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11479 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 44 insertions, 76 deletions

diff --git a/src/mac/Makefile b/src/mac/Makefile
index 28c0e3782..d70f465c6 100644
--- a/src/mac/Makefile
+++ b/src/mac/Makefile
@@ -4,15 +4,11 @@
 
 root-folder											= ::
 mitsupportlib-root-folder							= {root-folder}:::MITSupportLib:
+mitkerberoslib-root-folder							= {root-folder}:
 makefile-name										= {root-folder}mac:Makefile
 
 library-output-folder								= {root-folder}bin:
 
-gss-krb5-library-name								= ¶"MIT GSS/Kerberos library¶"
-gss-krb5-library-output-folder						= {library-output-folder}
-gss-krb5-library-debug								= {gss-krb5-library-output-folder}{gss-krb5-library-name}{library-kind-debug}
-gss-krb5-library-final								= {gss-krb5-library-output-folder}{gss-krb5-library-name}{library-kind-final}
-
 library-platform-68K					= .68K
 library-platform-PPC					= .PPC
 
@@ -345,40 +341,55 @@ autogenerated-files = ¶
 
 ### The following variables are platform- or kind-specific, but constant
 
+clib-ppc-debug						= {mitsupportlib-root-folder}CLib:Binaries:CLib.PPC.debug
+clib-68k-debug						= {mitsupportlib-root-folder}CLib:Binaries:CLib.68K.debug
+clib-ppc-final						= {mitsupportlib-root-folder}CLib:Binaries:CLib.PPC
+clib-68k-final						= {mitsupportlib-root-folder}CLib:Binaries:CLib.68K
+
+runtimelib-ppc-debug				= {mitsupportlib-root-folder}RuntimeLib:Binaries:RuntimeLib.PPC.debug
+runtimelib-68k-debug				= {mitsupportlib-root-folder}RuntimeLib:Binaries:RuntimeLib.68K.debug
+runtimelib-ppc-final				= {mitsupportlib-root-folder}RuntimeLib:Binaries:RuntimeLib.PPC
+runtimelib-68k-final				= {mitsupportlib-root-folder}RuntimeLib:Binaries:RuntimeLib.68K
+
 standard-libraries-ppc-debug			= ¶
-	¶"{root-folder}:::MITSupportLib:CLib:Binaries:CLib.PPC.debug¶" ¶
-	¶"{root-folder}:::MITSupportLib:RuntimeLib:Binaries:RuntimeLib.PPC.debug¶" ¶
+	"{clib-ppc-debug}" ¶
+	"{runtimelib-ppc-debug}" ¶
 	¶"{MWPPCLibraries}MSL ShLibRuntime.Lib¶" ¶
 	¶"{SharedLibraries}InterfaceLib¶" ¶
 	¶"{SharedLibraries}MathLib¶"
 standard-libraries-68k-debug			= ¶
-	¶"{root-folder}:::MITSupportLib:CLib:Binaries:CLib.68K.debug¶" ¶
-	¶"{root-folder}:::MITSupportLib:RuntimeLib:Binaries:RuntimeLib.68K.debug¶" ¶
+	"{clib-68k-debug}" ¶
+	"{runtimelib-68k-debug}" ¶
 	¶"{MW68KLibraries}MSL ShLibRuntimeCFM68K.Lib¶" ¶
 	¶"{SharedLibraries}InterfaceLib¶" ¶
 	¶"{MW68KLibraries}MathLibCFM68K (4i_8d).Lib¶"
 standard-libraries-ppc-final			= ¶
-	¶"{root-folder}:::MITSupportLib:CLib:Binaries:CLib.PPC¶" ¶
-	¶"{root-folder}:::MITSupportLib:RuntimeLib:Binaries:RuntimeLib.PPC¶" ¶
+	"{clib-ppc-final}" ¶
+	"{runtimelib-ppc-final}" ¶
 	¶"{MWPPCLibraries}MSL ShLibRuntime.Lib¶" ¶
 	¶"{SharedLibraries}InterfaceLib¶" ¶
 	¶"{SharedLibraries}MathLib¶"
 standard-libraries-68k-final			= ¶
-	¶"{root-folder}:::MITSupportLib:CLib:Binaries:CLib.PPC¶" ¶
-	¶"{root-folder}:::MITSupportLib:RuntimeLib:Binaries:RuntimeLib.68K¶" ¶
+	"{clib-68k-final}" ¶
+	"{runtimelib-68k-final}" ¶
 	¶"{MW68KLibraries}MSL ShLibRuntimeCFM68K.Lib¶" ¶
 	¶"{SharedLibraries}InterfaceLib¶" ¶
 	¶"{MW68KLibraries}MathLibCFM68K (4i_8d).Lib¶"
 
-ccache-ppc-debug						= {root-folder}¶"mac:libraries:CCache API:bin:CCacheLib.PPC.debug¶"
-ccache-68k-debug						= {root-folder}¶"mac:libraries:CCache API:bin:CCacheLib.68K.debug¶"
-ccache-ppc-final						= {root-folder}¶"mac:libraries:CCache API:bin:CCacheLib.PPC¶"
-ccache-68k-final						= {root-folder}¶"mac:libraries:CCache API:bin:CCacheLib.68K¶"
+ccachelib-ppc-debug						= {mitkerberoslib-root-folder}CCacheLib:Binaries:CCacheLib.PPC.debug
+ccachelib-68k-debug						= {mitkerberoslib-root-folder}CCacheLib:Binaries:CCacheLib.68K.debug
+ccachelib-ppc-final						= {mitkerberoslib-root-folder}CCacheLib:Binaries:CCacheLib.PPC
+ccachelib-68k-final						= {mitkerberoslib-root-folder}CCacheLib:Binaries:CCacheLib.68K
+
+ccachelib-ppc-debug						= {root-folder}¶"mac:libraries:CCache API:bin:CCacheLib.PPC.debug¶"
+ccachelib-68k-debug						= {root-folder}¶"mac:libraries:CCache API:bin:CCacheLib.68K.debug¶"
+ccachelib-ppc-final						= {root-folder}¶"mac:libraries:CCache API:bin:CCacheLib.PPC¶"
+ccachelib-68k-final						= {root-folder}¶"mac:libraries:CCache API:bin:CCacheLib.68K¶"
 
-sockets-ppc-debug						= {mitsupportlib-root-folder}SocketsLib:Binaries:SocketsLib.PPC.debug
-sockets-68k-debug						= {mitsupportlib-root-folder}SocketsLib:Binaries:SocketsLib.68K.debug
-sockets-ppc-final						= {mitsupportlib-root-folder}SocketsLib:Binaries:SocketsLib.PPC
-sockets-68k-final						= {mitsupportlib-root-folder}SocketsLib:Binaries:SocketsLib.68K
+socketslib-ppc-debug					= {mitsupportlib-root-folder}SocketsLib:Binaries:SocketsLib.PPC.debug
+socketslib-68k-debug					= {mitsupportlib-root-folder}SocketsLib:Binaries:SocketsLib.68K.debug
+socketslib-ppc-final					= {mitsupportlib-root-folder}SocketsLib:Binaries:SocketsLib.PPC
+socketslib-68k-final					= {mitsupportlib-root-folder}SocketsLib:Binaries:SocketsLib.68K
 
 errorlib-ppc-debug						= {mitsupportlib-root-folder}ErrorLib:Binaries:ErrorLib.PPC.debug
 errorlib-68k-debug						= {mitsupportlib-root-folder}ErrorLib:Binaries:ErrorLib.68K.debug
@@ -407,44 +418,44 @@ gss-library-libraries-68k-final = ¶
 
 krb5-library-libraries-ppc-debug = ¶
 	{standard-libraries-ppc-debug} ¶
-	{ccache-ppc-debug} ¶
-	{sockets-ppc-debug} ¶
+	{ccachelib-ppc-debug} ¶
+	{socketslib-ppc-debug} ¶
 	{errorlib-ppc-debug} ¶
 	{krb5-globals-library-output-folder}{krb5-globals-library-name}{library-platform-ppc}{library-kind-debug}
 krb5-library-libraries-68k-debug = ¶
 	{standard-libraries-68k-debug} ¶
-	{ccache-68k-debug} ¶
-	{sockets-68k-debug} ¶
+	{ccachelib-68k-debug} ¶
+	{socketslib-68k-debug} ¶
 	{errorlib-68k-debug} ¶
 	{krb5-globals-library-output-folder}{krb5-globals-library-name}{library-platform-68k}{library-kind-debug}
 krb5-library-libraries-ppc-final = ¶
 	{standard-libraries-ppc-final} ¶
-	{ccache-ppc-final} ¶
-	{sockets-ppc-final} ¶
+	{ccachelib-ppc-final} ¶
+	{socketslib-ppc-final} ¶
 	{errorlib-ppc-final} ¶
 	{krb5-globals-library-output-folder}{krb5-globals-library-name}{library-platform-ppc}{library-kind-final}
 krb5-library-libraries-68k-final = ¶
 	{standard-libraries-68k-final} ¶
-	{ccache-68k-final} ¶
-	{sockets-68k-final} ¶
+	{ccachelib-68k-final} ¶
+	{socketslib-68k-final} ¶
 	{errorlib-68k-final} ¶
 	{krb5-globals-library-output-folder}{krb5-globals-library-name}{library-platform-68k}{library-kind-final}
 
 krb5-globals-library-libraries-ppc-debug = ¶
 	{standard-libraries-ppc-debug} ¶
-	{ccache-ppc-debug} ¶
+	{ccachelib-ppc-debug} ¶
 	{krb5-globals-data-library-output-folder}{krb5-globals-data-library-name}{library-platform-ppc}
 krb5-globals-library-libraries-68k-debug = ¶
 	{standard-libraries-68k-debug} ¶
-	{ccache-68k-debug} ¶
+	{ccachelib-68k-debug} ¶
 	{krb5-globals-data-library-output-folder}{krb5-globals-data-library-name}{library-platform-68k}
 krb5-globals-library-libraries-ppc-final = ¶
 	{standard-libraries-ppc-final} ¶
-	{ccache-ppc-final} ¶
+	{ccachelib-ppc-final} ¶
 	{krb5-globals-data-library-output-folder}{krb5-globals-data-library-name}{library-platform-ppc}
 krb5-globals-library-libraries-68k-final = ¶
 	{standard-libraries-68k-final} ¶
-	{ccache-68k-final} ¶
+	{ccachelib-68k-final} ¶
 	{krb5-globals-data-library-output-folder}{krb5-globals-data-library-name}{library-platform-68k}
 	
 krb5-globals-data-library-libraries-ppc = ¶"{MWPPCLibraries}MSL RuntimePPC.Lib¶"
@@ -930,49 +941,6 @@ glue-krb5 Ä {krb5-library-glue-output}
 	{root-folder}mac:GSS.moreCFMglue.cin | Catenate > {gss-library-glue-output}
 
 ##############################################################################################################
-###			Building the library files from multiple fragments
-##############################################################################################################
-
-gss-krb5-library-final-fragment-list = ¶
-	{gss-library-output-folder}{gss-library-name}{library-platform-ppc}{library-kind-final} ¶
-	{gss-library-output-folder}{gss-library-name}{library-platform-68k}{library-kind-final} ¶
-	{krb5-library-output-folder}{krb5-library-name}{library-platform-ppc}{library-kind-final} ¶
-	{krb5-library-output-folder}{krb5-library-name}{library-platform-68k}{library-kind-final} ¶
-	{krb5-globals-library-output-folder}{krb5-globals-library-name}{library-platform-ppc}{library-kind-final} ¶
-	{krb5-globals-library-output-folder}{krb5-globals-library-name}{library-platform-68k}{library-kind-final} ¶
-	{krb5-globals-data-library-output-folder}{krb5-globals-data-library-name}{library-platform-ppc} ¶
-	{krb5-globals-data-library-output-folder}{krb5-globals-data-library-name}{library-platform-68k} ¶
-	{ccache-ppc-final} ¶
-	{ccache-68k-final}
-	
-gss-krb5-library-debug-fragment-list = ¶
-	{gss-library-output-folder}{gss-library-name}{library-platform-ppc}{library-kind-debug} ¶
-	{gss-library-output-folder}{gss-library-name}{library-platform-68k}{library-kind-debug} ¶
-	{krb5-library-output-folder}{krb5-library-name}{library-platform-ppc}{library-kind-debug} ¶
-	{krb5-library-output-folder}{krb5-library-name}{library-platform-68k}{library-kind-debug} ¶
-	{krb5-globals-library-output-folder}{krb5-globals-library-name}{library-platform-ppc}{library-kind-debug} ¶
-	{krb5-globals-library-output-folder}{krb5-globals-library-name}{library-platform-68k}{library-kind-debug} ¶
-	{krb5-globals-data-library-output-folder}{krb5-globals-data-library-name}{library-platform-ppc} ¶
-	{krb5-globals-data-library-output-folder}{krb5-globals-data-library-name}{library-platform-68k} ¶
-	{ccache-ppc-debug} ¶
-	{ccache-68k-debug}
-
-gss-krb5-library-final Ä all-final
-	Make -d fragments="{gss-krb5-library-final-fragment-list}" -d target="{gss-krb5-library-final}" gss-krb5-library > {make-output}
-	{make-output}
-
-gss-krb5-library-debug Ä all-debug
-	Make -d fragments="{gss-krb5-library-debug-fragment-list}" -d target="{gss-krb5-library-debug}" gss-krb5-library > {make-output}
-	{make-output}
-
-gss-krb5-library Ä
-	Delete -i {target}
-	Rez "{root-folder}mac:version.r" -a -o {target}
-	MergeFragment -x -z {fragments} {target}
-	SetFile {target} -c gss-krb5-library-creator -t 'shlb'
-	DeRez -only "'cfrg'(0)" {target} "{RIncludes}"CodeFragments.r | StreamEdit -s {root-folder}FragmentAlias.mpw | Rez -a -o {target} -i "{RIncludes}"
-
-##############################################################################################################
 ###			Clean target deletes all generated files
 ##############################################################################################################