From 755d43c1be6a14f364955df7cd8576c8e01774e3 Mon Sep 17 00:00:00 2001 From: Miro Jurisic Date: Thu, 27 May 1999 19:55:53 +0000 Subject: [PATCH] Merged Sockets support git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11478 dc483132-0cff-0310-8789-dd5450dbe970 --- src/mac/Makefile | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/src/mac/Makefile b/src/mac/Makefile index b2c688885..28c0e3782 100644 --- a/src/mac/Makefile +++ b/src/mac/Makefile @@ -3,6 +3,7 @@ ############################################################################################################## root-folder = :: +mitsupportlib-root-folder = {root-folder}:::MITSupportLib: makefile-name = {root-folder}mac:Makefile library-output-folder = {root-folder}bin: @@ -374,6 +375,16 @@ ccache-68k-debug = {root-folder} ccache-ppc-final = {root-folder}¶"mac:libraries:CCache API:bin:CCacheLib.PPC¶" ccache-68k-final = {root-folder}¶"mac:libraries:CCache API:bin:CCacheLib.68K¶" +sockets-ppc-debug = {mitsupportlib-root-folder}SocketsLib:Binaries:SocketsLib.PPC.debug +sockets-68k-debug = {mitsupportlib-root-folder}SocketsLib:Binaries:SocketsLib.68K.debug +sockets-ppc-final = {mitsupportlib-root-folder}SocketsLib:Binaries:SocketsLib.PPC +sockets-68k-final = {mitsupportlib-root-folder}SocketsLib:Binaries:SocketsLib.68K + +errorlib-ppc-debug = {mitsupportlib-root-folder}ErrorLib:Binaries:ErrorLib.PPC.debug +errorlib-68k-debug = {mitsupportlib-root-folder}ErrorLib:Binaries:ErrorLib.68K.debug +errorlib-ppc-final = {mitsupportlib-root-folder}ErrorLib:Binaries:ErrorLib.PPC +errorlib-68k-final = {mitsupportlib-root-folder}ErrorLib:Binaries:ErrorLib.68K + object-suffix-ppc-debug = .ppcd.o object-suffix-68k-debug = .68kd.o object-suffix-ppc-final = .ppcf.o @@ -397,18 +408,26 @@ gss-library-libraries-68k-final = krb5-library-libraries-ppc-debug = ¶ {standard-libraries-ppc-debug} ¶ {ccache-ppc-debug} ¶ + {sockets-ppc-debug} ¶ + {errorlib-ppc-debug} ¶ {krb5-globals-library-output-folder}{krb5-globals-library-name}{library-platform-ppc}{library-kind-debug} krb5-library-libraries-68k-debug = ¶ {standard-libraries-68k-debug} ¶ {ccache-68k-debug} ¶ + {sockets-68k-debug} ¶ + {errorlib-68k-debug} ¶ {krb5-globals-library-output-folder}{krb5-globals-library-name}{library-platform-68k}{library-kind-debug} krb5-library-libraries-ppc-final = ¶ {standard-libraries-ppc-final} ¶ {ccache-ppc-final} ¶ + {sockets-ppc-final} ¶ + {errorlib-ppc-final} ¶ {krb5-globals-library-output-folder}{krb5-globals-library-name}{library-platform-ppc}{library-kind-final} krb5-library-libraries-68k-final = ¶ {standard-libraries-68k-final} ¶ {ccache-68k-final} ¶ + {sockets-68k-final} ¶ + {errorlib-68k-final} ¶ {krb5-globals-library-output-folder}{krb5-globals-library-name}{library-platform-68k}{library-kind-final} krb5-globals-library-libraries-ppc-debug = ¶ @@ -519,9 +538,15 @@ ppc-compiler-options = debug-compiler-options = -sym on final-compiler-options = -sym off +mitsupportlib-include-paths = ¶ + -i {mitsupportlib-root-folder}SocketsLib:Headers: ¶ + -i {mitsupportlib-root-folder}ErrorLib:Headers: ¶ + -i {mitsupportlib-root-folder}UtilitiesLib:Headers: + include-paths = `catenate {include-folders-list}` ¶ - -i {root-folder}mac:libraries:¶"CCache API¶":include ¶ - -i {krb5-globals-root-folder} + -i {root-folder}mac:libraries:¶"CCache API¶":include: ¶ + -i {krb5-globals-root-folder} ¶ + {mitsupportlib-include-paths} compiler-options-ppc-debug = {include-paths} {common-compiler-options} {ppc-compiler-options} ¶ {debug-compiler-options} -prefix {precompiled-headers-ppc} @@ -546,11 +571,11 @@ precompiled-headers-source = {precompiled-headers-folder}KerberosHeaders.pch {precompiled-headers-ppc} Ä {precompiled-headers-source} {precompiled-headers-folder}KerberosHeaders.h {compiler-ppc} {precompiled-headers-source} {common-compiler-options} {ppc-compiler-options} ¶ - -precompile {Targ} -i {precompiled-headers-folder} + -precompile {Targ} -i {precompiled-headers-folder} {mitsupportlib-include-paths} {precompiled-headers-68k} Ä {precompiled-headers-source} {precompiled-headers-folder}KerberosHeaders.h {compiler-68k} {precompiled-headers-source} {common-compiler-options} {68k-compiler-options} ¶ - -precompile {Targ} -i {precompiled-headers-folder} + -precompile {Targ} -i {precompiled-headers-folder} {mitsupportlib-include-paths} make-options-common = ¶ -f {makefile-name} ¶ @@ -942,7 +967,7 @@ gss-krb5-library-debug gss-krb5-library Ä Delete -i {target} - Rez {root-folder}"version.r" -a -o {target} + Rez "{root-folder}mac:version.r" -a -o {target} MergeFragment -x -z {fragments} {target} SetFile {target} -c gss-krb5-library-creator -t 'shlb' DeRez -only "'cfrg'(0)" {target} "{RIncludes}"CodeFragments.r | StreamEdit -s {root-folder}FragmentAlias.mpw | Rez -a -o {target} -i "{RIncludes}" -- 2.26.2