Added classic 68K glue directives to the Makefile template

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

diff --git a/src/mac/Makefile.tmpl b/src/mac/Makefile.tmpl
index fae07093644d83f1acfcdb03a052df139bf118df..80b7ef279638d3bb074544cc698057f21176b943 100644 (file)
--- a/src/mac/Makefile.tmpl
+++ b/src/mac/Makefile.tmpl
@@ -2,79 +2,6 @@ SnapshotRoot = //GSS-Kerberos5-1.0.5
 
 INCLUDES = {AUTOINCLUDES} -i /mac/TestTrack/
 
-AUTOMACFILES = `perl "/mac/macfile_gen.pl" maclist`
-AUTOMACDIRS = `perl "/mac/macfile_gen.pl" macdirs`
-
-MACFILES = {AUTOMACFILES} /Makefile.in /patchlevel.h \
-       /util/et/et_h.perl /util/et/et_c.perl \
-       /mac/GSS.CFM.c \
-       /mac/GSSLibrary.exp \
-       /mac/GSSLibrary.SAP.exp \
-       /mac/K5.CFM.c \
-       /mac/K5Library.exp \
-       /mac/krb5.ini \
-       /mac/macfile_gen.pl \
-       /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 \
-       /mac/libraries/KerberosHeaders.pch \
-       /mac/libraries/KerberosHeadersCFM.pch \
-       "/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/TestTrack/ChangeLog \
-       /mac/TestTrack/GSSforSAP.r \
-       /mac/TestTrack/MITAthenaLib \
-       /mac/TestTrack/ShlibTestTrack.c \
-       /mac/TestTrack/ShlibTestTrack.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} \
-       /mac/ \
-       /mac/kconfig/ \
-       /mac/libraries/ \
-       /mac/libraries/Metrowerks/ \
-       "/mac/libraries/Metrowerks/CW Pro 2/" \
-       /mac/testtrack/
-
-
-
 ################################################################################
 ##
 ## Creating build directories
@@ -95,6 +22,22 @@ create-directories :
                NewFolder /bin/CFM-68K
        End
        
+################################################################################
+##
+## Autogenerating classic 68K glue files
+##
+################################################################################
+
+glue : /mac/K5.CFMglue.c /mac/GSS.CFMglue.c
+
+/mac/K5.CFMglue.c : /mac/K5.CFMglue.cin /mac/K5.CFMglue.proto.h /mac/K5.CFMglue.c /mac/K5.moreCFMglue.cin
+       perl /mac/CFMGlue.pl < /mac/K5.CFMglue.proto.h > /mac/K5.CFMglue.c
+       Catenate /mac/K5.CFMglue.cin /mac/CFMglue.c /mac/K5.CFMglue.c /mac/K5.moreCFMglue.cin | Catenate > /mac/K5.CFMglue.c
+
+/mac/GSS.CFMglue.c : /mac/GSS.CFMglue.cin /mac/GSS.CFMglue.proto.h /mac/GSS.CFMglue.c /mac/GSS.moreCFMglue.cin
+       perl /mac/CFMGlue.pl < /mac/GSS.CFMglue.proto.h > /mac/GSS.CFMglue.c
+       Catenate /mac/GSS.CFMglue.cin /mac/CFMglue.c /mac/GSS.CFMglue.c /mac/GSS.moreCFMglue.cin | Catenate > /mac/GSS.CFMglue.c
+
 ################################################################################
 ##
 ## Autogenerating header and source files
@@ -299,7 +242,7 @@ OPTIONS = {INCLUDES} -enum int -opt all -strings pool -mapcr \
 ##
 ################################################################################
 
-all : autogenerate-files build build-gss-shlibglue build-k5-shlibglue build-testtrack link
+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
 
@@ -539,6 +482,83 @@ dist-clean : clean
                /mac/libraries/KerberosHeaders.pch.68k.o /mac/libraries/KerberosHeaders.pch.ppc.o \
                Makefile
                
+################################################################################
+##
+## Snapshot
+##
+################################################################################
+
+AUTOMACFILES = `perl "/mac/macfile_gen.pl" maclist`
+AUTOMACDIRS = `perl "/mac/macfile_gen.pl" macdirs`
+
+MACFILES = {AUTOMACFILES} {GLUE_INPUT} /Makefile.in /patchlevel.h \
+       /util/et/et_h.perl /util/et/et_c.perl \
+       /mac/GSS.CFM.c \
+       /mac/GSSLibrary.exp \
+       /mac/GSSLibrary.SAP.exp \
+       /mac/K5.CFM.c \
+       /mac/K5Library.exp \
+       /mac/krb5.ini \
+       /mac/macfile_gen.pl \
+       /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 \
+       /mac/libraries/KerberosHeaders.pch \
+       /mac/libraries/KerberosHeadersCFM.pch \
+       "/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/TestTrack/ChangeLog \
+       /mac/TestTrack/GSSforSAP.r \
+       /mac/TestTrack/MITAthenaLib \
+       /mac/TestTrack/ShlibTestTrack.c \
+       /mac/TestTrack/ShlibTestTrack.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} \
+       /mac/ \
+       /mac/kconfig/ \
+       /mac/libraries/ \
+       /mac/libraries/Metrowerks/ \
+       "/mac/libraries/Metrowerks/CW Pro 2/" \
+       /mac/testtrack/
+
 snapshot : autogenerate-clean
        NewFolder {SnapshotRoot}
        For SnapshotDir in {MacDirs}
@@ -556,111 +576,3 @@ snapshot : autogenerate-clean
        end
        
 
-# clean-mit :
-#      Delete -i {GSSOBJ68KCFM-TT} {GSSOBJPPC-TT}
-       
-################################################################################
-##
-## MIT specific (TestTrack) versions
-## We are not building these right now because we folded TestTrack into
-## main library, weak-linked
-##
-################################################################################
-
-#
-# TestTrack sources
-#
-
-# SRCS-TT = /mac/TestTrack/mitTestTrackGlue.c
-
-#
-# TestTrack objects
-#
-
-# GSSOBJ68KCFM-TT = /bin/CFM-68K/mitTestTrackGlue.c.68K.o
-# GSSOBJPPC-TT = /bin/PPC/mitTestTrackGlue.c.PPC.o
-
-#
-# TestTrack includes
-#
-
-# INCLUDES-TT = -i /mac/TestTrack/ 
-
-#
-# TestTrack compiler options
-#
-
-# OPTIONS-TT = {INCLUDES-TT} {INCLUDES} -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 fullpath
-
-################################################################################
-##
-## TestTrack rules
-##
-################################################################################
-
-# all-mit : build-testtrack link-testtrack
-
-# build-testtrack : build-68KCFM build-PPC build-testtrackglue
-
-# build-testtrackglue : {GSSOBJ68KCFM-TT} {GSSOBJPPC-TT}
-# {GSSOBJ68KCFM-TT} : {SRCS-TT} {KHCFM-68K}
-#      MWC68K {OPTIONS-TT} -o {GSSOBJ68KCFM-TT} -prefix {KHCFM-68K} \
-#              -model cfmflat {SRCS-TT}
-# {GSSOBJPPC-TT} : {SRCS-TT} {KHPPC}
-#      MWCPPC {OPTIONS-TT} -o "/bin/PPC/" -prefix {KHPPC} {SRCS-TT}
-
-################################################################################
-##
-## TestTrack linking
-##
-################################################################################
-
-# link-testtrack : link-68KCFM-TT link-PPC-TT link-CFMFAT-TT
-
-################################################################################
-## 
-## CFM-68K TestTrack
-##
-################################################################################
-
-# link-68KCFM-TT : GSSLibraryMIT.68K
-# GSSLibraryMIT.68K GSSLibraryMIT.68K.MAP :: /mac/GSSLibrary.TT.exp {GSSRTLCFM68K} {GSSOBJ68KCFM-TT} /mac/TestTrack/MITAthenaLib {GSSOBJS68KCFM}
-#      MWLink68K -xm sharedlibrary -name GSSLibrary -m "" \
-#              -model cfmflat -@export "/mac/GSSLibrary.TT.exp" \
-#              -init "__initializeTTglue" -term "__terminateTTglue" \
-#              -sym fullpath -map GSSLibraryMIT.68K.MAP -o GSSLibraryMIT.68K \
-#              {GSSRTLCFM68K} \
-#              {GSSOBJ68KCFM-TT} -weakimport /mac/TestTrack/MITAthenaLib -initbefore "MIT_*TestTrackLib68K" \
-#              {GSSOBJS68KCFM}
-# GSSLibraryMIT.68K :: /mac/version.r
-#      Rez "/mac/version.r" -a -o GSSLibraryMIT.68K
-
-################################################################################
-##
-## PPC TestTrack
-##
-################################################################################
-
-# link-PPC-TT : GSSLibraryMIT.PPC
-# GSSLibraryMIT.PPC GSSLibraryMIT.PPC.MAP :: /mac/GSSLibrary.TT.exp {GSSRTLCFMPPC} {GSSOBJPPC-TT} /mac/TestTrack/MITAthenaLib {GSSOBJSPPC}
-#      MWLinkPPC -sharedlibrary -name GSSLibrary -m "" \
-#              -@export "/mac/GSSLibrary.TT.exp" \
-#              -init "__initializeTTglue" -term "__terminateTTglue" \
-#              -sym fullpath -map GSSLibraryMIT.PPC.MAP -o GSSLibraryMIT.PPC \
-#              {GSSRTLCFMPPC} \
-#              {GSSOBJPPC-TT} -weakimport /mac/TestTrack/MITAthenaLib -initbefore "MIT_*TestTrackLib" \
-#              {GSSOBJSPPC}
-# GSSLibraryMIT.PPC :: /mac/version.r
-#      Rez "/mac/version.r" -a -o GSSLibraryMIT.PPC
-
-################################################################################
-##
-## Fat TestTrack
-##
-################################################################################
-
-# link-CFMFAT-TT : GSSLibMIT
-# GSSLibMIT : GSSLibraryMIT.68K GSSLibraryMIT.PPC
-#      Duplicate -y GSSLibraryMIT.68K GSSLibMIT