Added k5 globals libs

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

1 files changed, 103 insertions, 48 deletions

diff --git a/src/mac/Makefile.tmpl b/src/mac/Makefile.tmpl
index cbdaca5b2..92d829d37 100644
--- a/src/mac/Makefile.tmpl
+++ b/src/mac/Makefile.tmpl
@@ -1,6 +1,6 @@
 snapshot-root = //GSS-Kerberos5-1.1
 
-include-paths = {autogenerated-include-paths} -i /mac/TestTrack/ -i "/mac/libraries/CCache API/include/"
+include-paths = {autogenerated-include-paths} -i /mac/TestTrack/ -i "/mac/libraries/CCache API/include/" -i "/mac/libraries/Kerberos v5 Globals"
 
 ################################################################################
 ##
@@ -213,61 +213,43 @@ kerberos-headers-ppc		= {kerberos-headers-root}KerberosHeadersPPC
 ##
 ################################################################################
 
-libraries-gss-cfm68k = \
+standard-libraries-cfm68k = \
 	"/bin/MIT CLib.68K" \
 	"/bin/MIT RuntimeLib.68K" \
 	"{MW68KLibraries}MSL ShLibRuntimeCFM68K.Lib" \
 	"{SharedLibraries}InterfaceLib" \
 	"{MW68KLibraries}MathLibCFM68K (4i_8d).Lib"
 
-libraries-gss-ppc = \
+standard-libraries-ppc = \
 	"/bin/MIT CLib.PPC" \
 	"/bin/MIT RuntimeLib.PPC" \
 	"{MWPPCLibraries}MSL ShLibRuntime.Lib" \
 	"{SharedLibraries}InterfaceLib" \
 	"{SharedLibraries}MathLib"
 
-libraries-krb5-cfm68k = \
-	"/bin/MIT CLib.68K" \
-	"/bin/MIT RuntimeLib.68K" \
-	"{MW68KLibraries}MSL ShLibRuntimeCFM68K.Lib" \
-	"{SharedLibraries}InterfaceLib" \
-	"{MW68KLibraries}MathLibCFM68K (4i_8d).Lib"
-	
-libraries-krb5-ppc = \
-	"/bin/MIT CLib.PPC" \
-	"/bin/MIT RuntimeLib.PPC" \
-	"{MWPPCLibraries}MSL ShLibRuntime.Lib" \
-	"{SharedLibraries}InterfaceLib" \
-	"{SharedLibraries}MathLib"
-
-libraries-gss-cfm68k-debug = \
+standard-libraries-cfm68k-debug = \
 	"/bin/MIT CLib.68K.debug" \
 	"/bin/MIT RuntimeLib.68K.debug" \
 	"{MW68KLibraries}MSL ShLibRuntimeCFM68K.Lib" \
 	"{SharedLibraries}InterfaceLib" \
 	"{MW68KLibraries}MathLibCFM68K (4i_8d).Lib"
 
-libraries-gss-ppc-debug = \
+standard-libraries-ppc-debug = \
 	"/bin/MIT CLib.PPC.debug" \
 	"/bin/MIT RuntimeLib.PPC.debug" \
 	"{MWPPCLibraries}MSL ShLibRuntime.Lib" \
 	"{SharedLibraries}InterfaceLib" \
 	"{SharedLibraries}MathLib"
 
-libraries-krb5-cfm68k-debug = \
-	"/bin/MIT CLib.68K.debug" \
-	"/bin/MIT RuntimeLib.68K.debug" \
-	"{MW68KLibraries}MSL ShLibRuntimeCFM68K.Lib" \
-	"{SharedLibraries}InterfaceLib" \
-	"{MW68KLibraries}MathLibCFM68K (4i_8d).Lib"
-	
-libraries-krb5-ppc-debug = \
-	"/bin/MIT CLib.PPC.debug" \
-	"/bin/MIT RuntimeLib.PPC.debug" \
-	"{MWPPCLibraries}MSL ShLibRuntime.Lib" \
-	"{SharedLibraries}InterfaceLib" \
-	"{SharedLibraries}MathLib"
+libraries-gss-ppc = {standard-libraries-ppc}
+libraries-gss-cfm68k = {standard-libraries-cfm68k}
+libraries-gss-cfm68k-debug = {standard-libraries-cfm68k-debug}
+libraries-gss-ppc-debug = {standard-libraries-ppc-debug}
+
+libraries-krb5-ppc = {standard-libraries-ppc}
+libraries-krb5-cfm68k = {standard-libraries-cfm68k}
+libraries-krb5-ppc-debug = {standard-libraries-ppc-debug}
+libraries-krb5-cfm68k-debug = {standard-libraries-cfm68k-debug}
 
 ################################################################################
 ##
@@ -292,21 +274,21 @@ linker-options-krb5 = \
 ################################################################################
 
 ccache-cfm68K = \
-	"/mac/libraries/CCache API/bin/CCacheLib.68K" \
-	"/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K"
+	"/mac/libraries/CCache API/bin/CCacheLib.68K"
+#	"/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K"
 
 ccache-ppc = \
-	"/mac/libraries/CCache API/bin/CCacheLib.PPC" \
-	"/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC"
+	"/mac/libraries/CCache API/bin/CCacheLib.PPC"
+#	"/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC"
 
 ccache-cfm68K-debug = \
-	"/mac/libraries/CCache API/bin/CCacheLib.68K.debug" \
-	"/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K"
+	"/mac/libraries/CCache API/bin/CCacheLib.68K.debug"
+#	"/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K"
 
 ccache-ppc-debug = \
-	"/mac/libraries/CCache API/bin/CCacheLib.PPC.debug" \
-	"/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC"
-
+	"/mac/libraries/CCache API/bin/CCacheLib.PPC.debug"
+#	"/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC"
+	
 ################################################################################
 ##
 ## General rules
@@ -336,6 +318,80 @@ compile-ppc : {autogenerated-files} {gss-obj-ppc} {krb5-obj-ppc}
 
 ################################################################################
 ##
+## Kerberos v5 globals library (code and data)
+##
+################################################################################
+
+krb5-globals : Kerberos5GlobalsLib.PPC Kerberos5GlobalsLib.PPC.debug
+
+#
+
+krb5-globals-ppc = \
+	Kerberos5GlobalsLib.PPC
+	
+krb5-globals-ppc-debug = \
+	Kerberos5GlobalsLib.PPC.debug
+
+krb5-globals-src = \
+	"/mac/libraries/Kerberos v5 Globals/Krb5Globals.c"
+
+krb5-globals-obj-ppc = \
+	"/bin/PPC/Krb5Globals.c.PPC.o" \
+	"/bin/PPC/Krb5Globals.CFM.c.PPC.o"
+
+krb5-globals-data-obj-ppc = \
+	"/bin/PPC/Krb5GlobalsData.c.PPC.o"
+	
+krb5-globals-data-ppc = \
+	Kerberos5GlobalsDataLib.PPC
+
+#
+#	compilation rules
+#
+
+/bin/PPC/Krb5Globals.c.PPC.o : "/mac/libraries/Kerberos v5 Globals/Krb5Globals.c"
+	MWCPPC {compiler-options} -o /bin/PPC/Krb5Globals.c.PPC.o "/mac/libraries/Kerberos v5 Globals/Krb5Globals.c"
+/bin/PPC/Krb5Globals.CFM.c.PPC.o : "/mac/libraries/Kerberos v5 Globals/Krb5Globals.CFM.c"
+	MWCPPC {compiler-options} -o /bin/PPC/Krb5Globals.CFM.c.PPC.o "/mac/libraries/Kerberos v5 Globals/Krb5Globals.CFM.c"
+
+/bin/PPC/Krb5GlobalsData.c.PPC.o : "/mac/libraries/Kerberos v5 Globals/Krb5GlobalsData.c"
+	MWCPPC {compiler-options} -o /bin/PPC/Krb5GlobalsData.c.PPC.o "/mac/libraries/Kerberos v5 Globals/Krb5GlobalsData.c"
+
+#
+#	shared PPC v5 globals code library
+#
+	
+Kerberos5GlobalsLib.PPC Krb5GlobalsLib.PPC.MAP :: "/mac/libraries/Kerberos v5 Globals/Krb5Globals.exp" {krb5-globals-obj-ppc} {krb5-globals-data-ppc}
+	MWLinkPPC -sharedlibrary -name Krb5GlobalsLib.PPC -m "" \
+		-@export "/mac/libraries/Kerberos v5 Globals/Krb5Globals.exp" -sym on \
+		-init "__initialize_Kerberos5GlobalsLib" \
+		-term "__terminate_Kerberos5GlobalsLib" \
+		-map Krb5GlobalsLib.PPC.MAP -o Kerberos5GlobalsLib.PPC \
+		{krb5-globals-obj-ppc} {standard-libraries-ppc} {ccache-ppc} {krb5-globals-data-ppc}
+
+Kerberos5GlobalsLib.PPC.debug Krb5GlobalsLib.PPC.debug.MAP :: "/mac/libraries/Kerberos v5 Globals/Krb5Globals.exp" {krb5-globals-obj-ppc} {krb5-globals-data-ppc}
+	MWLinkPPC -sharedlibrary -name Krb5GlobalsLib.PPC.debug -m "" \
+		-@export "/mac/libraries/Kerberos v5 Globals/Krb5Globals.exp" -sym on \
+		-init "__initialize_Kerberos5GlobalsLib" \
+		-term "__terminate_Kerberos5GlobalsLib" \
+		-map Krb5GlobalsLib.PPC.debug.MAP -o Kerberos5GlobalsLib.PPC.debug \
+		{krb5-globals-obj-ppc} {standard-libraries-ppc} {ccache-ppc} {krb5-globals-data-ppc}
+
+#
+#	shared PPC v5 globals data library
+#
+	
+Kerberos5GlobalsDataLib.PPC Krb5GlobalDataLib.PPC.MAP :: "/mac/libraries/Kerberos v5 Globals/Krb5GlobalsData.exp" {krb5-globals-data-obj-ppc}
+	MWLinkPPC -sharedlibrary -name Krb5GlobalsDataLib.PPC -m "" \
+		-@export "/mac/libraries/Kerberos v5 Globals/Krb5GlobalsData.exp" -sym on \
+		-init "__initialize" \
+		-term "__terminate" \
+		-map Krb5GlobalsDataLib.PPC.MAP -o Kerberos5GlobalsDataLib.PPC \
+		{krb5-globals-data-obj-ppc} {ccache-ppc} \
+		"{MWPPCLibraries}MSL RuntimePPC.Lib"
+
+################################################################################
+##
 ## Shared library initialization routines and TestTrack
 ##
 ################################################################################
@@ -402,7 +458,7 @@ Kerberos5Lib.68K Kerberos5Lib.68K.MAP :: {autogenerated-files} /mac/K5Library.ex
 		-init "__initializeK5" -term "__terminateK5" \
 		-weakimport /mac/TestTrack/MITAthenaLib -initbefore "MIT_*TestTrackLib" \
 		-cv 1 -uv 1 \
-		{libraries-krb5-cfm68k} {krb5-obj-cfm68k} {cfm-krb5-obj-cfm68k} {testtrack-obj-cfm68k} {ccache-cfm68k}
+		{libraries-krb5-cfm68k} {krb5-obj-cfm68k} {cfm-krb5-obj-cfm68k} {ccache-cfm68k}
 Kerberos5Lib.68K :: /mac/version.r
 	Rez "/mac/version.r" -a -o Kerberos5Lib.68K
 
@@ -413,7 +469,7 @@ Kerberos5Lib.68K.debug Kerberos5Lib.68K.debug.MAP :: {autogenerated-files} /mac/
 		-init "__initializeK5" -term "__terminateK5" \
 		-weakimport /mac/TestTrack/MITAthenaLib -initbefore "MIT_*TestTrackLib" \
 		-cv 1 -uv 1 \
-		{libraries-krb5-cfm68k-debug} {krb5-obj-cfm68k} {cfm-krb5-obj-cfm68k} {testtrack-obj-cfm68k} {ccache-cfm68k-debug}
+		{libraries-krb5-cfm68k-debug} {krb5-obj-cfm68k} {cfm-krb5-obj-cfm68k} {ccache-cfm68k-debug}
 Kerberos5Lib.68K.debug :: /mac/version.r
 	Rez "/mac/version.r" -a -o Kerberos5Lib.68K.debug
 
@@ -459,10 +515,9 @@ Kerberos5Lib.PPC Kerberos5Lib.PPC.MAP :: {autogenerated-files}  /mac/K5Library.e
 	MWLinkPPC -sharedlibrary -name K5Library -m "" \
 		-@export "/mac/K5Library.exp" -sym on -init "__initializeK5" \
 		-term "__terminateK5" \
-		-weakimport /mac/TestTrack/MITAthenaLib -initbefore "MIT_*TestTrackLib" \
 		-map K5LibraryPPC.MAP -o Kerberos5Lib.PPC \
 		-cv 1 -uv 1 \
-		{libraries-krb5-ppc} {krb5-obj-ppc} {cfm-krb5-obj-ppc} {testtrack-obj-ppc} {ccache-ppc}
+		{libraries-krb5-ppc} {krb5-obj-ppc} {cfm-krb5-obj-ppc} {ccache-ppc} {krb5-globals-ppc}
 Kerberos5Lib.PPC :: /mac/version.r
 	Rez "/mac/version.r" -a -o Kerberos5Lib.PPC
 
@@ -470,10 +525,9 @@ Kerberos5Lib.PPC.debug Kerberos5Lib.PPC.debug.MAP :: {autogenerated-files}  /mac
 	MWLinkPPC -sharedlibrary -name "MIT_*Kerberos5Lib.debug" -m "" \
 		-@export "/mac/K5Library.exp" -sym on -init "__initializeK5" \
 		-term "__terminateK5" \
-		-weakimport /mac/TestTrack/MITAthenaLib -initbefore "MIT_*TestTrackLib" \
 		-map K5LibraryPPC.debug.MAP -o Kerberos5Lib.PPC.debug \
 		-cv 1 -uv 1 \
-		{libraries-krb5-ppc-debug} {krb5-obj-ppc} {cfm-krb5-obj-ppc} {testtrack-obj-ppc} {ccache-ppc-debug}
+		{libraries-krb5-ppc-debug} {krb5-obj-ppc} {cfm-krb5-obj-ppc} {ccache-ppc-debug} {krb5-globals-ppc-debug}
 Kerberos5Lib.PPC.debug :: /mac/version.r
 	Rez "/mac/version.r" -a -o Kerberos5Lib.PPC.debug
 
@@ -560,7 +614,8 @@ clean : autogenerate-clean glue-clean
 		{krb5-obj-cfm68k} {krb5-obj-ppc} \
 		{kerberos-headers-cfm68k} {kerberos-headers-ppc} \
 		{cfm-gss-obj-cfm68k} {cfm-gss-obj-ppc} \
-		{cfm-krb5-obj-cfm68k} {cfm-krb5-obj-ppc}
+		{cfm-krb5-obj-cfm68k} {cfm-krb5-obj-ppc} 
+		{krb5-globals-obj-ppc} {krb5-globals-data-obj-ppc}
 
 # This target also punts everything that gets created in other ways during normal
 # build process (CW files etc)