Added Private libraries to Kerberos5

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-2@13979 dc483132-0cff-0310-8789-dd5450dbe970

4 files changed, 54 insertions, 36 deletions

diff --git a/src/mac/GSSKerberosPrefix.h b/src/mac/GSSKerberosPrefix.h
index 8c7ab64..bf473e0 100644
--- a/src/mac/GSSKerberosPrefix.h
+++ b/src/mac/GSSKerberosPrefix.h
@@ -1,3 +1,4 @@
+#ifndef __ASSEMBLER__
 #include <KerberosSupport/KerberosConditionalMacros.h>
 
 #define SIZEOF_LONG		4
@@ -65,3 +66,4 @@
 #define	HAVE_REGEXEC		1
 #define	HAVE_REGCOMP		1
 #define	HAVE_SA_LEN		1
+#endif
diff --git a/src/mac/Kerberos5CoreExport.jam b/src/mac/Kerberos5CoreExport.jam
new file mode 100644
index 0000000..1197a37
--- /dev/null
+++ b/src/mac/Kerberos5CoreExport.jam
@@ -0,0 +1,18 @@
+rule Kerberos5Core.pbexp
+{
+    DEPENDS "$(1)" : "$(2)" ;
+}
+
+actions Kerberos5Core.pbexp
+{
+    cat "$(2)" > "$(1)"
+}
+
+GSSKRB5_TEMP_DIR = "$(SYMROOT)/GSSKerberos5.intermediates" ;
+EXPORT_DIR = "$(SRCROOT)" ;
+Kerberos5Core.pbexp 		"$(GSSKRB5_TEMP_DIR)/Kerberos5Core.pbexp" : 
+                            "$(EXPORT_DIR)/Kerberos5Lib.pbexp"
+                            "$(EXPORT_DIR)/Kerberos5PrivateLib.pbexp" ;
+
+DEPENDS install 	: all ;
+DEPENDS	all			: "$(GSSKRB5_TEMP_DIR)/Kerberos5Core.pbexp" ;
\ No newline at end of file
diff --git a/src/mac/Kerberos5Lib.pbexp b/src/mac/Kerberos5Lib.pbexp
index ea2019c..0e082f8 100644
--- a/src/mac/Kerberos5Lib.pbexp
+++ b/src/mac/Kerberos5Lib.pbexp
@@ -4,8 +4,6 @@
 # Public Kerberos v5 API
 #----------------------------------------------------
 
-        ___initializeK5
-
 # Kerberos 5
 	_krb5_build_principal
 	_krb5_build_principal_ext
@@ -190,40 +188,6 @@
 # Added for 1.2:
 	_krb5_decode_ticket
 
-#----------------------------------------------------
-#   PrivateKerberos5Lib.exp
-#
-# Exports from Kerberos v5 library which are not
-# a part of the public API, but are needed by some
-# critical clients. Each call is annotated by the
-# offending client.
-#----------------------------------------------------
-
-	_krb5_size_opaque
-	_krb5_internalize_opaque
-	_krb5_externalize_opaque
-	_krb5_ser_pack_int32
-	_krb5_ser_unpack_int32
-	_krb5_ser_pack_bytes
-	_krb5_ser_unpack_bytes
-	_krb5_ser_auth_context_init
-	_krb5_ser_context_init
-	_krb5_ser_ccache_init
-	_krb5_ser_keytab_init
-	_krb5_ser_rcache_init
-	_decode_krb5_ap_req
-	_krb5_mcc_ops
-	_krb5_c_keyed_checksum_types
-	_krb5_c_random_make_octets
-	_krb5_c_encrypt
-	_krb5_c_make_checksum
-	_krb5_c_decrypt
-	_krb5_c_verify_checksum
-	_krb5_c_block_size
-	_krb5_c_checksum_length
-	_krb5_c_encrypt_length
-	_krb5int_cc_default
-
 # Added post 1.2.2
 	_krb5_cc_get_name
 	_krb5_cc_gen_new
diff --git a/src/mac/Kerberos5PrivateLib.pbexp b/src/mac/Kerberos5PrivateLib.pbexp
new file mode 100644
index 0000000..2beb2ff
--- /dev/null
+++ b/src/mac/Kerberos5PrivateLib.pbexp
@@ -0,0 +1,34 @@
+#----------------------------------------------------
+#   Kerberos5PrivateLib.pbexp
+#
+# Exports from Kerberos v5 library which are not
+# a part of the public API, but are needed by some
+# critical clients. Each call is annotated by the
+# offending client.
+#----------------------------------------------------
+    ___initializeK5
+
+	_krb5_size_opaque
+	_krb5_internalize_opaque
+	_krb5_externalize_opaque
+	_krb5_ser_pack_int32
+	_krb5_ser_unpack_int32
+	_krb5_ser_pack_bytes
+	_krb5_ser_unpack_bytes
+	_krb5_ser_auth_context_init
+	_krb5_ser_context_init
+	_krb5_ser_ccache_init
+	_krb5_ser_keytab_init
+	_krb5_ser_rcache_init
+	_decode_krb5_ap_req
+	_krb5_mcc_ops
+	_krb5_c_keyed_checksum_types
+	_krb5_c_random_make_octets
+	_krb5_c_encrypt
+	_krb5_c_make_checksum
+	_krb5_c_decrypt
+	_krb5_c_verify_checksum
+	_krb5_c_block_size
+	_krb5_c_checksum_length
+	_krb5_c_encrypt_length
+	_krb5int_cc_default