Added 68K DES library to output; removed all traces of CW builds

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

diff --git a/src/mac/Makefile.tmpl b/src/mac/Makefile.tmpl
index b9a2b73b41aa93f1bd1c11cdcbfa70cc1a44d2f6..05d63c22c84f60c301e5ac458209a4fe397db703 100644 (file)
--- a/src/mac/Makefile.tmpl
+++ b/src/mac/Makefile.tmpl
@@ -1,4 +1,4 @@
-snapshot-root = //GSS-Kerberos5-1.1
+snapshot-root = "/GSS-Kerberos5-2.0"
 
 include-paths = {autogenerated-include-paths} -i /mac/TestTrack/ -i "/mac/libraries/CCache API/include/" -i "/mac/libraries/Kerberos v5 Globals"
 
@@ -214,29 +214,29 @@ kerberos-headers-ppc              = {kerberos-headers-root}KerberosHeadersPPC
 ################################################################################
 
 standard-libraries-cfm68k = \
-       "/bin/MIT CLib.68K" \
-       "/bin/MIT RuntimeLib.68K" \
+       "/mac/libraries/Metrowerks/CW Pro 4/CLib.68K" \
+       "/mac/libraries/Metrowerks/CW Pro 4/RuntimeLib.68K" \
        "{MW68KLibraries}MSL ShLibRuntimeCFM68K.Lib" \
        "{SharedLibraries}InterfaceLib" \
        "{MW68KLibraries}MathLibCFM68K (4i_8d).Lib"
 
 standard-libraries-ppc = \
-       "/bin/MIT CLib.PPC" \
-       "/bin/MIT RuntimeLib.PPC" \
+       "/mac/libraries/Metrowerks/CW Pro 4/CLib.PPC" \
+       "/mac/libraries/Metrowerks/CW Pro 4/RuntimeLib.PPC" \
        "{MWPPCLibraries}MSL ShLibRuntime.Lib" \
        "{SharedLibraries}InterfaceLib" \
        "{SharedLibraries}MathLib"
 
 standard-libraries-cfm68k-debug = \
-       "/bin/MIT CLib.68K.debug" \
-       "/bin/MIT RuntimeLib.68K.debug" \
+       "/mac/libraries/Metrowerks/CW Pro 4/CLib.68K.debug" \
+       "/mac/libraries/Metrowerks/CW Pro 4/RuntimeLib.68K.debug" \
        "{MW68KLibraries}MSL ShLibRuntimeCFM68K.Lib" \
        "{SharedLibraries}InterfaceLib" \
        "{MW68KLibraries}MathLibCFM68K (4i_8d).Lib"
 
 standard-libraries-ppc-debug = \
-       "/bin/MIT CLib.PPC.debug" \
-       "/bin/MIT RuntimeLib.PPC.debug" \
+       "/mac/libraries/Metrowerks/CW Pro 4/CLib.PPC.debug" \
+       "/mac/libraries/Metrowerks/CW Pro 4/RuntimeLib.PPC.debug" \
        "{MWPPCLibraries}MSL ShLibRuntime.Lib" \
        "{SharedLibraries}InterfaceLib" \
        "{SharedLibraries}MathLib"
@@ -295,7 +295,7 @@ ccache-ppc-debug = \
 ##
 ################################################################################
 
-all : link-all glue
+all : link-all krb5-globals glue
 compile : compile-ppc compile-cfm-gss compile-cfm-krb5 compile-testtrack # compile-cfm68k
 
 ################################################################################
@@ -640,7 +640,7 @@ link-fat-all :
 #      MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K" "MIT Kerberos Library"
        MergeFragment "/mac/libraries/CCache API/bin/CCacheLib.PPC" "MIT Kerberos Library"
        MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC" "MIT Kerberos Library"
-#      MergeFragment "/mac/libraries/DES/bin/deslib.68K" "MIT Kerberos Library"
+       MergeFragment "/mac/libraries/DES/bin/deslib.68K" "MIT Kerberos Library"
        MergeFragment "/mac/libraries/DES/bin/deslib.PPC" "MIT Kerberos Library"
 #      MergeFragment "Kerberos5GlobalsLib.68K" "MIT Kerberos Library"
 #      MergeFragment "Kerberos5GlobalsDataLib.68K" "MIT Kerberos Library"
@@ -660,7 +660,7 @@ link-fat-all :
 #      MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K" "MIT Kerberos Library.debug"
        MergeFragment "/mac/libraries/CCache API/bin/CCacheLib.PPC.debug" "MIT Kerberos Library.debug"
        MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC" "MIT Kerberos Library.debug"
-#      MergeFragment "/mac/libraries/DES/bin/deslib.68K.debug" "MIT Kerberos Library.debug"
+       MergeFragment "/mac/libraries/DES/bin/deslib.68K.debug" "MIT Kerberos Library.debug"
        MergeFragment "/mac/libraries/DES/bin/deslib.PPC.debug" "MIT Kerberos Library.debug"
        MergeFragment "Kerberos5GlobalsLib.PPC.debug" "MIT Kerberos Library.debug"
        MergeFragment "Kerberos5GlobalsDataLib.PPC" "MIT Kerberos Library.debug"
@@ -689,11 +689,7 @@ clean : autogenerate-clean glue-clean
 # build process (CW files etc)
 
 dist-clean : clean
-       Delete -i -y /bin \
-               "/mac/libraries/Metrowerks/CW Pro 2/MIT C.CFM68K DLL.prj Data" \
-               "/mac/libraries/Metrowerks/CW Pro 2/MIT C.PPC DLL.prj Data" \
-               "/mac/libraries/Metrowerks/CW Pro 2/MIT RuntimeCFM68K DLL.prj Data" \
-               "/mac/libraries/Metrowerks/CW Pro 2/MIT RuntimePPC DLL.prj Data"
+       Delete -i -y /bin
        Delete -i GSSLib GSSLib.PPC GSSLib.68K Kerberos5Lib.PPC Kerberos5Lib.68K \
                GSSLib.68K.MAP GSSLib.68K.SYM GSSLib.PPC.MAP GSSLib.PPC.xSYM \
                Kerberos5Lib.68K.MAP Kerberos5Lib.68K.SYM Kerberos5Lib.PPC.MAP Kerberos5Lib.PPC.xSYM \
@@ -736,24 +732,14 @@ all-mac-files = \
        /mac/libraries/KerberosHeaders.h \
        /mac/libraries/KerberosHeaders.pch \
        /mac/libraries/KerberosHeadersCFM.pch \
-       "/mac/libraries/CodeWarrior Dependencies/Pro2.prj" \
-       "/mac/libraries/CodeWarrior Dependencies/Pro4.prj" \
-       "/mac/libraries/Metrowerks/CW Pro 2/MIT C.CFM68K DLL.prj" \
-       "/mac/libraries/Metrowerks/CW Pro 2/MIT C.PPC DLL.prj" \
-       "/mac/libraries/Metrowerks/CW Pro 2/MIT RuntimeCFM68K DLL.prj" \
-       "/mac/libraries/Metrowerks/CW Pro 2/MIT RuntimePPC DLL.prj" \
-       "/mac/libraries/Metrowerks/CW Pro 2/MIT C.CFM68K DLL.doc" \
-       "/mac/libraries/Metrowerks/CW Pro 2/MIT C.PPC DLL.doc" \
-       "/mac/libraries/Metrowerks/CW Pro 2/MIT RuntimeCFM68K DLL.doc" \
-       "/mac/libraries/Metrowerks/CW Pro 2/MIT RuntimePPC DLL.doc" \
-       "/mac/libraries/Metrowerks/CW Pro 4/MIT C.CFM68K DLL.prj" \
-       "/mac/libraries/Metrowerks/CW Pro 4/MIT C.PPC DLL.prj" \
-       "/mac/libraries/Metrowerks/CW Pro 4/MIT RuntimeCFM68K DLL.prj" \
-       "/mac/libraries/Metrowerks/CW Pro 4/MIT RuntimePPC DLL.prj" \
-       "/mac/libraries/Metrowerks/CW Pro 4/MIT C.CFM68K DLL.doc" \
-       "/mac/libraries/Metrowerks/CW Pro 4/MIT C.PPC DLL.doc" \
-       "/mac/libraries/Metrowerks/CW Pro 4/MIT RuntimeCFM68K DLL.doc" \
-       "/mac/libraries/Metrowerks/CW Pro 4/MIT RuntimePPC DLL.doc" \
+       "/mac/libraries/Metrowerks/CW Pro 4/CLib.PPC" \
+       "/mac/libraries/Metrowerks/CW Pro 4/RuntimeLib.PPC" \
+       "/mac/libraries/Metrowerks/CW Pro 4/CLib.68K" \
+       "/mac/libraries/Metrowerks/CW Pro 4/RuntimeLib.68K" \
+       "/mac/libraries/Metrowerks/CW Pro 4/CLib.PPC.debug" \
+       "/mac/libraries/Metrowerks/CW Pro 4/RuntimeLib.PPC.debug" \
+       "/mac/libraries/Metrowerks/CW Pro 4/CLib.68K.debug" \
+       "/mac/libraries/Metrowerks/CW Pro 4/RuntimeLib.68K.debug" \
        "/mac/libraries/CCache API/include/CCache.h" \
        "/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K" \
        "/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC" \
@@ -787,9 +773,7 @@ all-mac-folders = /config/ /include/ /include/krb5/ /include/krb5/stock/ \
        /mac/ \
        /mac/kconfig/ \
        /mac/libraries/ \
-       "/mac/libraries/CodeWarrior Dependencies/" \
        /mac/libraries/Metrowerks/ \
-       "/mac/libraries/Metrowerks/CW Pro 2/" \
        "/mac/libraries/Metrowerks/CW Pro 4/" \
        "/mac/libraries/CCache API/" \
        "/mac/libraries/CCache API/bin" \