From 477a511e16bbc454331cd136428329cdf0376750 Mon Sep 17 00:00:00 2001 From: Miro Jurisic Date: Fri, 28 Aug 1998 15:57:00 +0000 Subject: [PATCH] Removed all mentions from static libraries and kconfig from readmes and makefile; added debugging targets to makefile; upped versio nto 1.1a3 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10883 dc483132-0cff-0310-8789-dd5450dbe970 --- src/mac/ChangeLog | 8 + src/mac/Makefile.tmpl | 448 +++++++++++++++++++++-------------------- src/mac/ReadMe | 27 +-- src/mac/macfile_gen.pl | 19 +- src/mac/version.r | 6 +- 5 files changed, 250 insertions(+), 258 deletions(-) diff --git a/src/mac/ChangeLog b/src/mac/ChangeLog index b626a0d12..32070d46e 100644 --- a/src/mac/ChangeLog +++ b/src/mac/ChangeLog @@ -1,3 +1,11 @@ +Fri Aug 28 12:00:00 1998 Miro Jurisic + + * Makefile.tmpl: Removed static library targets, renamed other + targets, added debugging targets + * ReadMe: removed mentions of static libraries and kconfig + * macfile_gen.pl: renamed output variables + * version.r: upped to 1.1a3 + Fri Aug 21 17:00:00 1998 Miro Jurisic * Makefile.tmpl: Added CCache API dependencies diff --git a/src/mac/Makefile.tmpl b/src/mac/Makefile.tmpl index 5fe276456..c5cced3ff 100644 --- a/src/mac/Makefile.tmpl +++ b/src/mac/Makefile.tmpl @@ -1,6 +1,6 @@ SnapshotRoot = //GSS-Kerberos5-1.1 -INCLUDES = {AUTOINCLUDES} -i /mac/TestTrack/ -i "/mac/libraries/CCache API/include/" +include-paths = {autogenerated-include-paths} -i /mac/TestTrack/ -i "/mac/libraries/CCache API/include/" ################################################################################ ## @@ -12,9 +12,6 @@ create-directories : If Not "`Exists -d /bin`" NewFolder /bin End - If Not "`Exists -d /bin/68K`" - NewFolder /bin/68K - End If Not "`Exists -d /bin/PPC`" NewFolder /bin/PPC End @@ -28,13 +25,13 @@ create-directories : ## ################################################################################ -GLUE_OUTPUT = /K5.CFMglue.c /GSS.CFMglue.c -GLUE_INPUT = /mac/K5.CFMglue.cin /mac/K5.CFMglue.proto.h /mac/CFMglue.c /mac/K5.moreCFMglue.cin \ +classic-glue-output = /K5.CFMglue.c /GSS.CFMglue.c +classic-glue-input = /mac/K5.CFMglue.cin /mac/K5.CFMglue.proto.h /mac/CFMglue.c /mac/K5.moreCFMglue.cin \ /mac/GSS.CFMglue.cin /mac/GSS.CFMglue.proto.h /mac/GSS.moreCFMglue.cin /mac/CFMGlue.pl -glue : {GLUE_OUTPUT} +glue : {classic-glue-output} glue-clean : - Delete -i {GLUE_OUTPUT} + Delete -i {classic-glue-output} /K5.CFMglue.c : /mac/K5.CFMglue.cin /mac/K5.CFMglue.proto.h /mac/CFMglue.c /mac/K5.moreCFMglue.cin perl /mac/CFMGlue.pl < /mac/K5.CFMglue.proto.h > /K5.CFMglue.c @@ -50,10 +47,10 @@ glue-clean : ## ################################################################################ -AUTOGEN_H_FROM_ET = /util/et/et_h.perl -AUTOGEN_C_FROM_ET = /util/et/et_c.perl +autogeneration-h-script = /util/et/et_h.perl +autogeneration-c-script = /util/et/et_c.perl -AUTOGEN_OUTPUT = /include/asn1_err.h /include/kdb5_err.h /include/krb5_err.h \ +autogenerated-files = /include/asn1_err.h /include/kdb5_err.h /include/krb5_err.h \ /include/kv5m_err.h /include/adm_err.h \ /lib/gssapi/generic/gssapi_err_generic.h \ /lib/gssapi/krb5/gssapi_err_krb5.h /util/profile/prof_err.c \ @@ -65,7 +62,7 @@ AUTOGEN_OUTPUT = /include/asn1_err.h /include/kdb5_err.h /include/krb5_err.h \ /include/profile.h /include/krb5/osconf.h /lib/gssapi/generic/gssapi.h \ /include/autoconf.h -AUTOGEN_SOURCES = /lib/krb5/error_tables/asn1_err.et \ +autogeneration-sources = /lib/krb5/error_tables/asn1_err.et \ /lib/krb5/error_tables/kdb5_err.et \ /lib/krb5/error_tables/krb5_err.et \ /lib/krb5/error_tables/kv5m_err.et \ @@ -77,9 +74,9 @@ AUTOGEN_SOURCES = /lib/krb5/error_tables/asn1_err.et \ /include/krb5/stock/osconf.h /lib/gssapi/generic/gssapi.hin \ /mac/libraries/autoconf.h -autogenerate-files : {AUTOGEN_OUTPUT} +autogenerate-files : {autogenerated-files} autogenerate-clean : - for output_file in {AUTOGEN_OUTPUT} + for output_file in {autogenerated-files} if "`Exists {output_file}`" SetFile -a l {output_file} Delete {output_file} @@ -93,28 +90,28 @@ autogenerate-clean : ################################################################################ /include/asn1_err.h : /lib/krb5/error_tables/asn1_err.et - perl {AUTOGEN_H_FROM_ET} outfile="/include/asn1_err.h" < "/lib/krb5/error_tables/asn1_err.et" + perl {autogeneration-h-script} outfile="/include/asn1_err.h" < "/lib/krb5/error_tables/asn1_err.et" /include/kdb5_err.h : /lib/krb5/error_tables/kdb5_err.et - perl {AUTOGEN_H_FROM_ET} outfile="/include/kdb5_err.h" < "/lib/krb5/error_tables/kdb5_err.et" + perl {autogeneration-h-script} outfile="/include/kdb5_err.h" < "/lib/krb5/error_tables/kdb5_err.et" /include/krb5_err.h : /lib/krb5/error_tables/krb5_err.et - perl {AUTOGEN_H_FROM_ET} outfile="/include/krb5_err.h" < "/lib/krb5/error_tables/krb5_err.et" + perl {autogeneration-h-script} outfile="/include/krb5_err.h" < "/lib/krb5/error_tables/krb5_err.et" /include/kv5m_err.h : /lib/krb5/error_tables/kv5m_err.et - perl {AUTOGEN_H_FROM_ET} outfile="/include/kv5m_err.h" < "/lib/krb5/error_tables/kv5m_err.et" + perl {autogeneration-h-script} outfile="/include/kv5m_err.h" < "/lib/krb5/error_tables/kv5m_err.et" /include/adm_err.h : /lib/krb5/error_tables/adm_err.et - perl {AUTOGEN_H_FROM_ET} outfile="/include/adm_err.h" < "/lib/krb5/error_tables/adm_err.et" + perl {autogeneration-h-script} outfile="/include/adm_err.h" < "/lib/krb5/error_tables/adm_err.et" /lib/gssapi/generic/gssapi_err_generic.h : /lib/gssapi/generic/gssapi_err_generic.et - perl {AUTOGEN_H_FROM_ET} outfile="/lib/gssapi/generic/gssapi_err_generic.h" < "/lib/gssapi/generic/gssapi_err_generic.et" + perl {autogeneration-h-script} outfile="/lib/gssapi/generic/gssapi_err_generic.h" < "/lib/gssapi/generic/gssapi_err_generic.et" /lib/gssapi/krb5/gssapi_err_krb5.h : /lib/gssapi/krb5/gssapi_err_krb5.et - perl {AUTOGEN_H_FROM_ET} outfile="/lib/gssapi/krb5/gssapi_err_krb5.h" < "/lib/gssapi/krb5/gssapi_err_krb5.et" + perl {autogeneration-h-script} outfile="/lib/gssapi/krb5/gssapi_err_krb5.h" < "/lib/gssapi/krb5/gssapi_err_krb5.et" /util/profile/prof_err.h : /util/profile/prof_err.et - perl {AUTOGEN_H_FROM_ET} outfile="/util/profile/prof_err.h" < "/util/profile/prof_err.et" + perl {autogeneration-h-script} outfile="/util/profile/prof_err.h" < "/util/profile/prof_err.et" ################################################################################ # @@ -123,28 +120,28 @@ autogenerate-clean : ################################################################################ /lib/krb5/error_tables/asn1_err.c : /lib/krb5/error_tables/asn1_err.et - perl {AUTOGEN_C_FROM_ET} outfile="/lib/krb5/error_tables/asn1_err.c" < "/lib/krb5/error_tables/asn1_err.et" + perl {autogeneration-c-script} outfile="/lib/krb5/error_tables/asn1_err.c" < "/lib/krb5/error_tables/asn1_err.et" /lib/krb5/error_tables/kdb5_err.c : /lib/krb5/error_tables/kdb5_err.et - perl {AUTOGEN_C_FROM_ET} outfile="/lib/krb5/error_tables/kdb5_err.c" < "/lib/krb5/error_tables/kdb5_err.et" + perl {autogeneration-c-script} outfile="/lib/krb5/error_tables/kdb5_err.c" < "/lib/krb5/error_tables/kdb5_err.et" /lib/krb5/error_tables/krb5_err.c : /lib/krb5/error_tables/krb5_err.et - perl {AUTOGEN_C_FROM_ET} outfile="/lib/krb5/error_tables/krb5_err.c" < "/lib/krb5/error_tables/krb5_err.et" + perl {autogeneration-c-script} outfile="/lib/krb5/error_tables/krb5_err.c" < "/lib/krb5/error_tables/krb5_err.et" /lib/krb5/error_tables/kv5m_err.c : /lib/krb5/error_tables/kv5m_err.et - perl {AUTOGEN_C_FROM_ET} outfile="/lib/krb5/error_tables/kv5m_err.c" < "/lib/krb5/error_tables/kv5m_err.et" + perl {autogeneration-c-script} outfile="/lib/krb5/error_tables/kv5m_err.c" < "/lib/krb5/error_tables/kv5m_err.et" /lib/krb5/error_tables/adm_err.c : /lib/krb5/error_tables/adm_err.et - perl {AUTOGEN_C_FROM_ET} outfile="/lib/krb5/error_tables/adm_err.c" < "/lib/krb5/error_tables/adm_err.et" + perl {autogeneration-c-script} outfile="/lib/krb5/error_tables/adm_err.c" < "/lib/krb5/error_tables/adm_err.et" /lib/gssapi/generic/gssapi_err_generic.c : /lib/gssapi/generic/gssapi_err_generic.et - perl {AUTOGEN_C_FROM_ET} outfile="/lib/gssapi/generic/gssapi_err_generic.c" < "/lib/gssapi/generic/gssapi_err_generic.et" + perl {autogeneration-c-script} outfile="/lib/gssapi/generic/gssapi_err_generic.c" < "/lib/gssapi/generic/gssapi_err_generic.et" /lib/gssapi/krb5/gssapi_err_krb5.c : /lib/gssapi/krb5/gssapi_err_krb5.et - perl {AUTOGEN_C_FROM_ET} outfile="/lib/gssapi/krb5/gssapi_err_krb5.c" < "/lib/gssapi/krb5/gssapi_err_krb5.et" + perl {autogeneration-c-script} outfile="/lib/gssapi/krb5/gssapi_err_krb5.c" < "/lib/gssapi/krb5/gssapi_err_krb5.et" /util/profile/prof_err.c : /util/profile/prof_err.et - perl {AUTOGEN_C_FROM_ET} outfile="/util/profile/prof_err.c" < "/util/profile/prof_err.et" + perl {autogeneration-c-script} outfile="/util/profile/prof_err.c" < "/util/profile/prof_err.et" ################################################################################ # @@ -172,7 +169,7 @@ autogenerate-clean : ################################################################################ ## -## Shared library specific sources (initialization and termination) +## Shared library initialization and termination sources ## ################################################################################ @@ -180,25 +177,25 @@ autogenerate-clean : # GSS library # -GSSSHLIBSRC = /mac/GSS.CFM.c -GSSSHLIBOBJ68KCFM = /bin/CFM-68K/GSS.CFM.c.CFM68.o -GSSSHLIBOBJPPC = /bin/PPC/GSS.CFM.c.PPC.o +cfm-gss-src = /mac/GSS.CFM.c +cfm-gss-obj-cfm68k = /bin/CFM-68K/GSS.CFM.c.CFM68.o +cfm-gss-obj-ppc = /bin/PPC/GSS.CFM.c.PPC.o # # Krb5 library # -K5SHLIBSRC = /mac/K5.CFM.c -K5SHLIBOBJ68KCFM = /bin/CFM-68K/K5.CFM.c.CFM68.o -K5SHLIBOBJPPC = /bin/PPC/K5.CFM.c.PPC.o +cfm-krb5-src = /mac/K5.CFM.c +cfm-krb5-obj-cfm68k = /bin/CFM-68K/K5.CFM.c.CFM68.o +cfm-krb5-obj-ppc = /bin/PPC/K5.CFM.c.PPC.o # # TestTrack # -TTSRC = /mac/TestTrack/ShlibTestTrack.c -TTOBJ68KCFM = /bin/CFM-68K/ShlibTestTrack.c.CFM68.o -TTOBJPPC = /bin/PPC/ShlibTestTrack.c.PPC.o +testtrack-src = /mac/TestTrack/ShlibTestTrack.c +testtrack-obj-cfm68k = /bin/CFM-68K/ShlibTestTrack.c.CFM68.o +testtrack-obj-ppc = /bin/PPC/ShlibTestTrack.c.PPC.o ################################################################################ ## @@ -206,38 +203,52 @@ TTOBJPPC = /bin/PPC/ShlibTestTrack.c.PPC.o ## ################################################################################ -KH = /mac/libraries/ -KH68K = {KH}KerberosHeaders68K -KHCFM-68K = {KH}KerberosHeadersCFM-68K -KHPPC = {KH}KerberosHeadersPPC +kerberos-headers-root = /mac/libraries/ +kerberos-headers-cfm68k = {kerberos-headers-root}KerberosHeadersCFM-68K +kerberos-headers-ppc = {kerberos-headers-root}KerberosHeadersPPC ################################################################################ ## -## Runtime libraries +## System and runtime libraries ## ################################################################################ -GSSRTLCFM68K = "/bin/MIT CLib.68K" \ +libraries-gss-cfm68k = \ + "/bin/MIT CLib.68K" \ "/bin/MIT RuntimeLib.68K" \ "{MW68KLibraries}MSL ShLibRuntimeCFM68K.Lib" \ "{SharedLibraries}InterfaceLib" \ "{MW68KLibraries}MathLibCFM68K (4i_8d).Lib" -GSSRTLCFMPPC = "/bin/MIT CLib.PPC" \ + +libraries-gss-ppc = \ + "/bin/MIT CLib.PPC" \ "/bin/MIT RuntimeLib.PPC" \ "{MWPPCLibraries}MSL ShLibRuntime.Lib" \ "{SharedLibraries}InterfaceLib" \ "{SharedLibraries}MathLib" -K5RTLCFM68K = "/bin/MIT CLib.68K" \ + +libraries-krb5-cfm68k = \ + "/bin/MIT CLib.68K" \ "/bin/MIT RuntimeLib.68K" \ "{MW68KLibraries}MSL ShLibRuntimeCFM68K.Lib" \ "{SharedLibraries}InterfaceLib" \ "{MW68KLibraries}MathLibCFM68K (4i_8d).Lib" -K5RTLCFMPPC = "/bin/MIT CLib.PPC" \ + +libraries-krb5-ppc = \ + "/bin/MIT CLib.PPC" \ "/bin/MIT RuntimeLib.PPC" \ "{MWPPCLibraries}MSL ShLibRuntime.Lib" \ "{SharedLibraries}InterfaceLib" \ "{SharedLibraries}MathLib" -OPTIONS = {INCLUDES} -enum int -opt all -strings pool -mapcr \ + +################################################################################ +## +## Common compiler options +## +################################################################################ + +compiler-options = \ + {include-paths} -enum int -opt all -strings pool -mapcr \ -mpw_pointers -warnings off -fatext -nosyspath -maxerrors 1000 \ -align mac68k -opt off -toc_data on -fp_contract on -sym on \ -model farData @@ -248,10 +259,20 @@ OPTIONS = {INCLUDES} -enum int -opt all -strings pool -mapcr \ ## ################################################################################ -CCAPICFM68K = "/mac/libraries/CCache API/bin/CCacheLib.68K" \ +ccache-cfm68K = \ + "/mac/libraries/CCache API/bin/CCacheLib.68K" \ "/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K" -CCAPICFMPPC = "/mac/libraries/CCache API/bin/CCacheLib.PPC" \ +ccache-ppc = \ + "/mac/libraries/CCache API/bin/CCacheLib.PPC" \ + "/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC" + +ccache-cfm68K-debug = \ + "/mac/libraries/CCache API/bin/CCacheLib.68K.debug" \ + "/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K" + +ccache-ppc-debug = \ + "/mac/libraries/CCache API/bin/CCacheLib.PPC.debug" \ "/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC" ################################################################################ @@ -260,9 +281,9 @@ CCAPICFMPPC = "/mac/libraries/CCache API/bin/CCacheLib.PPC" \ ## ################################################################################ -all : autogenerate-files build build-gss-shlibglue build-k5-shlibglue build-testtrack link glue -libs : {KH68K} {KHPPC} {GSSOBJS68K} {GSSOBJS68KCFM} {GSSOBJSPPC} link -build : build-PPC build-68K build-68KCFM +all : link-all glue +compile : compile-ppc compile-cfm68k compile-cfm-gss \ + compile-cfm-krb5 compile-testtrack ################################################################################ ## @@ -270,21 +291,16 @@ build : build-PPC build-68K build-68KCFM ## ################################################################################ -build-68K : {GSSOBJS68K} {K5OBJS68K} -/bin/68K/ : {SRCDIRS} -.c.68K.o : .c {KH68K} - MWC68K {OPTIONS} -o {TargDir}{Default}.c.68K.o -prefix {KH68K} -model far {DepDir}{Default}.c - -build-68KCFM : {GSSOBJS68KCFM} {K5OBJS68KCFM} -/bin/CFM-68K/ : {SRCDIRS} -.c.CFM68.o : .c {KHCFM-68K} - MWC68K {OPTIONS} -o {TargDir}{Default}.c.CFM68.o -prefix {KHCFM-68K} \ +compile-cfm68k : {autogenerated-files} {gss-obj-cfm68k} {krb5-obj-cfm68k} +/bin/CFM-68K/ : {source-folders} +.c.CFM68.o : .c {autogenerated-files} {kerberos-headers-cfm68k} + MWC68K {compiler-options} -o {TargDir}{Default}.c.CFM68.o -prefix {kerberos-headers-cfm68k} \ -model cfmflat {DepDir}{Default}.c -build-PPC : {GSSOBJSPPC} {K5OBJSPPC} -/bin/PPC/ : {SRCDIRS} -.c.PPC.o : .c {KHPPC} - MWCPPC {OPTIONS} -o {TargDir}{Default}.c.PPC.o -prefix {KHPPC} {DepDir}{Default}.c +compile-ppc : {autogenerated-files} {gss-obj-ppc} {krb5-obj-ppc} +/bin/PPC/ : {source-folders} +.c.PPC.o : .c {autogenerated-files} {kerberos-headers-ppc} + MWCPPC {compiler-options} -o {TargDir}{Default}.c.PPC.o -prefix {kerberos-headers-ppc} {DepDir}{Default}.c ################################################################################ ## @@ -292,23 +308,23 @@ build-PPC : {GSSOBJSPPC} {K5OBJSPPC} ## ################################################################################ -build-gss-shlibglue : {GSSSHLIBOBJ68KCFM} {GSSSHLIBOBJPPC} -{GSSSHLIBOBJ68KCFM} : {GSSSHLIBSRC} {KHCFM-68K} - MWC68K {OPTIONS} -o {GSSSHLIBOBJ68KCFM} -prefix {KHCFM-68K} -model cfmflat {GSSSHLIBSRC} -{GSSSHLIBOBJPPC} : {GSSSHLIBSRC} {KHPPC} - MWCPPC {OPTIONS} -o {GSSSHLIBOBJPPC} -prefix {KHPPC} {GSSSHLIBSRC} +compile-cfm-gss : {cfm-gss-obj-cfm68k} {cfm-gss-obj-ppc} +{cfm-gss-obj-cfm68k} : {autogenerated-files} {cfm-gss-src} {kerberos-headers-cfm68k} + MWC68K {compiler-options} -o {cfm-gss-obj-cfm68k} -prefix {kerberos-headers-cfm68k} -model cfmflat {cfm-gss-src} +{cfm-gss-obj-ppc} : {autogenerated-files} {cfm-gss-src} {kerberos-headers-ppc} + MWCPPC {compiler-options} -o {cfm-gss-obj-ppc} -prefix {kerberos-headers-ppc} {cfm-gss-src} -build-k5-shlibglue : {K5SHLIBOBJ68KCFM} {K5SHLIBOBJPPC} -{K5SHLIBOBJ68KCFM} : {K5SHLIBSRC} {KHCFM-68K} - MWC68K {OPTIONS} -o {K5SHLIBOBJ68KCFM} -prefix {KHCFM-68K} -model cfmflat {K5SHLIBSRC} -{K5SHLIBOBJPPC} : {K5SHLIBSRC} {KHPPC} - MWCPPC {OPTIONS} -o {K5SHLIBOBJPPC} -prefix {KHPPC} {K5SHLIBSRC} +compile-cfm-krb5 : {cfm-krb5-obj-cfm68k} {cfm-krb5-obj-ppc} +{cfm-krb5-obj-cfm68k} : {autogenerated-files} {cfm-krb5-src} {kerberos-headers-cfm68k} + MWC68K {compiler-options} -o {cfm-krb5-obj-cfm68k} -prefix {kerberos-headers-cfm68k} -model cfmflat {cfm-krb5-src} +{cfm-krb5-obj-ppc} : {autogenerated-files} {cfm-krb5-src} {kerberos-headers-ppc} + MWCPPC {compiler-options} -o {cfm-krb5-obj-ppc} -prefix {kerberos-headers-ppc} {cfm-krb5-src} -build-testtrack : {TTOBJ68KCFM} {TTOBJPPC} -{TTOBJ68KCFM} : {TTSRC} {KHCFM-68K} - MWC68K {OPTIONS} -o {TTOBJ68KCFM} -prefix {KHCFM-68K} -model cfmflat {TTSRC} -{TTOBJPPC} : {TTSRC} {KHPPC} - MWCPPC {OPTIONS} -o {TTOBJPPC} -prefix {KHPPC} {TTSRC} +compile-testtrack : {testtrack-obj-cfm68k} {testtrack-obj-ppc} +{testtrack-obj-cfm68k} : {autogenerated-files} {testtrack-src} {kerberos-headers-cfm68k} + MWC68K {compiler-options} -o {testtrack-obj-cfm68k} -prefix {kerberos-headers-cfm68k} -model cfmflat {testtrack-src} +{testtrack-obj-ppc} : {autogenerated-files} {testtrack-src} {kerberos-headers-ppc} + MWCPPC {compiler-options} -o {testtrack-obj-ppc} -prefix {kerberos-headers-ppc} {testtrack-src} ################################################################################ ## @@ -316,47 +332,23 @@ build-testtrack : {TTOBJ68KCFM} {TTOBJPPC} ## ################################################################################ -{KH68K} : {KH}KerberosHeaders.pch {KH}KerberosHeaders.h - MWC68K {KH}KerberosHeaders.pch -precompile {KH68K} {OPTIONS} -i {KH} -{KHCFM-68K} : {KH}KerberosHeaders.pch {KH}KerberosHeaders.h - MWC68K {KH}KerberosHeaders.pch -precompile {KHCFM-68K} {OPTIONS} \ - -i {KH} -model cfmflat -{KHPPC} : {KH}KerberosHeaders.pch {KH}KerberosHeaders.h - MWCPPC {KH}KerberosHeaders.pch -precompile {KHPPC} {OPTIONS} -i {KH} +{kerberos-headers-cfm68k} : {kerberos-headers-root}KerberosHeaders.pch {kerberos-headers-root}KerberosHeaders.h + MWC68K {kerberos-headers-root}KerberosHeaders.pch -precompile {kerberos-headers-cfm68k} {compiler-options} \ + -i {kerberos-headers-root} -model cfmflat +{kerberos-headers-ppc} : {kerberos-headers-root}KerberosHeaders.pch {kerberos-headers-root}KerberosHeaders.h + MWCPPC {kerberos-headers-root}KerberosHeaders.pch -precompile {kerberos-headers-ppc} {compiler-options} -i {kerberos-headers-root} ################################################################################ ## ## Linking ## ################################################################################ +# fixme/ only build PPC for now +# link : link-cfm68k link-ppc link-fat -link : link-68K link-68KCFM link-PPC link-CFMFAT - -################################################################################ -## -## 68K libraries -## -################################################################################ - -link-68K : libkrb5.68K libgss.68K - -# -# static 68K krb5 library -# - -libkrb5.68K libkrb5.68K.MAP :: {AUTOGEN_OUTPUT} {K5OBJS68K} - MWLink68K -library -model far -o libkrb5.68K {K5OBJS68K} -libkrb5.68K :: /mac/version.r - Rez "/mac/version.r" -a -o libkrb5.68K - -# -# static GSS krb5 library -# - -libgss.68K libgss.68K.MAP :: {AUTOGEN_OUTPUT} {GSSOBJS68K} - MWLink68K -library -model far -o libgss.68K {GSSOBJS68K} -libgss.68K :: /mac/version.r - Rez "/mac/version.r" -a -o libgss.68K +link : link-ppc link-fat +link-debug : link-ppc-debug link-fat-debug +link-all : link link-debug ################################################################################ ## @@ -364,34 +356,55 @@ libgss.68K :: /mac/version.r ## ################################################################################ -link-68KCFM : K5Library68K GSSLibrary68K +link-cfm68k : Kerberos5Lib.68K GSSLib.68K +link-cfm68k-debug : Kerberos5Lib.68K.debug GSSLib.68K.debug +link-cmf68k-all : link-cfm68k link-cfm68k-debug # # shared CFM-68K krb5 library # -K5Library68K K5Library68K.MAP :: {AUTOGEN_OUTPUT} /mac/K5Library.exp {K5RTLCFM68K} {K5OBJS68KCFM} {K5SHLIBOBJ68KCFM} {TTOBJ68KCFM} {CCAPICFM68K} +Kerberos5Lib.68K Kerberos5Lib.68K.MAP :: {autogenerated-files} /mac/K5Library.exp {libraries-krb5-cfm68k} {krb5-obj-cfm68k} {cfm-krb5-obj-cfm68k} {testtrack-obj-cfm68k} {ccache-cfm68k} MWLink68K -xm sharedlibrary -name K5Library -m "" \ -model cfmflat -@export "/mac/K5Library.exp" -sym off \ - -map K5Library68K.MAP -o K5Library68K \ + -map Kerberos5Lib.68K -o Kerberos5Lib.68K \ + -init "__initializeK5" -term "__terminateK5" \ + -weakimport /mac/TestTrack/MITAthenaLib -initbefore "MIT_*TestTrackLib" \ + {libraries-krb5-cfm68k} {krb5-obj-cfm68k} {cfm-krb5-obj-cfm68k} {testtrack-obj-cfm68k} {ccache-cfm68k} +Kerberos5Lib.68K :: /mac/version.r + Rez "/mac/version.r" -a -o Kerberos5Lib.68K + +Kerberos5Lib.68K.debug Kerberos5Lib.68K.debug.MAP :: {autogenerated-files} /mac/K5Library.exp {libraries-krb5-cfm68k} {krb5-obj-cfm68k} {cfm-krb5-obj-cfm68k} {testtrack-obj-cfm68k} {ccache-cfm68k-debug} + MWLink68K -xm sharedlibrary -name "MIT_*Kerberos5Lib.debug" -m "" \ + -model cfmflat -@export "/mac/K5Library.exp" -sym off \ + -map Kerberos5Lib.68K -o Kerberos5Lib.68K.debug \ -init "__initializeK5" -term "__terminateK5" \ -weakimport /mac/TestTrack/MITAthenaLib -initbefore "MIT_*TestTrackLib" \ - {K5RTLCFM68K} {K5OBJS68KCFM} {K5SHLIBOBJ68KCFM} {TTOBJ68KCFM} {CCAPICFM68K} -K5Library68K :: /mac/version.r - Rez "/mac/version.r" -a -o K5Library68K + {libraries-krb5-cfm68k} {krb5-obj-cfm68k} {cfm-krb5-obj-cfm68k} {testtrack-obj-cfm68k} {ccache-cfm68k-debug} +Kerberos5Lib.68K.debug :: /mac/version.r + Rez "/mac/version.r" -a -o Kerberos5Lib.68K.debug # # shared CFM-68K GSS library # -GSSLibrary68K GSSLibrary68K.MAP :: {AUTOGEN_OUTPUT} K5Library68K /mac/GSSLibrary.exp {GSSRTLCFM68K} {GSSOBJS68KCFM} {GSSSHLIBOBJ68KCFM} +GSSLib.68K GSSLib.68K.MAP :: {autogenerated-files} Kerberos5Lib.68K /mac/GSSLibrary.exp {libraries-gss-cfm68k} {gss-obj-cfm68k} {cfm-gss-obj-cfm68k} MWLink68K -xm sharedlibrary -name GSSLibrary -m "" \ -model cfmflat -@export "/mac/GSSLibrary.exp" -sym off \ - -map GSSLibrary68K.MAP -o GSSLibrary68K \ + -map GSSLib.68K.MAP -o GSSLib.68K \ + -init "__initializeGSS" -term "__terminateGSS" \ + {libraries-gss-cfm68k} {gss-obj-cfm68k} {cfm-gss-obj-cfm68k} Kerberos5Lib.68K +GSSLib.68K :: /mac/version.r + Rez "/mac/version.r" -a -o GSSLib.68K + +GSSLib.68K.debug GSSLib.68K.debug.MAP :: {autogenerated-files} Kerberos5Lib.68K /mac/GSSLibrary.exp {libraries-gss-cfm68k} {gss-obj-cfm68k} {cfm-gss-obj-cfm68k} + MWLink68K -xm sharedlibrary -name "MIT_*GSSLib.debug" -m "" \ + -model cfmflat -@export "/mac/GSSLibrary.exp" -sym off \ + -map GSSLib.68K.MAP -o GSSLib.68K.debug \ -init "__initializeGSS" -term "__terminateGSS" \ - {GSSRTLCFM68K} {GSSOBJS68KCFM} {GSSSHLIBOBJ68KCFM} K5Library68K -GSSLibrary68K :: /mac/version.r - Rez "/mac/version.r" -a -o GSSLibrary68K + {libraries-gss-cfm68k} {gss-obj-cfm68k} {cfm-gss-obj-cfm68k} Kerberos5Lib.68K +GSSLib.68K :: /mac/version.r + Rez "/mac/version.r" -a -o GSSLib.68K.debug ################################################################################ ## @@ -399,74 +412,97 @@ GSSLibrary68K :: /mac/version.r ## ################################################################################ -link-PPC : libkrb5.PPC K5LibraryPPC libgss.PPC GSSLibraryPPC - -# -# PPC krb5 libraries -# static PPC krb5 library -# - -libkrb5.PPC libkrb5.PPC.MAP :: {AUTOGEN_OUTPUT} {K5OBJSPPC} - MWLinkPPC -library -o libkrb5.PPC {K5OBJSPPC} -libkrb5.PPC :: /mac/version.r - Rez "/mac/version.r" -a -o libkrb5.PPC +link-ppc : Kerberos5Lib.PPC GSSLib.PPC +link-ppc-debug : Kerberos5Lib.PPC.debug GSSLib.PPC.debug +link-ppc-all : link-ppc link-ppc-debug # # shared PPC krb5 library # -K5LibraryPPC K5LibraryPPC.MAP :: {AUTOGEN_OUTPUT} /mac/K5Library.exp {K5RTLCFMPPC} {K5OBJSPPC} {K5SHLIBOBJPPC} {TTOBJPPC} {CCAPICFMPPC} +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} MWLinkPPC -sharedlibrary -name K5Library -m "" \ -@export "/mac/K5Library.exp" -sym on -init "__initializeK5" \ -term "__terminateK5" \ -weakimport /mac/TestTrack/MITAthenaLib -initbefore "MIT_*TestTrackLib" \ - -map K5LibraryPPC.MAP -o K5LibraryPPC \ - {K5RTLCFMPPC} {K5OBJSPPC} {K5SHLIBOBJPPC} {TTOBJPPC} {CCAPICFMPPC} -K5LibraryPPC :: /mac/version.r - Rez "/mac/version.r" -a -o K5LibraryPPC - -# -# PPC GSS libraries -# + -map K5LibraryPPC.MAP -o Kerberos5Lib.PPC \ + {libraries-krb5-ppc} {krb5-obj-ppc} {cfm-krb5-obj-ppc} {testtrack-obj-ppc} {ccache-ppc} +Kerberos5Lib.PPC :: /mac/version.r + Rez "/mac/version.r" -a -o Kerberos5Lib.PPC -# -# static PPC GSS library -# +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} + MWLinkPPC -sharedlibrary -name "MIT_*Kerberos5Lib.debug" -m "" \ + -@export "/mac/K5Library.exp" -sym on -init "__initializeK5" \ + -term "__terminateK5" \ + -weakimport /mac/TestTrack/MITAthenaLib -initbefore "MIT_*TestTrackLib" \ + -map K5LibraryPPC.debug.MAP -o Kerberos5Lib.PPC.debug \ + {libraries-krb5-ppc} {krb5-obj-ppc} {cfm-krb5-obj-ppc} {testtrack-obj-ppc} {ccache-ppc-debug} +Kerberos5Lib.PPC.debug :: /mac/version.r + Rez "/mac/version.r" -a -o Kerberos5Lib.PPC.debug -libgss.PPC libgss.PPC.MAP :: {AUTOGEN_OUTPUT} {GSSOBJSPPC} - MWLinkPPC -library -o libgss.PPC {GSSOBJSPPC} -libgss.PPC :: /mac/version.r - Rez "/mac/version.r" -a -o libgss.PPC # # shared PPC GSS library # -GSSLibraryPPC GSSLibraryPPC.MAP :: {AUTOGEN_OUTPUT} K5LibraryPPC /mac/GSSLibrary.exp {GSSRTLCFMPPC} {GSSOBJSPPC} {GSSSHLIBOBJPPC} +GSSLib.PPC GSSLib.PPC.MAP :: {autogenerated-files} Kerberos5Lib.PPC /mac/GSSLibrary.exp {libraries-gss-ppc} {gss-obj-ppc} {cfm-gss-obj-ppc} MWLinkPPC -sharedlibrary -name GSSLibrary -m "" \ -@export "/mac/GSSLibrary.exp" -sym on -init "__initializeGSS" \ - -term "__terminateGSS" -map GSSLibraryPPC.MAP -o GSSLibraryPPC \ - {GSSRTLCFMPPC} {GSSOBJSPPC} {GSSSHLIBOBJPPC} K5LibraryPPC -GSSLibraryPPC :: /mac/version.r - Rez "/mac/version.r" -a -o GSSLibraryPPC + -term "__terminateGSS" -map GSSLib.PPC.MAP -o GSSLib.PPC \ + {libraries-gss-ppc} {gss-obj-ppc} {cfm-gss-obj-ppc} Kerberos5Lib.PPC +GSSLib.PPC :: /mac/version.r + Rez "/mac/version.r" -a -o GSSLib.PPC + +GSSLib.PPC.debug GSSLib.PPC.debug.MAP :: {autogenerated-files} Kerberos5Lib.PPC.debug /mac/GSSLibrary.exp {libraries-gss-ppc} {gss-obj-ppc} {cfm-gss-obj-ppc} + MWLinkPPC -sharedlibrary -name "MIT_*GSSLib.debug" -m "" \ + -@export "/mac/GSSLibrary.exp" -sym on -init "__initializeGSS" \ + -term "__terminateGSS" -map GSSLib.PPC.debug.MAP -o GSSLib.PPC.debug \ + {libraries-gss-ppc} {gss-obj-ppc} {cfm-gss-obj-ppc} Kerberos5Lib.PPC.debug +GSSLib.PPC.debug :: /mac/version.r + Rez "/mac/version.r" -a -o GSSLib.PPC.debug ################################################################################ ## ## Fat libraries ## ################################################################################ +# fixme/ not really fat, just ppc -link-CFMFAT : GSSLib +link-fat : GSSLib +link-fat-debug : GSSLib.debug +link-fat-all :Êlink-fat link-fat-debug -GSSLib : GSSLibraryPPC K5LibraryPPC GSSLibrary68K K5Library68K +GSSLib : GSSLib.PPC Kerberos5Lib.PPC {ccache-ppc} # GSSLib.68K Kerberos5Lib.68K {ccache-cfm68k} Delete -i GSSLib - Duplicate -y GSSLibraryPPC GSSLib - MergeFragment GSSLibrary68K GSSLib + Duplicate -y GSSLib.PPC GSSLib +# MergeFragment GSSLib.68K GSSLib MergeFragment "/bin/MIT CLib.PPC" GSSLib MergeFragment "/bin/MIT RuntimeLib.PPC" GSSLib - MergeFragment K5LibraryPPC GSSLib - MergeFragment K5Library68K GSSLib - MergeFragment "/bin/MIT CLib.68K" GSSLib - MergeFragment "/bin/MIT RuntimeLib.68K" GSSLib + MergeFragment Kerberos5Lib.PPC GSSLib +# MergeFragment Kerberos5Lib.68K GSSLib +# MergeFragment "/bin/MIT CLib.68K" GSSLib +# MergeFragment "/bin/MIT RuntimeLib.68K" GSSLib +# MergeFragment "/mac/libraries/CCache API/bin/CCacheLib.68K" GSSLib +# MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K" GSSLib + MergeFragment "/mac/libraries/CCache API/bin/CCacheLib.PPC" GSSLib + MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC" GSSLib + DeRez -only "'cfrg'(0)" GSSLib "{RIncludes}"CodeFragments.r | StreamEdit -s /mac/FragmentAlias.mpw | Rez -a -o GSSLib -i "{RIncludes}" + + +GSSLib.debug : GSSLib.PPC.debug Kerberos5Lib.PPC.debug {ccache-ppc-debug} # GSSLib.68K.debug Kerberos5Lib.68K.debug {ccache-cfm68k-debug} + Delete -i GSSLib.debug + Duplicate -y GSSLib.PPC.debug GSSLib.debug +# MergeFragment GSSLib.68K.debug GSSLib.debug + MergeFragment "/bin/MIT CLib.PPC" GSSLib.debug + MergeFragment "/bin/MIT RuntimeLib.PPC" GSSLib.debug + MergeFragment Kerberos5Lib.PPC.debug GSSLib.debug +# MergeFragment Kerberos5Lib.68K.debug GSSLib.debug +# MergeFragment "/bin/MIT CLib.68K" GSSLib.debug +# MergeFragment "/bin/MIT RuntimeLib.68K" GSSLib.debug +# MergeFragment "/mac/libraries/CCache API/bin/CCacheLib.68K.debug" GSSLib.debug +# MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K" GSSLib + MergeFragment "/mac/libraries/CCache API/bin/CCacheLib.PPC.debug" GSSLib.debug + MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC" GSSLib.debug + DeRez -only "'cfrg'(0)" GSSLib.debug "{RIncludes}"CodeFragments.r | StreamEdit -s /mac/FragmentAlias.mpw | Rez -a -o GSSLib.debug -i "{RIncludes}" ################################################################################ ## @@ -477,11 +513,11 @@ GSSLib : GSSLibraryPPC K5LibraryPPC GSSLibrary68K K5Library68K # This target punts things that get created during an MPW build clean : autogenerate-clean glue-clean - Delete -i {GSSOBJS68K} {GSSOBJSPPC} {GSSOBJS68KCFM} \ - {K5OBJS68K} {K5OBJSPPC} {K5OBJS68KCFM} \ - {KH68K} {KHPPC} {KHCFM-68K} \ - {GSSSHLIBOBJ68KCFM} {GSSSHLIBOBJPPC} \ - {K5SHLIBOBJ68KCFM} {K5SHLIBOBJPPC} + Delete -i {gss-obj-cfm68k} {gss-obj-ppc} \ + {krb5-obj-cfm68k} {krb5-obj-ppc} \ + {kerberos-headers-cfm68k} {kerberos-headers-ppc} \ + {cfm-gss-obj-cfm68k} {cfm-gss-obj-ppc} \ + {cfm-krb5-obj-cfm68k} {cfm-krb5-obj-ppc} # This target also punts everything that gets created in other ways during normal # build process (CW files etc) @@ -492,11 +528,9 @@ dist-clean : clean "/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 GSSLib GSSLibraryPPC GSSLibrary68K K5LibraryPPC K5Library68K \ - GSSLibrary68K.MAP GSSLibrary68K.SYM GSSLibraryPPC.MAP GSSLibraryPPC.xSYM \ - K5Library68K.MAP K5Library68K.SYM K5LibraryPPC.MAP K5LibraryPPC.xSYM \ - libkrb5.68K libgss.68K libkrb5.PPC libgss.PPC \ - "MSL C.PPC.DLL" "MSL C.CFM68K.DLL" "MSL RuntimePPC.DLL" "MSL RuntimeCFM68K.DLL" \ + 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 \ /mac/libraries/KerberosHeaders.pch.68k.o /mac/libraries/KerberosHeaders.pch.ppc.o \ Makefile @@ -506,10 +540,10 @@ dist-clean : clean ## ################################################################################ -AUTOMACFILES = `perl "/mac/macfile_gen.pl" maclist` -AUTOMACDIRS = `perl "/mac/macfile_gen.pl" macdirs` +mac-files = `perl "/mac/macfile_gen.pl" maclist` +mac-folders = `perl "/mac/macfile_gen.pl" macdirs` -MACFILES = {AUTOMACFILES} {GLUE_INPUT} /Makefile.in /patchlevel.h \ +all-mac-files = {mac-files} {glue-input} {autogeneration-sources} /Makefile.in /patchlevel.h \ /util/et/et_h.perl /util/et/et_c.perl \ /mac/GSS.CFM.c \ /mac/GSSLibrary.exp \ @@ -521,32 +555,6 @@ MACFILES = {AUTOMACFILES} {GLUE_INPUT} /Makefile.in /patchlevel.h \ /mac/Makefile.tmpl \ /mac/ReadMe \ /mac/version.r \ - /mac/kconfig/ChangeLog \ - /mac/kconfig/des_cornell.c \ - /mac/kconfig/desproto.h \ - /mac/kconfig/dnr.c \ - /mac/kconfig/encrypt.h \ - /mac/kconfig/getpasswd.c \ - /mac/kconfig/glue.h \ - /mac/kconfig/k.bw \ - /mac/kconfig/k.color \ - /mac/kconfig/kadm.c \ - /mac/kconfig/kadm.h \ - /mac/kconfig/kadm.proto.h \ - /mac/kconfig/kconfig.c \ - /mac/kconfig/kconfig.h \ - /mac/kconfig/kconfig.proto.h \ - /mac/kconfig/kconfig.r \ - /mac/kconfig/kconfig.rsrc \ - /mac/kconfig/kconfig.vers \ - /mac/kconfig/kconfig.prj \ - /mac/kconfig/kpasswd.c \ - /mac/kconfig/ldef.c \ - /mac/kconfig/MakeFile \ - /mac/kconfig/ReleaseNotes \ - /mac/kconfig/WindowUtil.c \ - /mac/kconfig/WindowUtil.h \ - /mac/kconfig/WindowUtil.proto.h \ /mac/libraries/autoconf.h \ /mac/libraries/ChangeLog \ /mac/libraries/KerberosHeaders.h \ @@ -563,6 +571,8 @@ MACFILES = {AUTOMACFILES} {GLUE_INPUT} /Makefile.in /patchlevel.h \ "/mac/libraries/CCache API/include/CCache.h" \ "/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K" \ "/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC" \ + "/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K.debug" \ + "/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC.debug" \ "/mac/libraries/CCache API/bin/CCacheLib.68K" \ "/mac/libraries/CCache API/bin/CCacheLib.PPC" \ /mac/TestTrack/ChangeLog \ @@ -573,8 +583,8 @@ MACFILES = {AUTOMACFILES} {GLUE_INPUT} /Makefile.in /patchlevel.h \ /mac/TestTrack/TestTrackLib.h \ /mac/TestTrack/testtrack.h \ /mac/templatify.pl -MACDIRS = /config/ /include/ /include/krb5/ /include/krb5/stock/ \ - /include/sys/ /lib/ /lib/krb5/ /lib/gssapi/ /util/ {AUTOMACDIRS} \ +all-mac-folders = /config/ /include/ /include/krb5/ /include/krb5/stock/ \ + /include/sys/ /lib/ /lib/krb5/ /lib/gssapi/ /util/ {mac-folders} \ /mac/ \ /mac/kconfig/ \ /mac/libraries/ \ @@ -586,18 +596,18 @@ MACDIRS = /config/ /include/ /include/krb5/ /include/krb5/stock/ \ /mac/testtrack/ snapshot : autogenerate-clean - NewFolder {SnapshotRoot} - For SnapshotDir in {MacDirs} - NewFolder "{SnapshotRoot}{SnapshotDir}" - if "`Exists {TargDir}"{SnapshotDir}Makefile.in"`" - Duplicate -y {TargDir}"{SnapshotDir}Makefile.in" {SnapshotRoot}"{SnapshotDir}Makefile.in" - SetFile -a l {SnapshotRoot}"{SnapshotDir}Makefile.in" + NewFolder {snapshot-root} + For shapshot-folder in {all-mac-dirs} + NewFolder "{snapshot-root}{shapshot-folder}" + if "`Exists {TargDir}"{shapshot-folder}Makefile.in"`" + Duplicate -y {TargDir}"{shapshot-folder}Makefile.in" {snapshot-root}"{shapshot-folder}Makefile.in" + SetFile -a l {snapshot-root}"{shapshot-folder}Makefile.in" end end - For SnapshotFile in {MacFiles} {Autogen_Sources} - if "`Exists {TargDir}"{SnapshotFile}"`" - Duplicate -y {TargDir}"{SnapshotFile}" {SnapshotRoot}"{SnapshotFile}" - SetFile -a l {SnapshotRoot}"{SnapshotFile}" + For snapshot-file in {all-mac-files} + if "`Exists {TargDir}"{snapshot-file}"`" + Duplicate -y {TargDir}"{snapshot-file}" {snapshot-root}"{snapshot-file}" + SetFile -a l {snapshot-root}"{snapshot-file}" end end diff --git a/src/mac/ReadMe b/src/mac/ReadMe index 763e519c5..5ac70a0c7 100644 --- a/src/mac/ReadMe +++ b/src/mac/ReadMe @@ -59,13 +59,6 @@ To build the Macintosh version of Kerberos 5 and GSS: has been fixed. If this happens to you, you should restart MPW and start the build again, and report the problem to macdev@mit.edu. ---- Building the Cygnus Network Security Application --- - - 10) Open the project file "[krb5 src]:mac:kconfig:kconfig.prj" in the - CodeWarrior Pro 2 IDE. - - 11) Select "Make" from the "Project" menu. - --- Binaries --- The following assumes that you have followed the steps above to build @@ -93,21 +86,6 @@ To build the Macintosh version of Kerberos 5 and GSS: :K5LibraryPPC * CFM Shared Library including Kerberos 5 for PowerPC Macs. - :libgss.68K - * Static CodeWarrior library including GSS for 68k Macs - - :libgss.PPC - * Static CodeWarrior library including GSS for PowerPC Macs - - :libkrb5.68K - * Static CodeWarrior library including Kerberos 5 for 68k Macs - - :libkrb5.PPC - * Static CodeWarrior library including Kerberos 5 for PowerPC Macs - - :mac:kconfig:CNS Config - * Kerberos 5 Ticket Manager (aka Cygnus Network Security Configuration) application - :mac:krb5.ini * Sample krb5.ini file using CYGNUS.COM as the default realm @@ -128,9 +106,6 @@ To build the Macintosh version of Kerberos 5 and GSS: the CFM-68K Runtime Enabler 4.0, available from Apple at: - - 4) Put the "CNS Config" application in a handy location. - --- Getting Started Programming --- @@ -159,7 +134,7 @@ To build the Macintosh version of Kerberos 5 and GSS: - (This document was created from tex files in the main krb5 source tree.) + (That document was created from tex files in the main Kerberos 5 source tree.) The GSSAPI is described in Internet RFC's 1508 and 1509: diff --git a/src/mac/macfile_gen.pl b/src/mac/macfile_gen.pl index a99d0fe59..fc5a620e7 100644 --- a/src/mac/macfile_gen.pl +++ b/src/mac/macfile_gen.pl @@ -8,7 +8,7 @@ if (defined ($ENV{'KERBSRCROOT'})) } # if we get "maclist" as a command line argument, print out a -# list of files we need. Else, generate a makefile. +# list of files we need. if (defined($ARGV[0]) && $ARGV[0] eq "maclist") { @@ -41,28 +41,27 @@ print(STDERR "Creating makefile.\n"); $MAKEFILE=&chew_on_filename("Makefile"); &delete_file("Makefile") && print(STDERR "Old makefile ($MAKEFILE) deleted.\n"); open(MF, ">".&chew_on_filename("Makefile")) || die "Can't open Makefile for writing"; -print(MF "SRCS = ", join(" ", @MACSRCS), "\n\n"); +print(MF "sources = ", join(" ", @MACSRCS), "\n\n"); @MFSRCD=grep(s/(.*:)[^:]*\.c$/$1/, ©_array(@MACLIST)); @MFSRCD=&uniq(sort(@MFSRCD)); -print(MF "SRCDIRS = @MFSRCD\n\n"); +print(MF "source-folders = @MFSRCD\n\n"); @MACSRCSGSS=grep(s/.*://, @MACSRCSGSS); @MACSRCSK5=grep(s/.*://, @MACSRCSK5); -for $A (0..2) +for $A (0..1) { - @ARCH=('68K', '68K', '68K') if $A==0; - @ARCH=('68KCFM', 'CFM68', 'CFM-68K') if $A==1; - @ARCH=('PPC', 'PPC', 'PPC') if $A==2; + @ARCH=('cfm68k', 'CFM68', 'CFM-68K') if $A==0; + @ARCH=('ppc', 'PPC', 'PPC') if $A==1; - print MF "GSSOBJS$ARCH[0] = "; + print MF "gss-obj-$ARCH[0] = "; for $SRC (@MACSRCSGSS) { print(MF ":bin:$ARCH[2]:$SRC.$ARCH[1].o "); } print(MF "\n\n"); - print MF "K5OBJS$ARCH[0] = "; + print MF "krb5-obj-$ARCH[0] = "; for $SRC (@MACSRCSK5) { print(MF ":bin:$ARCH[2]:$SRC.$ARCH[1].o "); @@ -71,7 +70,7 @@ for $A (0..2) } @HEADERS=grep(s/(.*:)[^:]*\.h$/ -i $1/, @MACLIST); -print(MF "AUTOINCLUDES = ", &uniq(sort(@HEADERS)), "\n"); +print(MF "autogenerated-include-paths = ", &uniq(sort(@HEADERS)), "\n"); print(MF "\n# TEMPLATE BEGINS HERE\n\n"); diff --git a/src/mac/version.r b/src/mac/version.r index 855ebb5f4..387d71fca 100644 --- a/src/mac/version.r +++ b/src/mac/version.r @@ -7,10 +7,10 @@ #endif resource 'vers' (1) { - 0x01, 0x10, alpha, 0x01, + 0x01, 0x10, alpha, 0x03, verUS, - "1.1a1", - "1.1a1, Copyright 1996-1998 Massachusetts Institute of Technology" + "1.1a3", + "1.1a3, Copyright 1996-1998 Massachusetts Institute of Technology" }; resource 'vers' (2) { -- 2.26.2