Changed location of glue output files

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

3 files changed, 30 insertions, 31 deletions

diff --git a/src/mac/ChangeLog b/src/mac/ChangeLog
index d78fc67f0..9512af348 100644
--- a/src/mac/ChangeLog
+++ b/src/mac/ChangeLog
@@ -1,3 +1,11 @@
+Mon Aug 10 13:05:00 1998  Miro Jurisic <meeroh@mit.edu>
+
+	* Makefile.tmpl: Changed location of glue generation output
+
+Mon Aug 10 13:05:00 1998  Miro Jurisic <meeroh@mit.edu>
+
+	* ReadMe: Changed instructions to refer to 68K glue
+
 Mon Aug 10 12:58:00 1998  Miro Jurisic <meeroh@mit.edu>
 
 	* Makefile.tmpl: Added glue files to clean targets
diff --git a/src/mac/Makefile.tmpl b/src/mac/Makefile.tmpl
index e22062866..303f4ab74 100644
--- a/src/mac/Makefile.tmpl
+++ b/src/mac/Makefile.tmpl
@@ -28,19 +28,19 @@ create-directories :
 ##
 ################################################################################
 
-GLUE_OUTPUT = /mac/K5.CFMglue.c /mac/GSS.CFMglue.c
+GLUE_OUTPUT = /K5.CFMglue.c /GSS.CFMglue.c
 
 glue : {GLUE_OUTPUT}
 glue-clean :
 	Delete -i {GLUE_OUTPUT}
 
-/mac/K5.CFMglue.c : /mac/K5.CFMglue.cin /mac/K5.CFMglue.proto.h /mac/K5.CFMglue.c /mac/K5.moreCFMglue.cin
-	perl /mac/CFMGlue.pl < /mac/K5.CFMglue.proto.h > /mac/K5.CFMglue.c
-	Catenate /mac/K5.CFMglue.cin /mac/CFMglue.c /mac/K5.CFMglue.c /mac/K5.moreCFMglue.cin | Catenate > /mac/K5.CFMglue.c
+/K5.CFMglue.c : /mac/K5.CFMglue.cin /mac/K5.CFMglue.proto.h /mac/K5.CFMglue.c /mac/K5.moreCFMglue.cin
+	perl /mac/CFMGlue.pl < /mac/K5.CFMglue.proto.h > /K5.CFMglue.c
+	Catenate /mac/K5.CFMglue.cin /mac/CFMglue.c /K5.CFMglue.c /mac/K5.moreCFMglue.cin | Catenate > /K5.CFMglue.c
 
-/mac/GSS.CFMglue.c : /mac/GSS.CFMglue.cin /mac/GSS.CFMglue.proto.h /mac/GSS.CFMglue.c /mac/GSS.moreCFMglue.cin
-	perl /mac/CFMGlue.pl < /mac/GSS.CFMglue.proto.h > /mac/GSS.CFMglue.c
-	Catenate /mac/GSS.CFMglue.cin /mac/CFMglue.c /mac/GSS.CFMglue.c /mac/GSS.moreCFMglue.cin | Catenate > /mac/GSS.CFMglue.c
+/GSS.CFMglue.c : /mac/GSS.CFMglue.cin /mac/GSS.CFMglue.proto.h /mac/GSS.CFMglue.c /mac/GSS.moreCFMglue.cin
+	perl /mac/CFMGlue.pl < /mac/GSS.CFMglue.proto.h > /GSS.CFMglue.c
+	Catenate /mac/GSS.CFMglue.cin /mac/CFMglue.c /GSS.CFMglue.c /mac/GSS.moreCFMglue.cin | Catenate > /GSS.CFMglue.c
 
 ################################################################################
 ##
diff --git a/src/mac/ReadMe b/src/mac/ReadMe
index ad38e8d99..8e36889b9 100644
--- a/src/mac/ReadMe
+++ b/src/mac/ReadMe
@@ -138,30 +138,21 @@ To build the Macintosh version of Kerberos 5 and GSS:
 	link against both if you are using static libraries.)
 
 	To add Kerberos functionality to a Code Warrior based application:
-
-	   1) Decide on whether to use CFM or static libraries. We strongly
-	      recommended that you use the CFM libraries so that when updates are
-	      made to Kerberos5/GSS you do not need to recompile your application.
-	      
-	   2) Drag the appropriate libraries into your project.
-	   
-	      If you are using the CFM libraries, include the following:
-	      
-	      	If you are using GSSAPI:
-				GSSLibrary68K
-				GSSLibraryPPC
-    	    If you are using Kerberos v5 API directly:
-				K5Library68K
-				K5LibraryPPC
-          
-          If you are statically linking, include the following:
-          
-            libgss.68K
-            libgss.PPC
-            libkrb5.68K
-            libkrb5.PPC
-            
-	   3) Set the project options to 4 byte integers and enums treated as ints.
+	
+	   1) PPC application: use shared libraries:
+	   		For GSSAPI, add GSSLibraryPPC to your project
+	   		For Kerberos v5 API, add K5LibraryPPC to your project
+			Set the project options to 4 byte integers and enums treated as ints.
+
+	   2) CFM-68K application: use shared libraries
+	   		For GSSAPI, add GSSLibrary68K to your project
+	   		For Kerberos v5 API, add K5Library68K to your project
+			Set the project options to 4 byte integers and enums treated as ints.
+
+	   3) Classic 68K application: use glue for shared libraries
+	   		For GSSAPI, add GSS.CFMglue.c to your project
+	   		For Kerberos v5 API, add K5.CFMglue.c to your project
+			Set the project options to 4 byte integers and enums treated as ints.
 
     A PDF document describing the Kerberos 5 API is located at: