Folded in danw's changes to allow building Makefiles for the

Macintosh.  We now can build MPW makefiles which are interpreted by
CodeWarrior.

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

24 files changed, 154 insertions, 10 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e63fa073b..8038c4f71 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb  7 00:22:26 1996  Theodore Y. Ts'o  <tytso@dcl>
+
+	* Makefile.in (krbsrc.mac): Folded in danw's changes to allow
+		building Makefiles for the Macintosh.  We now can build
+		MPW makefiles which are interpreted by CodeWarrior.
+
 Mon Jan 22 07:55:04 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* aclocal.m4 (KRB5_CHECK_PROTOS): Move prototype checking code
diff --git a/src/Makefile.in b/src/Makefile.in
index 0449a50f3..1b13ec2cd 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -198,7 +198,9 @@ FILES= ./* \
 WINFILES= windows/* windows/cns/* windows/wintel/* windows/gss/*
 
 MACFILES= mac/* mac/kconfig/* mac/libraries/* mac/telnet-k5-auth/* \
-	mac/gss-sample/*
+	mac/gss-sample/* config/* include/* include/krb5/* \
+	include/krb5/asn.1/* include/krb5/stock/* include/sys/* \
+	./patchlevel.h
 
 WINBINARYFILES=windows/cns/*.ico windows/wintel/*.ico windows/gss/*.ico
 
@@ -219,9 +221,11 @@ winfile.list:
 	echo $(FILES) $(WINFILES) | tr ' ' \\012 | \
 		sed -f config/winexclude.sed > winfile.list
 
+MAC_SUBDIRS = lib util
 macfile.list:
-	 find $(FILES) $(MACFILES) -prune -type f -print | \
-		sed -f config/winexclude.sed > macfile.list
+	mac/macfiles.sh $(MAC_SUBDIRS) > macfile.list
+	find $(MACFILES) -prune -type f -print | \
+		sed -f config/winexclude.sed >> macfile.list
 
 Makefile.sav:
 	rm -f Makefile.sav
@@ -252,11 +256,27 @@ dos-zipfiles: Makefile.sav awk-windows-mac winfile.list
 	mv Makefile.sav Makefile
 	rm -f $(CLEANUP)
 
-kerbsrc.mac: awk-windows-mac macfile.list 
+Macfile: macfile.list Makefile.sav
+	rm -f Macfile
+	sed -e 's|/|:|g' -e 's/^/:/' -e '/:.:/d' -e '/:mac:/d' macfile.list > macfile.maclist
+	grep '\.c$$' macfile.maclist > macsrcsgss
+	grep -v ':gssapi:' macsrcsgss > macsrcsk5
+	echo SRCS = `cat macsrcsgss` >> Macfile
+	echo GSSOBJS68K = `sed 's/$$/.68K.o/' macsrcsgss` >> Macfile
+	echo GSSOBJSPPC = `sed 's/$$/.PPC.o/' macsrcsgss` >> Macfile
+	echo K5OBJS68K = `sed 's/$$/.68K.o/' macsrcsk5` >> Macfile
+	echo K5OBJSPPC = `sed 's/$$/.PPC.o/' macsrcsk5` >> Macfile
+	echo INCLUDES = `sed -n -e 's/\(.*:\)[^:]*\.h$$/-i \1/p' macfile.maclist | sort -u` >> Macfile
+	echo "" >> Macfile
+	tr '/:\\' ':\304\266'< mac/Makefile.tmpl >> Macfile
+
+kerbsrc.mac: awk-windows-mac macfile.list Macfile
 	cp mac/libraries/autoconf.h include/autoconf.h
-	tar cvf kerbsrc.tar include/autoconf.h `cat macfile.list`
+	mv Macfile Makefile
+	tar cvf kerbsrc.tar Makefile include/autoconf.h `cat macfile.list`
 	rm -f $(CLEANUP)
-	rm -f include/autoconf.h
+	rm -f include/autoconf.h Makefile macsrc* macfile.maclist
+	mv Makefile.sav Makefile
 
 #
 # Part of building the PC release has to be done on Unix. This includes
diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index 014fd18fc..3b2859d9d 100644
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb  7 00:23:18 1996  Theodore Y. Ts'o  <tytso@dcl>
+
+	* Makefile.in: Folded in danw's changes to allow
+		building Makefiles for the Macintosh.  We now can build
+		MPW makefiles which are interpreted by CodeWarrior.
+
 Sun Dec  3 11:50:09 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* configure.in: Move krb5 before krb4 and add krb5util.
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index cac3eb4ca..9688e6c58 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -3,6 +3,8 @@ CFLAGS = $(CCOPTS) $(DEFS)
 ##DOSBUILDTOP = ..
 ##DOS!include $(BUILDTOP)\config\windows.in
 
+MAC_SUBDIRS = crypto krb5 gssapi kadm
+
 all-unix::
 
 all-mac::
diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index 298030de3..e72ad10b1 100644
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb  7 00:23:18 1996  Theodore Y. Ts'o  <tytso@dcl>
+
+	* Makefile.in: Folded in danw's changes to allow
+		building Makefiles for the Macintosh.  We now can build
+		MPW makefiles which are interpreted by CodeWarrior.
+
 Mon Nov 13 11:30:10 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* encrypt_data.c (krb5_encrypt_data): New file.  A generic routine
diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index a58563ddc..5cb619e0e 100644
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -3,6 +3,8 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/crc32 -I$(srcdir)/des -I$(srcdir)/md4 -I$
 ##DOSBUILDTOP = ..\..
 ##DOSLIBNAME=crypto.lib
 
+MAC_SUBDIRS = des md4 md5 crc32 os
+
 TST=if test -n "`cat DONE`" ; then
 
 .c.o:
diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index 03f7bfe63..931bd9a29 100644
--- a/src/lib/gssapi/ChangeLog
+++ b/src/lib/gssapi/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb  7 00:23:18 1996  Theodore Y. Ts'o  <tytso@dcl>
+
+	* Makefile.in: Folded in danw's changes to allow
+		building Makefiles for the Macintosh.  We now can build
+		MPW makefiles which are interpreted by CodeWarrior.
+
 Fri Jan 26 01:55:14 1996  Sam Hartman  <hartmans@tertius.mit.edu>
 
 	* configure.in: Fix path to library from lib
diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index 08f51292b..9973353ec 100644
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -2,6 +2,8 @@ TST=if test -n "`cat DONE`" ; then
 
 ##DOSBUILDTOP = ..\..
 
+MAC_SUBDIRS = generic krb5 mechglue
+
 CRYPTO_VER=@CRYPTO_SH_VERS@
 COMERR_VER=@COMERR_SH_VERS@
 KRB5_VER=@KRB5_SH_VERS@
diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index e7bdf4fee..1f442097d 100644
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb  7 00:23:18 1996  Theodore Y. Ts'o  <tytso@dcl>
+
+	* Makefile.in: Folded in danw's changes to allow
+		building Makefiles for the Macintosh.  We now can build
+		MPW makefiles which are interpreted by CodeWarrior.
+
 Sat Jan 27 18:25:42 1996  Sam Hartman  <hartmans@tertius.mit.edu>
 
 	* configure.in (hashloc): Fix quoting so it makes it into the Makefile.
diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index 1b993c025..e6356db24 100644
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -5,6 +5,8 @@ ANAME_DBLIB=@ANAME_DBLIB@
 
 TST=if test -n "`cat DONE`" ; then
 
+MAC_SUBDIRS = error_tables asn.1 ccache keytab krb rcache free os posix 
+
 LIB_SUBDIRS= error_tables asn.1 ccache ccache/stdio ccache/file ccache/memory \
 	keytab keytab/file krb rcache free os posix \
         $(BUILDTOP)/util/profile
diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog
index 09d37294f..b6fc5319c 100644
--- a/src/lib/krb5/asn.1/ChangeLog
+++ b/src/lib/krb5/asn.1/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb  7 00:23:18 1996  Theodore Y. Ts'o  <tytso@dcl>
+
+	* Makefile.in: Folded in danw's changes to allow
+		building Makefiles for the Macintosh.  We now can build
+		MPW makefiles which are interpreted by CodeWarrior.
+
 Wed Nov  8 20:00:13 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* asn1_k_decode.c (asn1_decode_etype_info_entry): If the optional
diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in
index e880bcead..034566e70 100644
--- a/src/lib/krb5/asn.1/Makefile.in
+++ b/src/lib/krb5/asn.1/Makefile.in
@@ -12,7 +12,7 @@ EHDRDIR=$(BUILDTOP)/include/krb5/asn.1
 SRCS= \
 	$(srcdir)asn1_decode.c\
 	$(srcdir)asn1_k_decode.c\
-	$(srcdir)asn1_ncode.c\
+	$(srcdir)asn1_encode.c\
 	$(srcdir)asn1_get.c\
 	$(srcdir)asn1_make.c\
 	$(srcdir)asn1buf.c\
diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index cbc2ce995..a19a75ef9 100644
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb  7 00:23:18 1996  Theodore Y. Ts'o  <tytso@dcl>
+
+	* Makefile.in: Folded in danw's changes to allow
+		building Makefiles for the Macintosh.  We now can build
+		MPW makefiles which are interpreted by CodeWarrior.
+
 Fri Nov  3 21:12:31 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* configure.in: Added memory subdirectory
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index 94f6bec58..db6e6efb3 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -3,6 +3,8 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)$(S)file -I$(srcdir)$(S)stdio
 ##DOSBUILDTOP = ..\..\..
 ##DOSLIBNAME=..\krb5.lib
 
+MAC_SUBDIRS = file stdio
+
 .c.o:
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
 @SHARED_RULE@
diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog
index 7b9d0ec3c..e90e44101 100644
--- a/src/lib/krb5/keytab/ChangeLog
+++ b/src/lib/krb5/keytab/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb  7 00:23:18 1996  Theodore Y. Ts'o  <tytso@dcl>
+
+	* Makefile.in: Folded in danw's changes to allow
+		building Makefiles for the Macintosh.  We now can build
+		MPW makefiles which are interpreted by CodeWarrior.
 
 Wed Dec 13 07:09:30 1995  Chris Provenzano (proven@mit.edu)
 
diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in
index f072f2a19..cdf7a5060 100644
--- a/src/lib/krb5/keytab/Makefile.in
+++ b/src/lib/krb5/keytab/Makefile.in
@@ -3,6 +3,8 @@ CFLAGS = $(CCOPTS) $(DEFS)
 ##DOSBUILDTOP = ..\..\..
 ##DOSLIBNAME=..\krb5.lib
 
+MAC_SUBDIRS = file
+
 .c.o:
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
 @SHARED_RULE@
diff --git a/src/lib/krb5/posix/ChangeLog b/src/lib/krb5/posix/ChangeLog
index 9bd9e30f3..db85eeef1 100644
--- a/src/lib/krb5/posix/ChangeLog
+++ b/src/lib/krb5/posix/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb  7 00:23:18 1996  Theodore Y. Ts'o  <tytso@dcl>
+
+	* Makefile.in: Folded in danw's changes to allow
+		building Makefiles for the Macintosh.  We now can build
+		MPW makefiles which are interpreted by CodeWarrior.
+
 Wed Jan  3 22:25:52 1996  Theodore Y. Ts'o  <tytso@dcl>
 
 	* configure.in: Check for presense of setenv(), unsetenv(), and
diff --git a/src/lib/krb5/posix/Makefile.in b/src/lib/krb5/posix/Makefile.in
index 30e73beaf..c056c0cc9 100644
--- a/src/lib/krb5/posix/Makefile.in
+++ b/src/lib/krb5/posix/Makefile.in
@@ -7,6 +7,8 @@ CFLAGS = $(CCOPTS) $(DEFS)
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
 @SHARED_RULE@
 
+MACSRCS = getuid.c strcasecmp.c strdup.c
+
 OBJS = setenv.$(OBJEXT)	@LIBOBJS@
 
 all-unix:: shared $(OBJS)
diff --git a/src/mac/Makefile.tmpl b/src/mac/Makefile.tmpl
new file mode 100644
index 000000000..0639f5d41
--- /dev/null
+++ b/src/mac/Makefile.tmpl
@@ -0,0 +1,35 @@
+KH = /mac/libraries/
+KH68K = {KH}KerberosHeaders68K
+KHPPC = {KH}KerberosHeadersPPC
+
+OPTIONS = {INCLUDES} -enum int -opt all -strings pool -mapcr \
+	-mpw_pointers -warnings off -fatext -nosyspath -maxerrors 1000
+
+all : build link
+
+libs : {KH68K} {KHPPC} {GSSOBJS68K} {GSSOBJSPPC} link
+
+build : {KH68K} {KHPPC}
+	MWC68K {OPTIONS} -prefix {KH68K} -model far {SRCS}
+	MWCPPC {OPTIONS} -prefix {KHPPC} {SRCS}
+
+.c.68K.o : .c
+	MWC68K {DepDir}{Default}.c {OPTIONS} -prefix {KH68K} -model far
+
+.c.PPC.o : .c
+	MWCPPC {DepDir}{Default}.c {OPTIONS} -prefix {KHPPC}
+
+{KH}68K : {KH}.pch
+	MWC68K {KH}KerberosHeaders.pch -precompile {KH68K} {OPTIONS} -i {KH}
+
+{KH}PPC : {KH}.pch
+	MWCPPC {KH}KerberosHeaders.pch -precompile {KH}PPC {OPTIONS} -i {KH}
+
+link :
+	MWLink68K -library -model far -o libkrb5.68K {K5OBJS68K}
+	MWLinkPPC -library -model far -o libkrb5.PPC {K5OBJSPPC}
+	MWLink68K -library -model far -o libgss.68K {GSSOBJS68K}
+	MWLinkPPC -library -model far -o libgss.PPC {GSSOBJSPPC}
+
+clean :
+	Delete -i {GSSOBJS68K} {GSSOBJSPPC}
diff --git a/src/mac/macfiles.sh b/src/mac/macfiles.sh
new file mode 100644
index 000000000..1e334b291
--- /dev/null
+++ b/src/mac/macfiles.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+for DIR do
+  for SDIR in `sed -n -e 's/MAC_SUBDIRS.*=//p' $DIR/Makefile.in`; do
+    awk '/SRCS?[ 	]*=/, /[^\\]$/' $DIR/$SDIR/Makefile.in | \
+      tr ' 	' '\012\012' | sed -n -e 's|.*[/)]\([A-Za-z0-9_]*\.c\).*|\1|' -e 's|\(.*\.c\)|'$DIR/$SDIR'/\1|p';
+    ls -1 $DIR/$SDIR/*.h 2> /dev/null
+    mac/macfiles.sh $DIR/$SDIR;
+  done
+done
diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index 02900c09f..cec08c883 100644
--- a/src/util/ChangeLog
+++ b/src/util/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb  7 00:26:47 1996  Theodore Y. Ts'o  <tytso@dcl>
+
+	* Makefile.in: Folded in danw's changes to allow
+		building Makefiles for the Macintosh.  We now can build
+		MPW makefiles which are interpreted by CodeWarrior.
+
 Thu Nov  2 17:05:05 1995    <tytso@rsx-11.mit.edu>
 
 	* makeshlib.sh: Added support for Linux shared libraries.
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 0f97db02b..1d0a278d2 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -1,5 +1,7 @@
 CFLAGS = $(CCOPTS)
 
+MAC_SUBDIRS = profile et
+
 editsh = sed -e 's,@''ARADD''@,$(ARADD),g' -e 's,@''ARCHIVE''@,$(ARCHIVE),g'
 HOST_TYPE=@HOST_TYPE@
 HAVE_GCC=@HAVE_GCC@
diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog
index 33949aa05..c8051e539 100644
--- a/src/util/et/ChangeLog
+++ b/src/util/et/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb  7 00:19:17 1996  Theodore Y. Ts'o  <tytso@dcl>
+
+	* Makefile.in (CCFILES): Checked in danw's changes to support
+		building Makefiles for the Macintosh; use standard SRCS
+		macro for the source files.
+
 Fri Oct  6 22:06:48 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* Makefile.in: Remove ##DOS!include of config/windows.in.
diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in
index f39cb9b32..193f34fc2 100644
--- a/src/util/et/Makefile.in
+++ b/src/util/et/Makefile.in
@@ -25,11 +25,9 @@ FILES=	Makefile et_name.c error_message.c compile_et.c \
 		test_et.c test1.et test2.et \
 		compiler.h internal.h \
 		com_err.texinfo texinfo.tex
-CFILES=	compile_et.c error_table.c error_message.c et_name.c \
+SRCS=	compile_et.c error_table.c error_message.c et_name.c \
 	init_et.c com_err.c
 
-SRCS=$(CFILES)
-
 DEPLIBS=
 SHLIB_LIBS=
 SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@