Merging krb5globals fragments

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

diff --git a/src/mac/Makefile.tmpl b/src/mac/Makefile.tmpl
index 587d16d1b3baed5f53ca85458e4cab3be2ccd3be..35942ad91ac189bb25283fa9637b788d29010052 100644 (file)
--- a/src/mac/Makefile.tmpl
+++ b/src/mac/Makefile.tmpl
@@ -521,7 +521,7 @@ link-ppc-all : link-ppc link-ppc-debug
 #              shared PPC krb5 library
 #
 
-Kerberos5Lib.PPC Kerberos5Lib.PPC.MAP :: {autogenerated-files}  /mac/K5Library.exp {libraries-krb5-ppc} {krb5-obj-ppc} {cfm-krb5-obj-ppc} {testtrack-obj-ppc} {ccache-ppc}
+Kerberos5Lib.PPC Kerberos5Lib.PPC.MAP :: {autogenerated-files}  /mac/K5Library.exp {libraries-krb5-ppc} {krb5-obj-ppc} {cfm-krb5-obj-ppc} {testtrack-obj-ppc} {ccache-ppc} {krb5-globals-ppc}
        MWLinkPPC -sharedlibrary -name K5Library -m "" \
                -@export "/mac/K5Library.exp" -sym on -init "__initializeK5" \
                -term "__terminateK5" \
@@ -531,7 +531,7 @@ Kerberos5Lib.PPC Kerberos5Lib.PPC.MAP :: {autogenerated-files}  /mac/K5Library.e
 Kerberos5Lib.PPC :: /mac/version.r
        Rez "/mac/version.r" -a -o Kerberos5Lib.PPC
 
-Kerberos5Lib.PPC.debug Kerberos5Lib.PPC.debug.MAP :: {autogenerated-files}  /mac/K5Library.exp {libraries-krb5-ppc} {krb5-obj-ppc} {cfm-krb5-obj-ppc} {testtrack-obj-ppc} {ccache-ppc-debug}
+Kerberos5Lib.PPC.debug Kerberos5Lib.PPC.debug.MAP :: {autogenerated-files}  /mac/K5Library.exp {libraries-krb5-ppc} {krb5-obj-ppc} {cfm-krb5-obj-ppc} {testtrack-obj-ppc} {ccache-ppc-debug} {krb5-globals-ppc-debug}
        MWLinkPPC -sharedlibrary -name "MIT_*Kerberos5Lib.debug" -m "" \
                -@export "/mac/K5Library.exp" -sym on -init "__initializeK5" \
                -term "__terminateK5" \
@@ -590,6 +590,8 @@ GSSLib : GSSLib.PPC Kerberos5Lib.PPC {ccache-ppc} # GSSLib.68K Kerberos5Lib.68K
        MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC" GSSLib
 #      MergeFragment "/mac/libraries/DES/bin/deslib.68K" GSSLib
        MergeFragment "/mac/libraries/DES/bin/deslib.PPC" 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}"
        
 
@@ -609,6 +611,8 @@ GSSLib.debug : GSSLib.PPC.debug Kerberos5Lib.PPC.debug {ccache-ppc-debug} # GSSL
        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.PPC.debug" GSSLib.debug
+       MergeFragment "Kerberos5GlobalsLib.PPC.debug" GSSLib.debug
+       MergeFragment "Kerberos5GlobalsDataLib.PPC" GSSLib.debug
        DeRez -only "'cfrg'(0)" GSSLib.debug "{RIncludes}"CodeFragments.r | StreamEdit -s /mac/FragmentAlias.mpw | Rez -a -o GSSLib.debug -i "{RIncludes}"
        
 ################################################################################