Added more documentation and rearranged headers

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

1 files changed, 66 insertions, 38 deletions

diff --git a/src/mac/Makefile b/src/mac/Makefile
index 6d286960f0..79c9f5ab13 100644
--- a/src/mac/Makefile
+++ b/src/mac/Makefile
@@ -20,13 +20,13 @@ library-kind-final						=
 ##############################################################################################################
 
 #	Everything
-all Ä unset-echo glue all-debug all-final
+all Ä unset-echo all-debug all-final
 
 #	Debugging versions
-all-debug Ä unset-echo ppc-debug 68k-debug headers
+all-debug Ä unset-echo ppc-debug 68k-debug
 
 #	Final versions
-all-final Ä unset-echo ppc-final 68k-final headers
+all-final Ä unset-echo ppc-final 68k-final
 
 #	Clasic 68K glue
 glue Ä unset-echo glue-gss glue-krb5
@@ -941,22 +941,22 @@ make-options-68k-final = ¶
 make-output = "{TempFolder}GSS/Kerberos Makefile script"
 submakefile-target = gss-library
 
-ppc-debug Ä {makefile-name} {gss-objects-ppc-debug-list} {krb5-objects-ppc-debug-list} ¶
+ppc-debug Ä glue headers documentation {makefile-name} {gss-objects-ppc-debug-list} {krb5-objects-ppc-debug-list} ¶
 	{profile-objects-ppc-debug-list} {comerr-objects-ppc-debug-list} {include-folders-list}
 	Make {make-options-common} {make-options-ppc-debug} {submakefile-target} > {make-output}
 	{make-output}
 	
-68k-debug Ä {makefile-name} {gss-objects-68k-debug-list} {krb5-objects-68k-debug-list} ¶
+68k-debug Ä glue headers documentation  {makefile-name} {gss-objects-68k-debug-list} {krb5-objects-68k-debug-list} ¶
 	 {profile-objects-68k-debug-list} {comerr-objects-68k-debug-list} {include-folders-list}
 	Make {make-options-common} {make-options-68k-debug} {submakefile-target} > {make-output}
 	{make-output}
 	
-ppc-final Ä {makefile-name} {gss-objects-ppc-final-list} {krb5-objects-ppc-final-list} ¶
+ppc-final Ä glue headers documentation  {makefile-name} {gss-objects-ppc-final-list} {krb5-objects-ppc-final-list} ¶
 	{profile-objects-ppc-final-list} {comerr-objects-ppc-final-list} {include-folders-list}
 	Make {make-options-common} {make-options-ppc-final} {submakefile-target} > {make-output}
 	{make-output}
 	
-68k-final Ä {makefile-name} {gss-objects-68k-final-list} {krb5-objects-68k-final-list} ¶
+68k-final Ä glue headers documentation  {makefile-name} {gss-objects-68k-final-list} {krb5-objects-68k-final-list} ¶
 	{profile-objects-68k-final-list} {comerr-objects-68k-final-list} {include-folders-list}
 	Make {make-options-common} {make-options-68k-final} {submakefile-target} > {make-output}
 	{make-output}
@@ -1288,6 +1288,7 @@ clean Ä
 gss-headers-output-folder							= {root-folder}:GSSLib:Headers:
 krb5-headers-output-folder							= {root-folder}:Kerberos5Lib:Headers:
 krb5-globals-headers-output-folder					= {root-folder}:Kerberos5GlobalsLib:Headers:
+comerr-headers-output-folder						= {root-folder}:ComErrLib:Headers:
 profile-headers-output-folder						= {root-folder}:KerberosProfileLib:Headers:
 
 gss-headers-output = ¶
@@ -1303,12 +1304,16 @@ krb5-headers-output = ¶
 krb5-globals-headers-output = ¶
 	"{krb5-globals-headers-output-folder}Kerberos5Globals.h"
 	
+comerr-headers-output = ¶
+	"{comerr-headers-output-folder}com_err.h"
+	
 profile-headers-output = ¶
 	"{profile-headers-output-folder}profile.h"
 	
-headers-output = {gss-headers-output} {krb5-headers-output} {krb5-globals-headers-output} {profile-headers-output}
+headers-output = {gss-headers-output} {krb5-headers-output} {krb5-globals-headers-output} ¶
+	{comerr-headers-output} {profile-headers-output} 
 
-headers Ä {headers-output}
+headers Ä unset-echo {headers-output}
 
 "{gss-headers-output-folder}gssapi.h" Ä "{root-folder}lib:gssapi:generic:gssapi.h" {makefile-name}
 	"{create-folder}" "{TargDir}"
@@ -1334,36 +1339,28 @@ headers Ä {headers-output}
 	Catenate "{root-folder}include:krb5.h" > "{Targ}"
 	SetFile -a l "{Targ}"
 
-"{krb5-headers-output-folder}com_err.h" Ä "{root-folder}util:et:com_err.h" {makefile-name}
-	"{create-folder}" "{TargDir}"
-	If (`Exists "{Targ}" | Count -l`)
-		SetFile -a l "{Targ}"
-	End
-	Catenate "{root-folder}util:et:com_err.h" > "{Targ}"
-	SetFile -a l "{Targ}"
-
-"{krb5-headers-output-folder}profile.h" Ä "{root-folder}util:profile:profile.h" {makefile-name}
+"{krb5-headers-output-folder}win-mac.h" Ä "{root-folder}include:win-mac.h" {makefile-name}
 	"{create-folder}" "{TargDir}"
 	If (`Exists "{Targ}" | Count -l`)
 		SetFile -a l "{Targ}"
 	End
-	Catenate "{root-folder}util:profile:profile.h" > "{Targ}"
+	Catenate "{root-folder}include:win-mac.h" > "{Targ}"
 	SetFile -a l "{Targ}"
 
-"{krb5-headers-output-folder}win-mac.h" Ä "{root-folder}include:win-mac.h" {makefile-name}
+"{krb5-globals-headers-output-folder}Kerberos5Globals.h" Ä "{root-folder}mac:libraries:Kerberos v5 Globals:Krb5Globals.h" {makefile-name}
 	"{create-folder}" "{TargDir}"
 	If (`Exists "{Targ}" | Count -l`)
 		SetFile -a l "{Targ}"
 	End
-	Catenate "{root-folder}include:win-mac.h" > "{Targ}"
+	Catenate "{root-folder}mac:libraries:Kerberos v5 Globals:Krb5Globals.h" > "{Targ}"
 	SetFile -a l "{Targ}"
 
-"{krb5-globals-headers-output-folder}Kerberos5Globals.h" Ä "{root-folder}mac:libraries:Kerberos v5 Globals:Krb5Globals.h" {makefile-name}
+"{comerr-headers-output-folder}com_err.h" Ä "{root-folder}util:et:com_err.h" {makefile-name}
 	"{create-folder}" "{TargDir}"
 	If (`Exists "{Targ}" | Count -l`)
 		SetFile -a l "{Targ}"
 	End
-	Catenate "{root-folder}mac:libraries:Kerberos v5 Globals:Krb5Globals.h" > "{Targ}"
+	Catenate "{root-folder}util:et:com_err.h" > "{Targ}"
 	SetFile -a l "{Targ}"
 
 "{profile-headers-output-folder}profile.h" Ä "{root-folder}util:profile:profile.h" {makefile-name}
@@ -1381,37 +1378,68 @@ headers Ä {headers-output}
 gss-documentation-output-folder						= {root-folder}:GSSLib:Documentation:
 krb5-documentation-output-folder					= {root-folder}:Kerberos5Lib:Documentation:
 krb5-globals-documentation-output-folder			= {root-folder}:Kerberos5GlobalsLib:Documentation:
+comerr-documentation-output-folder					= {root-folder}:ComErrLib:Documentation:
 profile-documentation-output-folder					= {root-folder}:KerberosProfileLib:Documentation:
 
-gss-documentation-output = ""
+gss-documentation-output = ¶
+	{gss-documentation-output-folder}"GSSLib ReadMe"
 
 krb5-documentation-output = ¶
-	"{krb5-documentation-output-folder}krb5api.pdf"
+	{krb5-documentation-output-folder}"krb5api.pdf"
 
 krb5-globals-documentation-output = ¶
-	"{krb5-globals-documentation-output-folder}Kerberos5Globals.html"
+	{krb5-globals-documentation-output-folder}"Kerberos5Globals.html"
 	
-profile-documentation-output = ""
+comerr-documentation-output = ¶
+	{comerr-documentation-output-folder}"ComErrLib ReadMe"
+	
+profile-documentation-output = ¶
+	{profile-documentation-output-folder}"KerberosProfileLib ReadMe"
 	
 documentation-output = {gss-documentation-output} {krb5-documentation-output} ¶
-	{krb5-globals-documentation-output} {profile-documentation-output}
+	{krb5-globals-documentation-output} {profile-documentation-output} ¶
+	{comerr-documentation-output}
 
-documentation Ä {documentation-output}
+documentation Ä unset-echo {documentation-output}
 
-"{krb5-documentation-output-folder}krb5api.pdf" Ä {makefile-name}
+{gss-documentation-output-folder}"GSSLib ReadMe" Ä {root-folder}"mac:GSSLib ReadMe" {makefile-name}
 	"{create-folder}" "{TargDir}"
 	If (`Exists "{Targ}" | Count -l`)
-		SetFile -a l "{Targ}"
+		SetFile -a l {Targ}
 	End
-	If (`Exists "{root-folder}:::Documentation:pdf:krb5api.pdf"`)
-		Catenate "{root-folder}:::Documentation:pdf:krb5api.pdf" > "{Targ}"
+	Catenate {root-folder}"mac:GSSLib ReadMe" > {Targ}
+	SetFile -a l {Targ}
+
+{krb5-documentation-output-folder}"krb5api.pdf" Ä {makefile-name}
+	"{create-folder}" "{TargDir}"
+	If (`Exists "{Targ}" | Count -l`)
+		SetFile -a l {Targ}
 	End
-	SetFile -a l "{Targ}"
+	If (`Exists {root-folder}":::Documentation:pdf:krb5api.pdf"`)
+		Catenate {root-folder}":::Documentation:pdf:krb5api.pdf" > {Targ}
+	End
+	SetFile -a l -t 'PDF ' -c 'CARO' {Targ}
 
-"{krb5-globals-documentation-output-folder}Kerberos5Globals.html" Ä "{root-folder}mac:libraries:Kerberos v5 Globals:Krb5Globals.html" {makefile-name}
+{krb5-globals-documentation-output-folder}"Kerberos5Globals.html" Ä {root-folder}"mac:libraries:Kerberos v5 Globals:Krb5Globals.html" {makefile-name}
 	"{create-folder}" "{TargDir}"
 	If (`Exists "{Targ}" | Count -l`)
-		SetFile -a l "{Targ}"
+		SetFile -a l {Targ}
 	End
-	Catenate "{root-folder}mac:libraries:Kerberos v5 Globals:Krb5Globals.html" > "{Targ}"
-	SetFile -a l "{Targ}"
+	Catenate {root-folder}"mac:libraries:Kerberos v5 Globals:Krb5Globals.html" > {Targ}
+	SetFile -a l -c 'MOSS' {Targ}
+
+{comerr-documentation-output-folder}"ComErrLib ReadMe" Ä {root-folder}"mac:ComErrLib ReadMe" {makefile-name}
+	"{create-folder}" "{TargDir}"
+	If (`Exists "{Targ}" | Count -l`)
+		SetFile -a l {Targ}
+	End
+	Catenate {root-folder}"mac:ComErrLib ReadMe" > {Targ}
+	SetFile -a l {Targ}
+
+{profile-documentation-output-folder}"KerberosProfileLib ReadMe" Ä {root-folder}"mac:KerberosProfileLib ReadMe" {makefile-name}
+	"{create-folder}" "{TargDir}"
+	If (`Exists "{Targ}" | Count -l`)
+		SetFile -a l {Targ}
+	End
+	Catenate {root-folder}"mac:KerberosProfileLib ReadMe" > {Targ}
+	SetFile -a l {Targ}