CFM68K builds are back

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

1 files changed, 84 insertions, 24 deletions

diff --git a/src/mac/Makefile.tmpl b/src/mac/Makefile.tmpl
index 879990940..2e4167e52 100644
--- a/src/mac/Makefile.tmpl
+++ b/src/mac/Makefile.tmpl
@@ -322,7 +322,8 @@ compile-ppc : {autogenerated-files} {gss-obj-ppc} {krb5-obj-ppc}
 ##
 ################################################################################
 
-krb5-globals : Kerberos5GlobalsLib.PPC Kerberos5GlobalsLib.PPC.debug
+krb5-globals : Kerberos5GlobalsLib.PPC Kerberos5GlobalsLib.PPC.debug \
+	Kerberos5GlobalsLib.68K Kerberos5GlobalsLib.68K.debug
 
 #
 
@@ -332,6 +333,12 @@ krb5-globals-ppc = \
 krb5-globals-ppc-debug = \
 	Kerberos5GlobalsLib.PPC.debug
 
+krb5-globals-68k = \
+	Kerberos5GlobalsLib.68K
+	
+krb5-globals-68k-debug = \
+	Kerberos5GlobalsLib.68K.debug
+
 krb5-globals-src = \
 	"/mac/libraries/Kerberos v5 Globals/Krb5Globals.c"
 
@@ -345,6 +352,16 @@ krb5-globals-data-obj-ppc = \
 krb5-globals-data-ppc = \
 	Kerberos5GlobalsDataLib.PPC
 
+krb5-globals-obj-68K = \
+	"/bin/CFM-68K/Krb5Globals.c.68K.o" \
+	"/bin/CFM-68K/Krb5Globals.CFM.c.68K.o"
+
+krb5-globals-data-obj-68k = \
+	"/bin/CFM-68K/Krb5GlobalsData.c.68K.o"
+	
+krb5-globals-data-68k = \
+	Kerberos5GlobalsDataLib.68K
+
 krb5-globals-files = \
 	"/mac/libraries/Kerberos v5 Globals/Krb5Globals.c" \
 	"/mac/libraries/Kerberos v5 Globals/Krb5Globals.CFM.c" \
@@ -367,6 +384,14 @@ krb5-globals-files = \
 /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"
 
+/bin/CFM-68K/Krb5Globals.c.68K.o : "/mac/libraries/Kerberos v5 Globals/Krb5Globals.c"
+	MWC68K {compiler-options} -model cfmflat -o /bin/CFM-68K/Krb5Globals.c.68K.o "/mac/libraries/Kerberos v5 Globals/Krb5Globals.c"
+/bin/CFM-68K/Krb5Globals.CFM.c.68K.o : "/mac/libraries/Kerberos v5 Globals/Krb5Globals.CFM.c"
+	MWC68K {compiler-options} -model cfmflat -o /bin/CFM-68K/Krb5Globals.CFM.c.68K.o "/mac/libraries/Kerberos v5 Globals/Krb5Globals.CFM.c"
+
+/bin/CFM-68K/Krb5GlobalsData.c.68K.o : "/mac/libraries/Kerberos v5 Globals/Krb5GlobalsData.c"
+	MWC68K {compiler-options} -model cfmflat -o /bin/CFM-68K/Krb5GlobalsData.c.68K.o "/mac/libraries/Kerberos v5 Globals/Krb5GlobalsData.c"
+
 #
 #	shared PPC v5 globals code library
 #
@@ -401,6 +426,40 @@ Kerberos5GlobalsDataLib.PPC Krb5GlobalDataLib.PPC.MAP :: "/mac/libraries/Kerbero
 		{krb5-globals-data-obj-ppc} {ccache-ppc} \
 		"{MWPPCLibraries}MSL RuntimePPC.Lib"
 
+#
+#	shared 68K v5 globals code library
+#
+	
+Kerberos5GlobalsLib.68K Krb5GlobalsLib.68K.MAP :: "/mac/libraries/Kerberos v5 Globals/Krb5Globals.exp" {krb5-globals-obj-68k} {krb5-globals-data-68k}
+	MWLink68K -sharedlibrary -name "MIT_*Krb5GlobalsLib" -m "" \
+		-@export "/mac/libraries/Kerberos v5 Globals/Krb5Globals.exp" -sym on \
+		-init "__initialize_Kerberos5GlobalsLib" \
+		-term "__terminate_Kerberos5GlobalsLib" \
+		-map Krb5GlobalsLib.68K.MAP -o Kerberos5GlobalsLib.68K \
+		{krb5-globals-obj-68k} {standard-libraries-cfm68k} {ccache-cfm68k} {krb5-globals-data-68k}
+
+Kerberos5GlobalsLib.68K.debug Krb5GlobalsLib.68K.debug.MAP :: "/mac/libraries/Kerberos v5 Globals/Krb5Globals.exp" {krb5-globals-obj-68k} {krb5-globals-data-68k}
+	MWLink68K -sharedlibrary -name "MIT_*Krb5GlobalsLib.debug" -m "" \
+		-@export "/mac/libraries/Kerberos v5 Globals/Krb5Globals.exp" -sym on \
+		-init "__initialize_Kerberos5GlobalsLib" \
+		-term "__terminate_Kerberos5GlobalsLib" \
+		-map Krb5GlobalsLib.68K.debug.MAP -o Kerberos5GlobalsLib.68K.debug \
+		{krb5-globals-obj-68k} {standard-libraries-cfm68k-debug} {ccache-cfm68k-debug} {krb5-globals-data-68k}
+
+#
+#	shared 68K v5 globals data library
+#
+	
+Kerberos5GlobalsDataLib.68K Krb5GlobalDataLib.68K.MAP :: "/mac/libraries/Kerberos v5 Globals/Krb5GlobalsData.exp" {krb5-globals-data-obj-68k}
+	MWLink68K -sharedlibrary -name "MIT_*Krb5GlobalsDataLib" -m "" \
+		-@export "/mac/libraries/Kerberos v5 Globals/Krb5GlobalsData.exp" -sym on \
+		-init "__initialize" \
+		-term "__terminate" \
+		-sharedata \
+		-map Krb5GlobalsDataLib.68K.MAP -o Kerberos5GlobalsDataLib.68K \
+		{krb5-globals-data-obj-68k} {ccache-cfm68k} \
+		"{MW68KLibraries}MSL MWCFM68KRuntime.Lib"
+
 ################################################################################
 ##
 ## Shared library initialization routines and TestTrack
@@ -442,10 +501,8 @@ compile-testtrack : {testtrack-obj-cfm68k} {testtrack-obj-ppc}
 ## Linking
 ##
 ################################################################################
-# link : link-cfm68k link-ppc link-fat
-# link-debug : link-cfm68k-debug link-ppc-debug link-fat-debug
-link : link-ppc link-fat
-link-debug : link-ppc-debug link-fat-debug
+link : link-cfm68k link-ppc link-fat
+link-debug : link-cfm68k-debug link-ppc-debug link-fat-debug
 link-all : link link-debug
 
 ################################################################################
@@ -462,25 +519,25 @@ link-cmf68k-all : link-cfm68k link-cfm68k-debug
 #	shared CFM-68K krb5 library
 #
 	
-Kerberos5Lib.68K Kerberos5Lib.68K.MAP :: {autogenerated-files} /mac/K5Library.exp {libraries-krb5-cfm68k} {krb5-obj-cfm68k} {cfm-krb5-obj-cfm68k} {testtrack-obj-cfm68k} {ccache-cfm68k}
+Kerberos5Lib.68K Kerberos5Lib.68K.MAP :: {autogenerated-files} /mac/K5Library.exp {libraries-krb5-cfm68k} {krb5-obj-cfm68k} {cfm-krb5-obj-cfm68k} {testtrack-obj-cfm68k} {ccache-cfm68k} {krb5-globals-68k}
 	MWLink68K -xm sharedlibrary -name K5Library -m "" \
 		-model cfmflat -@export "/mac/K5Library.exp" -sym off \
 		-map Kerberos5Lib.68K.MAP -o Kerberos5Lib.68K \
 		-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} {ccache-cfm68k}
+		{libraries-krb5-cfm68k} {krb5-obj-cfm68k} {cfm-krb5-obj-cfm68k} {ccache-cfm68k} {krb5-globals-68k}
 Kerberos5Lib.68K :: /mac/version.r
 	Rez "/mac/version.r" -a -o Kerberos5Lib.68K
 
-Kerberos5Lib.68K.debug Kerberos5Lib.68K.debug.MAP :: {autogenerated-files} /mac/K5Library.exp {libraries-krb5-cfm68k} {krb5-obj-cfm68k} {cfm-krb5-obj-cfm68k} {testtrack-obj-cfm68k} {ccache-cfm68k-debug}
+Kerberos5Lib.68K.debug Kerberos5Lib.68K.debug.MAP :: {autogenerated-files} /mac/K5Library.exp {libraries-krb5-cfm68k} {krb5-obj-cfm68k} {cfm-krb5-obj-cfm68k} {testtrack-obj-cfm68k} {ccache-cfm68k-debug} {krb5-globals-68k-debug}
 	MWLink68K -xm sharedlibrary -name "MIT_*Kerberos5Lib.debug" -m "" \
 		-model cfmflat -@export "/mac/K5Library.exp" -sym off \
 		-map Kerberos5Lib.68K.MAP -o Kerberos5Lib.68K.debug \
 		-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} {ccache-cfm68k-debug}
+		{libraries-krb5-cfm68k-debug} {krb5-obj-cfm68k} {cfm-krb5-obj-cfm68k} {ccache-cfm68k-debug} {krb5-globals-68k-debug}
 Kerberos5Lib.68K.debug :: /mac/version.r
 	Rez "/mac/version.r" -a -o Kerberos5Lib.68K.debug
 
@@ -569,7 +626,6 @@ GSSLib.PPC.debug :: /mac/version.r
 ## Fat libraries
 ##
 ################################################################################
-# fixme/ not really fat, just ppc
 
 link-fat : GSSLib
 link-fat-debug : GSSLib.debug
@@ -578,19 +634,21 @@ link-fat-all :Êlink-fat link-fat-debug
 GSSLib : GSSLib.PPC Kerberos5Lib.PPC {ccache-ppc} # GSSLib.68K Kerberos5Lib.68K {ccache-cfm68k}
 	Delete -i GSSLib
 	Duplicate -y GSSLib.PPC GSSLib
-#	MergeFragment GSSLib.68K GSSLib
+	MergeFragment GSSLib.68K GSSLib
 	MergeFragment "/bin/MIT CLib.PPC" GSSLib
 	MergeFragment "/bin/MIT RuntimeLib.PPC" GSSLib
 	MergeFragment Kerberos5Lib.PPC GSSLib
-#	MergeFragment Kerberos5Lib.68K GSSLib
-#	MergeFragment "/bin/MIT CLib.68K" GSSLib
-#	MergeFragment "/bin/MIT RuntimeLib.68K" GSSLib
-#	MergeFragment "/mac/libraries/CCache API/bin/CCacheLib.68K" GSSLib
-#	MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K" GSSLib
+	MergeFragment Kerberos5Lib.68K GSSLib
+	MergeFragment "/bin/MIT CLib.68K" GSSLib
+	MergeFragment "/bin/MIT RuntimeLib.68K" GSSLib
+	MergeFragment "/mac/libraries/CCache API/bin/CCacheLib.68K" GSSLib
+	MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K" GSSLib
 	MergeFragment "/mac/libraries/CCache API/bin/CCacheLib.PPC" GSSLib
 	MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC" GSSLib
-#	MergeFragment "/mac/libraries/DES/bin/deslib.68K" GSSLib
+	MergeFragment "/mac/libraries/DES/bin/deslib.68K" GSSLib
 	MergeFragment "/mac/libraries/DES/bin/deslib.PPC" GSSLib
+	MergeFragment "Kerberos5GlobalsLib.68K" GSSLib
+	MergeFragment "Kerberos5GlobalsDataLib.68K" GSSLib
 	MergeFragment "Kerberos5GlobalsLib.PPC" GSSLib
 	MergeFragment "Kerberos5GlobalsDataLib.PPC" GSSLib
 	DeRez -only "'cfrg'(0)" GSSLib "{RIncludes}"CodeFragments.r | StreamEdit -s /mac/FragmentAlias.mpw | Rez -a -o GSSLib -i "{RIncludes}"
@@ -599,21 +657,23 @@ GSSLib : GSSLib.PPC Kerberos5Lib.PPC {ccache-ppc} # GSSLib.68K Kerberos5Lib.68K
 GSSLib.debug : GSSLib.PPC.debug Kerberos5Lib.PPC.debug {ccache-ppc-debug} # GSSLib.68K.debug Kerberos5Lib.68K.debug {ccache-cfm68k-debug}
 	Delete -i GSSLib.debug
 	Duplicate -y GSSLib.PPC.debug GSSLib.debug
-#	MergeFragment GSSLib.68K.debug GSSLib.debug
+	MergeFragment GSSLib.68K.debug GSSLib.debug
 	MergeFragment "/bin/MIT CLib.PPC.debug" GSSLib.debug
 	MergeFragment "/bin/MIT RuntimeLib.PPC.debug" GSSLib.debug
 	MergeFragment Kerberos5Lib.PPC.debug GSSLib.debug
-#	MergeFragment Kerberos5Lib.68K.debug GSSLib.debug
-#	MergeFragment "/bin/MIT CLib.68K" GSSLib.debug
-#	MergeFragment "/bin/MIT RuntimeLib.68K" GSSLib.debug
-#	MergeFragment "/mac/libraries/CCache API/bin/CCacheLib.68K.debug" GSSLib.debug
-#	MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K" GSSLib.debug
+	MergeFragment Kerberos5Lib.68K.debug GSSLib.debug
+	MergeFragment "/bin/MIT CLib.68K" GSSLib.debug
+	MergeFragment "/bin/MIT RuntimeLib.68K" GSSLib.debug
+	MergeFragment "/mac/libraries/CCache API/bin/CCacheLib.68K.debug" GSSLib.debug
+	MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K" GSSLib.debug
 	MergeFragment "/mac/libraries/CCache API/bin/CCacheLib.PPC.debug" GSSLib.debug
 	MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC" GSSLib.debug
-#	MergeFragment "/mac/libraries/DES/bin/deslib.68K.debug" GSSLib.debug
+	MergeFragment "/mac/libraries/DES/bin/deslib.68K.debug" GSSLib.debug
 	MergeFragment "/mac/libraries/DES/bin/deslib.PPC.debug" GSSLib.debug
 	MergeFragment "Kerberos5GlobalsLib.PPC.debug" GSSLib.debug
 	MergeFragment "Kerberos5GlobalsDataLib.PPC" GSSLib.debug
+	MergeFragment "Kerberos5GlobalsLib.68K.debug" GSSLib.debug
+	MergeFragment "Kerberos5GlobalsDataLib.68K" GSSLib.debug
 	DeRez -only "'cfrg'(0)" GSSLib.debug "{RIncludes}"CodeFragments.r | StreamEdit -s /mac/FragmentAlias.mpw | Rez -a -o GSSLib.debug -i "{RIncludes}"
 	
 ################################################################################