Purge make targets and variables (and a few files) relating to the old,

unmaintained Mac OS 9 (and earlier) support.

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

50 files changed, 99 insertions, 636 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 39efad33b..5385ae13e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (MACFILES, MAC_SUBDIRS): Don't set.
+	(macfile.list, mac-bin-dirs, krbsrc.mac.tar, Macfile, all-mac,
+	clean-mac): Target deleted.
+	(CLEANUP): Remove macfile.list.
+
 2004-06-08  Ken Raeburn  <raeburn@mit.edu>
 
 	* aclocal.m4 (CONFIG_RULES): Don't set AUTOCONF, AUTOCONFFLAGS,
diff --git a/src/Makefile.in b/src/Makefile.in
index 2510f13fe..41017bfed 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -23,8 +23,6 @@ all-prerecurse: update-autoconf-h
 update-autoconf-h:
 	(cd include && $(MAKE) krb5/autoconf.h)
 
-all-mac::
-
 all-windows:: maybe-awk Makefile-windows
 	@echo Making in util
 	cd util
@@ -83,7 +81,6 @@ TAGS: $(SRCS)
 	etags $(SRCS)
 
 clean-:: clean-windows
-clean-mac:: clean-unix
 clean-unix::
 	$(RM) *.o core krb5-config
 
@@ -346,10 +343,6 @@ FILES= ./* \
 WINFILES= util/windows/* windows/* windows/lib/* windows/cns/* \
 	windows/wintel/* windows/gss/* windows/gina/* windows/ms2mit/*
 
-MACFILES= mac/* mac/libraries/* config/* include/* \
-	include/krb5/* include/krb5/stock/* include/sys/* \
-	./patchlevel.h
-
 WINBINARYFILES=	windows/*/*.ico windows/*/*.doc windows/*/*.hlp \
 	windows/*/*.hpj windows/lib/*.lib
 
@@ -383,7 +376,7 @@ HOUT =	$(INC)krb5.h $(GG)gssapi.h $(PR)profile.h
 
 CLEANUP= Makefile $(ETOUT) $(HOUT) \
 	include/profile.h include/krb5/osconf.h \
-	winfile.list macfile.list
+	winfile.list
 
 
 kerbsrc.win: kerbsrc.zip
@@ -392,12 +385,6 @@ winfile.list:
 	echo $(FILES) $(WINFILES) | tr ' ' \\012 | \
 		sed -f config/winexclude.sed > winfile.list
 
-MAC_SUBDIRS = lib util
-macfile.list:
-	/bin/sh mac/macfiles.sh $(MAC_SUBDIRS) > macfile.list
-	find $(MACFILES) -prune -type f -print | \
-		sed -f config/winexclude.sed >> macfile.list
-
 dos-Makefile:
 	cat config/win-pre.in Makefile.in config/win-post.in | \
 		sed -e "s/^##DOS##//" -e "s/^##DOS//" > Makefile.tmp
@@ -428,45 +415,6 @@ kerbsrc-nt-is-obsolete:
 	@echo "anymore, so what was kerbsrc-nt.zip is now kerbsrc.zip."
 	@echo " "
 
-Macfile: macfile.list 
-	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 SRCDIRS = `sed -n -e 's/\(.*:\)[^:]*\.c$$/ \1/p' macfile.maclist | sort -u` >> Macfile
-	echo GSSOBJS68K = `sed -e 's/$$/.68K.o/' -e 's/.*://' \
-		-e 's/^/:bin:68K:/' macsrcsgss` >> Macfile
-	echo GSSOBJS68KCFM = `sed -e 's/$$/.CFM68.o/' -e 's/.*://' \
-		-e 's/^/:bin:CFM-68K:/' macsrcsgss` >> Macfile
-	echo GSSOBJSPPC = `sed -e 's/$$/.PPC.o/' -e 's/.*://' \
-		-e 's/^/:bin:PPC:/' macsrcsgss` >> Macfile
-	echo K5OBJS68K = `sed -e 's/$$/.68K.o/' -e 's/.*://' \
-		-e 's/^/:bin:68K:/' macsrcsk5` >> Macfile
-	echo K5OBJS68KCFM = `sed -e 's/$$/.CFM68.o/' -e 's/.*://' \
-		-e 's/^/:bin:CFM-68K:/' macsrcsk5` >> Macfile
-	echo K5OBJSPPC = `sed -e 's/$$/.PPC.o/' -e 's/.*://' \
-		-e 's/^/:bin:PPC:/' macsrcsk5` >> Macfile
-	echo INCLUDES = `sed -n -e 's/\(.*:\)[^:]*\.h$$/-i \1/p' macfile.maclist | sort -u` >> Macfile
-	echo "" >> Macfile
-	tr '@/:\\' '\245:\304\266'< mac/Makefile.tmpl >> Macfile
-
-mac-bin-dirs:
-	rm -rf bin
-	mkdir bin bin/68K bin/CFM-68K bin/PPC
-	sh mac/mkbindirs.sh bin/68K $(MAC_SUBDIRS)
-	sh mac/mkbindirs.sh bin/CFM-68K $(MAC_SUBDIRS)
-	sh mac/mkbindirs.sh bin/PPC $(MAC_SUBDIRS)
-
-kerbsrc.mac.tar: awk-windows-mac macfile.list mac-bin-dirs Macfile
-	cp mac/libraries/autoconf.h include/autoconf.h
-	mv Macfile Makefile
-	tar cvf kerbsrc.mac.tar Makefile include/autoconf.h bin \
-		`cat macfile.list`
-	rm -f $(CLEANUP)
-	rm -rf bin
-	rm -f include/autoconf.h Makefile macsrc* macfile.maclist
-
 $(INC)asn1_err.h: $(AH) $(ET)asn1_err.et
 	$(AWK) -f $(AH) outfile=$@ $(ET)asn1_err.et
 $(INC)kdb5_err.h: $(AH) $(ET)kdb5_err.et
diff --git a/src/clients/kdestroy/ChangeLog b/src/clients/kdestroy/ChangeLog
index 7fdc1ac70..17a82afb7 100644
--- a/src/clients/kdestroy/ChangeLog
+++ b/src/clients/kdestroy/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (all-mac): Target deleted.
+
 2002-08-29  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in: Revert $(S)=>/ change, for Windows support.
diff --git a/src/clients/kdestroy/Makefile.in b/src/clients/kdestroy/Makefile.in
index dab795aff..353535822 100644
--- a/src/clients/kdestroy/Makefile.in
+++ b/src/clients/kdestroy/Makefile.in
@@ -8,7 +8,6 @@ PROG_RPATH=$(KRB5_LIBDIR)
 
 all-unix:: kdestroy
 all-windows:: $(OUTPRE)kdestroy.exe
-all-mac::
 
 kdestroy: kdestroy.o $(KRB4COMPAT_DEPLIBS)
 	$(CC_LINK) -o $@ kdestroy.o $(KRB4COMPAT_LIBS)
diff --git a/src/clients/kinit/ChangeLog b/src/clients/kinit/ChangeLog
index bf365e02f..e595c7a3a 100644
--- a/src/clients/kinit/ChangeLog
+++ b/src/clients/kinit/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (all-mac): Target deleted.
+
 2003-08-01  Tom Yu  <tlyu@mit.edu>
 
 	* kinit.c (main): Apply patch from Stephen Grau to correctly
diff --git a/src/clients/kinit/Makefile.in b/src/clients/kinit/Makefile.in
index 1d2a6e436..dbdf2714c 100644
--- a/src/clients/kinit/Makefile.in
+++ b/src/clients/kinit/Makefile.in
@@ -11,7 +11,6 @@ PROG_RPATH=$(KRB5_LIBDIR)
 
 all-unix:: kinit
 all-windows:: $(OUTPRE)kinit.exe
-all-mac::
 
 kinit: kinit.o $(KRB4COMPAT_DEPLIBS)
 	$(CC_LINK) -o $@ kinit.o $(KRB4COMPAT_LIBS)
diff --git a/src/clients/klist/ChangeLog b/src/clients/klist/ChangeLog
index 494fe74c9..0e56fb68c 100644
--- a/src/clients/klist/ChangeLog
+++ b/src/clients/klist/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (all-mac): Target deleted.
+
 2003-07-27  Sam Hartman  <hartmans@mit.edu>
 
 	* klist.M : Note that -s can return non-zero if credentials are
diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in
index b4a86133f..8725090aa 100644
--- a/src/clients/klist/Makefile.in
+++ b/src/clients/klist/Makefile.in
@@ -8,8 +8,6 @@ PROG_RPATH=$(KRB5_LIBDIR)
 
 all-unix:: klist
 all-windows:: $(OUTPRE)klist.exe
-all-mac::
-
 
 klist: klist.o $(KRB4COMPAT_DEPLIBS)
 	$(CC_LINK) -o $@ klist.o $(KRB4COMPAT_LIBS)
diff --git a/src/clients/kvno/ChangeLog b/src/clients/kvno/ChangeLog
index 6751eb67a..8ad50fc20 100644
--- a/src/clients/kvno/ChangeLog
+++ b/src/clients/kvno/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (all-mac): Target deleted.
+
 2002-08-29  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in: Revert $(S)=>/ change, for Windows support.
diff --git a/src/clients/kvno/Makefile.in b/src/clients/kvno/Makefile.in
index 09215940d..69c92bd2a 100644
--- a/src/clients/kvno/Makefile.in
+++ b/src/clients/kvno/Makefile.in
@@ -8,7 +8,6 @@ PROG_RPATH=$(KRB5_LIBDIR)
 
 all-unix:: kvno
 all-windows:: $(OUTPRE)kvno.exe
-all-mac::
 
 kvno: kvno.o $(KRB4COMPAT_DEPLIBS)
 	$(CC_LINK) -o $@ kvno.o $(KRB4COMPAT_LIBS)
diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 73b0437a2..fbbe3f70a 100644
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* mac-config.README, mac-config.cache, mac-mf.sed, mac-post.in,
+	mac-pre.in: Files deleted.
+
 2004-06-08  Ken Raeburn  <raeburn@mit.edu>
 
 	* pre.in (AUTOCONF, AUTOHEADER): Always set to autoconf and
diff --git a/src/config/mac-config.README b/src/config/mac-config.README
deleted file mode 100644
index 6fb2cc030..000000000
--- a/src/config/mac-config.README
+++ /dev/null
@@ -1,11 +0,0 @@
-# mac-config.cache is a:
-#
-# CUSTOMIZED, HAND-BUILT CONFIGURE CACHE FOR BUILDING ON MACINTOSH UNDER MPW
-# Built by John Gilmore, Cygnus Support, 22 Feb 95.
-#
-# These comments are not in mac-config.cache itself because 
-# mac-config.cache needs to have no extraneous comments, so that `configure'
-# doesn't think that the file differs from the current settings of
-# all the cached autoconf state variables.  This allows `configure' to
-# know that the config.cache doesn't need updating after every time configure
-# is run.
diff --git a/src/config/mac-config.cache b/src/config/mac-config.cache
deleted file mode 100644
index a2d914ce0..000000000
--- a/src/config/mac-config.cache
+++ /dev/null
@@ -1,153 +0,0 @@
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-: ${ac_cv_c_const='no'}
-: ${ac_cv_c_cross='no'}
-: ${ac_cv_func_cfsetispeed='no'}
-: ${ac_cv_func_cgetent='no'}
-: ${ac_cv_func_daemon='no'}
-: ${ac_cv_func_dbm_open='no'}
-: ${ac_cv_func_flock='no'}
-: ${ac_cv_func_ftime='no'}
-: ${ac_cv_func_getcwd='no'}
-: ${ac_cv_func_getdtablesize='no'}
-: ${ac_cv_func_getopt='no'}
-: ${ac_cv_func_getpid='no'}
-: ${ac_cv_func_gettosbyname='no'}
-: ${ac_cv_func_getuid='no'}
-: ${ac_cv_func_getutent='no'}
-: ${ac_cv_func_grantpt='no'}
-: ${ac_cv_func_herror='no'}
-: ${ac_cv_func_initgroups='no'}
-: ${ac_cv_func_killpg='no'}
-: ${ac_cv_func_labs='no'}
-: ${ac_cv_func_line_push='no'}
-: ${ac_cv_func_memmove='yes'}
-: ${ac_cv_func_ptsname='no'}
-: ${ac_cv_func_setenv='no'}
-: ${ac_cv_func_setpriority='no'}
-: ${ac_cv_func_setresuid='no'}
-: ${ac_cv_func_setreuid='no'}
-: ${ac_cv_func_setsid='no'}
-: ${ac_cv_func_setupterm='no'}
-: ${ac_cv_func_setutent='no'}
-: ${ac_cv_func_setutxent='no'}
-: ${ac_cv_func_setvbuf='yes'}
-: ${ac_cv_func_sigprocmask='no'}
-: ${ac_cv_func_sigsetjmp='no'}
-: ${ac_cv_func_srand='yes'}
-: ${ac_cv_func_srand48='no'}
-: ${ac_cv_func_srandom='no'}
-: ${ac_cv_func_strcasecmp='no'}
-: ${ac_cv_func_strdup='no'}
-: ${ac_cv_func_strerror='yes'}
-: ${ac_cv_func_strftime='yes'}
-: ${ac_cv_func_strsave='no'}
-: ${ac_cv_func_tcsetattr='no'}
-: ${ac_cv_func_timezone='no'}
-: ${ac_cv_func_updwtmp='no'}
-: ${ac_cv_func_updwtmpx='no'}
-: ${ac_cv_func_utimes='no'}
-: ${ac_cv_func_vfork='no'}
-: ${ac_cv_func_vfprintf='yes'}
-: ${ac_cv_func_vhangup='no'}
-: ${ac_cv_func_vsprintf='yes'}
-: ${ac_cv_func_vsyslog='no'}
-: ${ac_cv_func_waitpid='no'}
-: ${ac_cv_header_alloca_h='no'}
-: ${ac_cv_header_dirent_h='yes'}
-: ${ac_cv_header_flock_h='no'}
-: ${ac_cv_header_lastlog_h='yes'}
-: ${ac_cv_header_macsock_h='yes'}
-: ${ac_cv_header_netinet_in_h='yes'}
-: ${ac_cv_header_paths_h='no'}
-: ${ac_cv_header_stdarg_h='yes'}
-: ${ac_cv_header_stdc='no'}
-: ${ac_cv_header_stdlib_h='yes'}
-: ${ac_cv_header_string_h='yes'}
-: ${ac_cv_header_strings_h='yes'}
-: ${ac_cv_header_sys_file_h='no'}
-: ${ac_cv_header_sys_filio_h='no'}
-: ${ac_cv_header_sys_label_h='no'}
-: ${ac_cv_header_sys_param_h='no'}
-: ${ac_cv_header_sys_ptyvar_h='no'}
-: ${ac_cv_header_sys_select_h='no'}
-: ${ac_cv_header_sys_sockio_h='no'}
-: ${ac_cv_header_sys_stat_h='no'}
-: ${ac_cv_header_sys_stream_h='no'}
-: ${ac_cv_header_sys_time_h='no'}
-: ${ac_cv_header_sys_timeb_h='no'}
-: ${ac_cv_header_sys_tty_h='no'}
-: ${ac_cv_header_sys_types_h='no'}
-: ${ac_cv_header_termios_h='no'}
-: ${ac_cv_header_time='yes'}
-: ${ac_cv_header_ttyent_h='no'}
-: ${ac_cv_header_unistd_h='no'}
-: ${ac_cv_header_utmpx_h='no'}
-: ${ac_cv_header_vfork_h='no'}
-: ${ac_cv_lib_BSD='no'}
-: ${ac_cv_lib_dbm='no'}
-: ${ac_cv_lib_l='no'}
-: ${ac_cv_lib_ndbm='no'}
-: ${ac_cv_lib_nsl='no'}
-: ${ac_cv_lib_odm='no'}
-: ${ac_cv_lib_socket='no'}
-: ${ac_cv_lib_termcap='no'}
-: ${ac_cv_lib_util='no'}
-: ${ac_cv_path_UCB_RCP='/usr/ucb/rcp'}
-: ${ac_cv_path_UCB_RLOGIN='/usr/ucb/rlogin'}
-: ${ac_cv_path_UCB_RSH='/usr/ucb/rsh'}
-: ${ac_cv_path_install='/usr/bin/install -c'}
-: ${ac_cv_prog_ARADD='ar cruv'}
-: ${ac_cv_prog_ARCHIVE='ar qv'}
-: ${ac_cv_prog_AWK='gawk'}
-: ${ac_cv_prog_CPP='cc -E'}
-: ${ac_cv_prog_LEX='lex'}
-: ${ac_cv_prog_LN_S='ln -s'}
-: ${ac_cv_prog_RANLIB='ranlib'}
-: ${ac_cv_prog_YACC='bison -y'}
-: ${ac_cv_sizeof_int='4'}
-: ${ac_cv_sizeof_long='4'}
-: ${ac_cv_sizeof_short='2'}
-: ${ac_cv_type_mode_t='no'}
-: ${ac_cv_type_pid_t='no'}
-: ${ac_cv_type_signal='void'}
-: ${ac_cv_type_size_t='yes'}
-: ${ac_cv_type_uid_t='no'}
-: ${krb5_cv_decl_errlist='no'}
-: ${krb5_cv_decl_fcntl_ordonly='no'}
-: ${krb5_cv_decl_perror='no'}
-: ${krb5_cv_f_setown='no'}
-: ${krb5_cv_func_sigprocmask_use='no'}
-: ${krb5_cv_getpgrp_args='pid'}
-: ${krb5_cv_has_ansi_stdio='no'}
-: ${krb5_cv_has_ansi_volatile='no'}
-: ${krb5_cv_has_posix_signals='no'}
-: ${krb5_cv_has_prototypes='yes'}
-: ${krb5_cv_has_streams='no'}
-: ${krb5_cv_has_void_type='yes'}
-: ${krb5_cv_setenv='no'}
-: ${krb5_cv_setpgrp_args='two'}
-: ${krb5_cv_shadow_pwd='no'}
-: ${krb5_cv_struct_flock='no'}
-: ${krb5_cv_struct_prototypes='no'}
-: ${krb5_cv_struct_sigjmp_buf='no'}
-: ${krb5_cv_struct_ut_exit='no'}
-: ${krb5_cv_struct_ut_host='no'}
-: ${krb5_cv_struct_ut_pid='no'}
-: ${krb5_cv_struct_ut_type='no'}
-: ${krb5_cv_struct_wait='no'}
-: ${krb5_cv_sys_setpgrp_two='no'}
-: ${krb5_cv_type_sigset_t='no'}
-: ${krb5_cv_type_yylineno='no'}
diff --git a/src/config/mac-mf.sed b/src/config/mac-mf.sed
deleted file mode 100644
index 5a44424fc..000000000
--- a/src/config/mac-mf.sed
+++ /dev/null
@@ -1,170 +0,0 @@
-# Rewrite default rules from .c.o:  to  .c.o: .c
-/^\./s/^\(\.[a-z]*\)\(\.[a-z]*\)\( *: *\)$/\1\2\3 \1/
-
-# Change dependency char.
-/::/s/::/ \\Option-f\\Option-f /g
-/:/s/:/ \\Option-f /g
-/^[CSU]=/s/ \\Option-f /:/g
-
-# Change syntax of Makefile vars.
-/\$/s/\${\([a-zA-Z0-9_]*\)}/{\1}/g
-/\$/s/\$(\([a-zA-Z0-9_]*\))/{\1}/g
-
-# Change $@ to {targ}
-/\$@/s/\$@/{targ}/g
-
-# Change pathname syntax.
-#
-# If line ends with ..  then assume it sets a variable that will
-# be used to prefix something else -- eliminate one colon, assuming
-# that a slash after the ${name} will turn into the missing colon.
-# Mac pathname conventions are IRREGULAR and UGLY!
-/\./s,\.\./\.\.$,::,
-/\./s,\.\.$,:,
-# Same if it ends with  .  (a single dot); turn it into nothing.
-/\./s,\.$,,g
-# Rules for .. and . elsewhere in the line
-# Convert ../: to ::, recur to get whole paths.
-/\./s,\.\./:,::,g
-/\./s,\.\./:,::,g
-/\./s,\.\./:,::,g
-/\./s,\.\./:,::,g
-# Convert ../../ to ::: 
-/\./s,\.\./\.\./,:::,g
-# Convert /../ to ::
-/\./s,/\.\./,::,g
-# Convert ../ to ::
-/\./s,\.\./,::,g
-# Convert ..; to ::;
-/\./s,\.\.;,::;,g
-# Convert /./ to :
-/\.\//s,/\./,:,g
-# Convert ./ to :
-/\.\//s,\./,:,g
-# All other slashes turn into colons.
-/\//s,/,:,g
-
-/=/s/ = \.$/ = :/
-
-# Comment out any explicit srcdir setting.
-# /srcdir/s/^srcdir/# srcdir/
-
-/version/s/^version=/# version=/
-
-/BASEDIR/s/^BASEDIR =.*$/BASEDIR = "{srcroot}"/
-/{BASEDIR}:/s/{BASEDIR}:/{BASEDIR}/g
-# The original lines screw up -I$(srcdir)/../des  by eliminating a colon.
-# Proposed fix:  Eliminate srcdir prefixes totally; rplc by colon for
-# current directory.
-#/{srcdir}:/s/{srcdir}:/"{srcdir}"/g
-# $(srcdir)/../foo turns to ::foo.
-/{srcdir}:/s/{srcdir}::/::/g
-# $(srcdir)/bar turns to :bar.
-/{srcdir}:/s/{srcdir}:/:/g
-#/"{srcdir}":/s/"{srcdir}":/"{srcdir}"/g
-
-# Comment out settings of anything set by mpw host config.
-##/CC/s/^CC *=/#CC =/
-##/CFLAGS/s/^CFLAGS *=/#CFLAGS =/
-##/LDFLAGS/s/^LDFLAGS *=/#LDFLAGS =/
-
-# Change -I usage.
-/-I/s/-I\./-i :/g
-/-I/s/-I::bfd/-i ::bfd:/g
-/-I/s/-I::include/-i ::include:/g
-/-I/s/-I/-i /g
-
-# Change -D usage.
-/-D/s/\([ =]\)-D\([^ ]*\)/\1-d \2/g
-
-# Change continuation char.
-/\\$/s/\\$/\\Option-d/
-
-# Change wildcard char.
-/^[^#]/s/\*/\\Option-x/g
-
-# Change path of various types of source files.
-#/\.[chly]/s/\([ 	><=]\)\([-a-zA-Z0-9_$:"]*\)\.\([chly]\)/\1"{s}"\2.\3/g
-#/\.[chly]/s/^\([-a-zA-Z0-9_${}:"]*\)\.\([chly]\)/"{s}"\1.\2/g
-# Skip the {s} and {o} business for now...
-# Fix some overenthusiasms.
-#/{s}/s/"{s}""{srcdir}"/"{srcdir}"/g
-#/{s}/s/"{s}"{\([a-zA-Z0-9_]*\)dir}/"{\1dir}"/g
-#/{s}/s/"{s}"{\([a-zA-Z0-9_]*\)DIR}/"{\1DIR}"/g
-#/{s}/s/"{s}""{\([a-zA-Z0-9_]*\)dir}"/"{\1dir}"/g
-#/{s}/s/"{s}""{\([a-zA-Z0-9_]*\)DIR}"/"{\1DIR}"/g
-#/{s}/s/"{s}":/:/g
-#/{s}/s/^"{s}"//g
-#/^\./s/"{s}"\././g
-
-# Change extension and path of objects, except in the OBJEXT line.
-#/^OBJEXT/!s/\([ 	=]\)\([-a-zA-Z0-9_${}:"]*\)\.o/\1"{o}"\2.c.o/g
-#/\.o/s/^\([-a-zA-Z0-9_${}:"]*\)\.o/"{o}"\1.c.o/g
-# Skip the {o} stuff for now...
-/^OBJEXT/!s/\([ 	=]\)\([-a-zA-Z0-9_${}:"]*\)\.o/\1\2.c.o/g
-/\.o/s/^\([-a-zA-Z0-9_${}:"]*\)\.o/\1.c.o/g
-# Clean up.
-#/\.o/s/"{o}""{o}"/"{o}"/g
-#/{o}/s/^"{o}"\([a-zA-Z0-9_]*\)=/\1=/g
-
-# Change extension of libs.
-# /\.a/s/lib\([a-z]*\)\.a/lib\1.o/g
-
-# Remove non-echo option.
-/^	-/s/^	-/	/
-
-# Change cp to duplicate.
-# /cp/s/^\([ 	]*\)cp /\1Duplicate -d -y /
-# Change mv to rename.
-# /mv/s/^\([ 	]*\)mv /\1Rename -y /
-# /Rename/s/^\([ 	]*\)Rename -y -f/\1Rename -y/
-# Change rm to delete.
-/^RM=/s/rm -f/Delete -i -y/
-# /rm/s/^\([ 	]*\)rm /\1Delete -y /
-# /Delete/s/^\([ 	]*\)Delete -y -f/\1Delete -y/
-# Comment out symlinking.
-# /ln/s/^\([ 	]*\)ln /\1# ln /
-
-# Remove -c from explicit compiler calls.
-# /-c/s/{CC}\(.*\) -c \(.*\)\([-a-z]*\)\.c/{CC}\1 \2\3.c -o "{o}"\3.c.o/g
-# Don't ask... prev subst seems to omit the second filename.
-# /-o/s/\([-a-z]*\)\.c -o "{o}".c.o/\1\.c -o "{o}"\1.c.o/
-
-# Change linking cc to link.
-/LDFLAGS/    s/{CC}\(.*\){CFLAGS}\(.*\){LDFLAGS}/Link \1 \2 {LDFLAGS}/
-/CFLAGS_LINK/s/{CC}\(.*\){CFLAGS_LINK}\(.*\){LDFLAGS}/Link \1 \2 {LDFLAGS}/
-
-# Comment out .PHONY rules.
-/\.PHONY/s/^\.PHONY/# \.PHONY/
-# Comment out .SUFFIXES rules.
-/\.SUFFIXES/s/^\.SUFFIXES/# \.SUFFIXES/
-# Comment out .PRECIOUS rules.
-/\.PRECIOUS/s/^\.PRECIOUS/# \.PRECIOUS/
-## Comment out default rules.
-##/^\./s/^\(\.[a-z]*\.[a-z]* \)/# \1/
-
-#
-#  End of original hack-mf.sed
-#
-#  Begin original hack-mf2.sed
-#
-# Transform expressions.
-
-# Set the install program appropriate.
-# /INSTALL/s/^INSTALL *= *`.*`:install.sh -c/INSTALL = Duplicate -y/
-
-# Include from the extra-include dir.
-# /^INCLUDES = /s/^INCLUDES = /INCLUDES = -i "{srcroot}"extra-include /
-
-# Yuck - remove unconverted autoconf things.
-# /@/s/@[^ 	]*@//g
-
-# Hackery, pure and simple
-# To speed up compiles, remove duplicated -i options.
-/-i/s/-i {SRCTOP}\([^ ]*\) -i {BUILDTOP}\1 /-i {BUILDTOP}\1 /g
-
-# Note!  There are 8-bit characters in the three lines below:
-#   	0xc4, 0xb6, 0xc5.
-/Option/s/\\Option-f/Ä/g
-/Option/s/\\Option-d/¶/g
-/Option/s/\\Option-x/Å/g
diff --git a/src/config/mac-post.in b/src/config/mac-post.in
deleted file mode 100644
index f06af3c22..000000000
--- a/src/config/mac-post.in
+++ /dev/null
@@ -1,16 +0,0 @@
-# config/post.in
-# put all:: first just in case no other rules occur here
-#
-all::
-
-check::
-
-clean:: clean-$(WHAT)
-	$(RM) config.log pre.out post.out Makefile.out
-
-clean-unix::
-	if test -n "$(OBJS)" ; then $(RM) $(OBJS); else :; fi
-
-clean-windows::
-	$(RM) *.$(OBJEXT)
-	$(RM) msvc.pdb *.err
diff --git a/src/config/mac-pre.in b/src/config/mac-pre.in
deleted file mode 100644
index 5200ef0c6..000000000
--- a/src/config/mac-pre.in
+++ /dev/null
@@ -1,182 +0,0 @@
-## config/mac-pre.in
-## common Macintosh prefix for all Makefile.in in the Kerberos V5 tree.
-
-#
-# MPW-style lines for the MakeFile.
-#
-# This first part is long enough that NFS/Share doesn't notice the non-ASCII
-# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want.  The non-ASCII chars are necessary for MPW 
-# Make.
-#
-# This first part is long enough that NFS/Share doesn't notice the non-ASCII
-# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want.  The non-ASCII chars are necessary for MPW 
-# Make.
-#
-# This first part is long enough that NFS/Share doesn't notice the non-ASCII
-# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want.  The non-ASCII chars are necessary for MPW 
-# Make.
-#
-# This first part is long enough that NFS/Share doesn't notice the non-ASCII
-# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want.  The non-ASCII chars are necessary for MPW 
-# Make.
-#
-# This first part is long enough that NFS/Share doesn't notice the non-ASCII
-# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want.  The non-ASCII chars are necessary for MPW 
-# Make.
-#
-# This first part is long enough that NFS/Share doesn't notice the non-ASCII
-# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want.  The non-ASCII chars are necessary for MPW 
-# Make.
-#
-# This first part is long enough that NFS/Share doesn't notice the non-ASCII
-# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want.  The non-ASCII chars are necessary for MPW 
-# Make.
-#
-# This first part is long enough that NFS/Share doesn't notice the non-ASCII
-# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want.  The non-ASCII chars are necessary for MPW 
-# Make.
-#
-# This first part is long enough that NFS/Share doesn't notice the non-ASCII
-# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want.  The non-ASCII chars are necessary for MPW 
-# Make.
-#
-# This first part is long enough that NFS/Share doesn't notice the non-ASCII
-# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want.  The non-ASCII chars are necessary for MPW 
-# Make.
-#
-# This first part is long enough that NFS/Share doesn't notice the non-ASCII
-# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want.  The non-ASCII chars are necessary for MPW 
-# Make.
-#
-# This first part is long enough that NFS/Share doesn't notice the non-ASCII
-# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want.  The non-ASCII chars are necessary for MPW 
-# Make.
-#
-# This first part is long enough that NFS/Share doesn't notice the non-ASCII
-# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want.  The non-ASCII chars are necessary for MPW 
-# Make.
-#
-# This first part is long enough that NFS/Share doesn't notice the non-ASCII
-# characters in the rest of the file, so it claims that the file is type
-# TEXT, which is what we want.  The non-ASCII chars are necessary for MPW 
-# Make.
-
-#
-# End of MPW-style lines for MakeFile.
-#
-
-WHAT = mac
-
-all:: all-$(WHAT)
-
-clean:: clean-$(WHAT)
-
-install:: install-$(WHAT)
-
-check:: check-$(WHAT)
-
-all-mac::
-clean-mac::
-install-mac::
-check-mac::
-
-# Directory syntax:
-#
-# begin absolute path
-ABS=
-# begin relative path
-REL=:
-# up-directory
-U=
-# path separator
-S=:
-# this is magic... should only be used for preceding a program invocation
-C=:
-
-BUILDTOP = @BUILDTOP@
-srcdir = $(C)
-VPATH = @srcdir@
-
-# FIXME:  This doesn't translate to MPW yet, srcdir must be same as objdir.
-# File in object dir can come from either the current dir or srcdir.
-# 
-# . : . "{srcdir}"
-
-# Default rule that puts each file into separate segment.
-
-.c.o: .c
-	{CC} -sym on {DepDir}{Default}.c {CFLAGS} -s {Default} -o {TargDir}{Default}.c.o
-
-CPPFLAGS = @CPPFLAGS@ -i {CIncludes}
-DEFS = @DEFS@ $(CPPFLAGS)
-CC = c
-LD = link
-# The funny quoting in the LDFLAGS is to avoid xxx.o being mangled by
-# mac-mf.sed into xxx.c.o.
-LDFLAGS=-t MPST -c "MPS " -sym on {Libraries}"Runtime."o {CLibraries}"StdClib."o {Libraries}"Interface."o
-CCOPTS = @CCOPTS@
-LIBS = @LIBS@
-KRB5ROOT= @KRB5ROOT@
-KRB4=@KRB4@
-INSTALL=Duplicate -y
-INSTALL_PROGRAM=Duplicate -y
-INSTALL_DATA=Duplicate -y
-INSTALL_SETUID=Duplicate -y
-
-KRB5MANROOT = $(KRB5ROOT)$(S)man
-ADMIN_BINDIR = $(KRB5ROOT)$(S)admin
-SERVER_BINDIR = $(KRB5ROOT)$(S)sbin
-CLIENT_BINDIR = $(KRB5ROOT)$(S)bin
-ADMIN_MANDIR = $(KRB5MANROOT)$(S)man8
-SERVER_MANDIR = $(KRB5MANROOT)$(S)man8
-CLIENT_MANDIR = $(KRB5MANROOT)$(S)man1
-FILE_MANDIR = $(KRB5MANROOT)$(S)man5
-KRB5_LIBDIR = $(KRB5ROOT)$(S)lib
-KRB5_INCDIR = $(KRB5ROOT)$(S)include
-KRB5_INCSUBDIRS = \
-	$(KRB5_INCDIR)$(S)krb5 \
-	$(KRB5_INCDIR)$(S)asn.1 \
-	$(KRB5_INCDIR)$(S)kerberosIV
-
-
-RM = Delete -y -i
-CP = Duplicate -y
-MV = mv -f
-CHMOD=chmod
-RANLIB = echo
-ARCHIVE = lib -o 
-ARADD = @ARADD@
-LN = Duplicate -y
-AWK = @AWK@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-YACC = @YACC@
-MAKE = Set Echo 0; BuildProgram
-
-# FIXME:  This won't work for srcdir != objdir.  But on the Mac, there
-# is no easy way to build a relative or absolute path, because : means
-# both the path separator, and the "go up a directory" indicator.
-#SRCTOP = $(srcdir)$(S)$(BUILDTOP)
-SRCTOP = $(BUILDTOP)
-SUBDIRS = @subdirs@
-
-TOPLIBD = $(BUILDTOP)$(S)lib
-
-OBJEXT = c.o
-LIBEXT = a
-EXEEXT =
-
-all::
diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index d67d0f8f2..fc33869e1 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (all-mac, clean-mac): Targets deleted.
+
 2004-06-08  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in ($(srcdir)/krb5/autoconf.stmp): Always use
diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index 8ad011056..71080430c 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -7,7 +7,6 @@ BUILDTOP=$(REL)..
 NO_OUTPRE=1
 
 all-unix:: krb5.h
-all-mac::
 
 all-windows::
 	@echo Making in include\krb5
@@ -61,8 +60,6 @@ clean-unix::
 	$(RM) krb5.h krb5_err.h kdb5_err.h kv5m_err.h krb524_err.h \
 		asn1_err.h
 
-clean-mac::
-
 clean-windows::
 	$(RM) com_err.h profile.h
 	$(RM) gssapi\gssapi.h gssapi\gssapi_generic.h gssapi\gssapi_krb5.h gssapi\timestamp
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 9edf7e481..1ec827ea9 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (all-mac, clean-mac): Targets deleted.
+
 2004-03-08  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (MY_SUBDIRS): Deleted.
diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index bca7cd33f..3d6d5f69c 100644
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -15,7 +15,6 @@ ET_HEADERS = adm_err.h asn1_err.h kdb5_err.h krb5_err.h
 BUILT_HEADERS = osconf.h
 
 all-unix:: autoconf.h $(BUILT_HEADERS)
-all-mac:: $(BUILT_HEADERS)
 all-windows:: autoconf.h $(BUILT_HEADERS)
 
 ##DOS##autoconf.h: ..\win-mac.h
@@ -68,7 +67,5 @@ clean::
 
 clean-unix::
 	$(RM) $(ET_HEADERS) autoconf.h autoconf.stamp
-clean-mac::
-	$(RM) osconf.h autoconf.h autoconf.stamp
 clean-windows::
 	$(RM) osconf.h autoconf.h autoconf.stamp
diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index aa241dd15..a09af9917 100644
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (MAC_SUBDIRS): Don't set.
+	(all-mac, clean-mac): Targets deleted.
+
 2004-06-15  Ken Raeburn  <raeburn@mit.edu>
 
 	* exports.crypto, exports.des425, exports.kdb5, exports.krb5:
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index b073437e4..217a97592 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -4,19 +4,13 @@ mydir=lib
 LOCAL_SUBDIRS=crypto krb5 des425 @KRB4@ kdb gssapi rpc kadm5 apputils
 BUILDTOP=$(REL)..
 
-MAC_SUBDIRS = crypto krb5 gssapi
-
 all-unix::
 
-all-mac::
-
 CLEANLIBS = libkrb5.a libkdb5.a libcrypto.a libgssapi_krb5.a libdes425.a \
 	libkrb425.a libkadm.a libkrb4.a libcom_err.a libpty.a \
 	libss.a libgssapi.a libapputils.a \
 	libkrb5.so libcrypto.so libkrb4.so libdes425.so
 
-clean-mac:: clean-unix
-	$(RM) $(CLEANLIBS)
 clean-unix::
 
 clean-windows::
diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index c0d4a6314..c28350461 100644
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (MAC_SUBDIRS): Don't set.
+
 2004-06-15  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (SHLIB_DIRS, SHLIB_EXPLIBS, SHLIB_EXPDEPLIBS): Set
diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index 183df7f28..3a0c709f0 100644
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -28,9 +28,6 @@ EXTRADEPSRCS=\
 ##DOSOBJFILELIST=@$(OUTPRE)crypto.lst @$(OUTPRE)des.lst @$(OUTPRE)md4.lst @$(OUTPRE)md5.lst @$(OUTPRE)sha1.lst @$(OUTPRE)arcfour.lst @$(OUTPRE)crc32.lst @$(OUTPRE)dk.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)enc_prov.lst @$(OUTPRE)hash_pro.lst @$(OUTPRE)kh_pro.lst @$(OUTPRE)yarrow.lst @$(OUTPRE)aes.lst
 ##DOSOBJFILEDEP =$(OUTPRE)crypto.lst $(OUTPRE)des.lst $(OUTPRE)md4.lst $(OUTPRE)md5.lst $(OUTPRE)sha1.lst $(OUTPRE)arcfour.lst $(OUTPRE)crc32.lst $(OUTPRE)dk.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)enc_prov.lst $(OUTPRE)hash_pro.lst $(OUTPRE)kh_pro.lst $(OUTPRE)aes.lst
 
-MAC_SUBDIRS = crc32 des dk enc_provider hash_provider keyhash_provider \
-	md4 md5 old raw sha1 arcfour yarrow
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index 1549d81b2..2086efc82 100644
--- a/src/lib/des425/ChangeLog
+++ b/src/lib/des425/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (all-mac): Target deleted.
+
 2004-06-04  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (LIBBASE): Renamed from LIB.
diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in
index be568a282..3a02a3a80 100644
--- a/src/lib/des425/Makefile.in
+++ b/src/lib/des425/Makefile.in
@@ -75,7 +75,6 @@ SRCS=	$(srcdir)/cksum.c	\
 	$(srcdir)/weak_key.c
 
 all-unix:: all-liblinks
-all-mac:: $(OBJS)
 
 ##DOS##LIBOBJS = $(OBJS)
 
diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index 6577eeae1..457742191 100644
--- a/src/lib/gssapi/ChangeLog
+++ b/src/lib/gssapi/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (MAC_SUBDIRS): Don't set.
+
 2004-06-15  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (SHLIB_EXPLIBS): Add $(LIBS).
diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index e3b030351..1e6d95591 100644
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -10,8 +10,6 @@ LOCAL_SUBDIRS= generic krb5
 
 ##DOS##DLL_EXP_TYPE=GSS
 
-MAC_SUBDIRS = generic krb5
-
 LOCALINCLUDES = -Igeneric -I$(srcdir)/generic -Ikrb5 -I$(srcdir)/krb5
 STLIBOBJS=\
 	gss_libinit.o
diff --git a/src/lib/gssapi/mechglue/ChangeLog b/src/lib/gssapi/mechglue/ChangeLog
index 3bf40deaf..0b342f9d7 100644
--- a/src/lib/gssapi/mechglue/ChangeLog
+++ b/src/lib/gssapi/mechglue/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (all-mac, clean-mac): Targets deleted.
+
 2002-08-29  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in: Revert $(S)=>/ change, for Windows support.
diff --git a/src/lib/gssapi/mechglue/Makefile.in b/src/lib/gssapi/mechglue/Makefile.in
index 78715d018..bcb7c2606 100644
--- a/src/lib/gssapi/mechglue/Makefile.in
+++ b/src/lib/gssapi/mechglue/Makefile.in
@@ -91,8 +91,6 @@ all:: all-$(WHAT)
 
 all-unix:: shared includes $(OBJS)
 
-all-mac:: shared includes $(OBJS)
-
 all-windows:: includes $(OBJS)
 	if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR)
 	copy mechglue.h $(EHDRDIR)
@@ -115,9 +113,6 @@ clean:: clean-$(WHAT)
 clean-unix::
 	$(RM) shared/*
 
-clean-mac::
-	$(RM) shared/*
-
 clean-windows::
 	$(RM) $(EHDRDIR)\gssapi.h $(EHDRDIR)\gssapi_generic.h
 	if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog
index 24bc4077f..7a72491ef 100644
--- a/src/lib/kadm5/ChangeLog
+++ b/src/lib/kadm5/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (clean-mac): Target deleted.
+
 2004-06-15  Tom Yu  <tlyu@mit.edu>
 
 	* admin.h (kadm5_get_admin_service_name): Prototype for new function.
diff --git a/src/lib/kadm5/Makefile.in b/src/lib/kadm5/Makefile.in
index 9bb576e76..4cef6df3b 100644
--- a/src/lib/kadm5/Makefile.in
+++ b/src/lib/kadm5/Makefile.in
@@ -101,7 +101,6 @@ check-windows::
 
 clean-unix:: clean-libobjs
 
-clean-mac::
 clean-windows::
 
 # @libobj_frag@
diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog
index 5e260db52..fb47623b3 100644
--- a/src/lib/kadm5/srv/ChangeLog
+++ b/src/lib/kadm5/srv/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (clean-mac): Target deleted.
+
 2004-06-04  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (LIBBASE): Renamed from LIB.
diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in
index ca5021b04..ab69d2725 100644
--- a/src/lib/kadm5/srv/Makefile.in
+++ b/src/lib/kadm5/srv/Makefile.in
@@ -87,7 +87,6 @@ clean-unix::
 
 check-windows::
 
-clean-mac::
 clean-windows::
 
 clean-unix:: clean-liblinks clean-libs clean-libobjs
diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index a5c0e1325..62527afb3 100644
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (check-mac): Target deleted.
+
 2004-06-04  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (LIBBASE): Renamed from LIB.
diff --git a/src/lib/krb4/Makefile.in b/src/lib/krb4/Makefile.in
index dbea96a67..3b2eed9a7 100644
--- a/src/lib/krb4/Makefile.in
+++ b/src/lib/krb4/Makefile.in
@@ -258,7 +258,6 @@ clean-unix:: clean-liblinks clean-libs clean-libobjs
 
 
 check-unix:: $(TEST_PROGS)
-check-mac:: $(TEST_PROGS)
 check-windows::
 
 
diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index 7b6afe381..7476ab380 100644
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (MAC_SUBDIRS): Don't set.
+
 2004-06-15  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (LOCALINCLUDES): Add $srcdir/os.
diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index eeda5b83c..710c4fe56 100644
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -12,8 +12,6 @@ LOCAL_SUBDIRS= error_tables asn.1 ccache keytab krb os rcache posix
 
 TST=if test -n "`cat DONE`" ; then
 
-MAC_SUBDIRS = error_tables asn.1 ccache keytab krb rcache os posix 
-
 STLIBOBJS=krb5_libinit.o
 
 LIBBASE=krb5
diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index 0ae29ece0..aeefd9dde 100644
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (MAC_SUBDIRS): Don't set.
+
 2004-05-27  Ezra Peisach  <epeisach@mit.edu>
 
 	* ccbase.c: Include cc-int.h.
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index 4313e8d82..495ab99a4 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -19,8 +19,6 @@ LOCALINCLUDES = -I$(srcdir)$(S)ccapi $(WIN_INCLUDES)
 ##WIN32##MSLSA_OBJ = $(OUTPRE)cc_mslsa.$(OBJEXT)
 ##WIN32##MSLSA_SRC = $(srcdir)/cc_mslsa.c
 
-MAC_SUBDIRS = ccapi
-
 STLIBOBJS= \
 	ccbase.o \
 	cccopy.o \
diff --git a/src/lib/krb5/posix/ChangeLog b/src/lib/krb5/posix/ChangeLog
index 9ba5e1033..5d0c67750 100644
--- a/src/lib/krb5/posix/ChangeLog
+++ b/src/lib/krb5/posix/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (MACSRCS): Don't set.
+
 2004-02-24  Ken Raeburn  <raeburn@mit.edu>
 
 	* daemon.c: Moved to util/apputils.
diff --git a/src/lib/krb5/posix/Makefile.in b/src/lib/krb5/posix/Makefile.in
index 013594ac2..085ae34d1 100644
--- a/src/lib/krb5/posix/Makefile.in
+++ b/src/lib/krb5/posix/Makefile.in
@@ -8,8 +8,6 @@ BUILDTOP=$(REL)..$(S)..$(S)..
 ##DOS##OBJFILE=..\$(OUTPRE)$(PREFIXDIR).lst
 
 STLIBOBJS= # empty... @LIBOBJS@
-MACSRCS = getuid.c strcasecmp.c strdup.c
-
 OBJS = # empty... @LIBOBJS@
 
 all-unix:: all-libobjs
diff --git a/src/lib/rpc/ChangeLog b/src/lib/rpc/ChangeLog
index cb4c16235..257451117 100644
--- a/src/lib/rpc/ChangeLog
+++ b/src/lib/rpc/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (clean-mac): Target deleted.
+
 2004-06-16  Tom Yu  <tlyu@mit.edu>
 
 	* auth_gss.h: Conditionalize log_debug, log_status, log_hexdump
diff --git a/src/lib/rpc/Makefile.in b/src/lib/rpc/Makefile.in
index 19304381f..240c389d2 100644
--- a/src/lib/rpc/Makefile.in
+++ b/src/lib/rpc/Makefile.in
@@ -261,8 +261,6 @@ types.stamp: $(srcdir)/types.hin config.status
 
 clean-unix::
 	$(RM) types.h types.stamp
-clean-mac::
-	$(RM) types.h types.stamp
 clean-windows::
 	$(RM) types.h types.stamp
 
diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index 09722c73f..4c747b29f 100644
--- a/src/util/ChangeLog
+++ b/src/util/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (MAC_SUBDIRS): Don't set.
+	(all-mac): Target deleted.
+
 2004-06-16  Tom Yu  <tlyu@mit.edu>
 
 	* depfix.sed: Delete /os/usr/include as well, to cope with an
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index ba726b5e7..8bcfda2b8 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -18,8 +18,6 @@ MAYBE_ET_sys =
 MAYBE_SS_sys =
 MAYBE_DB_sys =
 
-MAC_SUBDIRS = profile et
-
 editsh = sed -e 's,@''ARADD''@,$(ARADD),g' -e 's,@''ARCHIVE''@,$(ARCHIVE),g'
 HOST_TYPE=@HOST_TYPE@
 HAVE_GCC=@HAVE_GCC@
@@ -30,7 +28,6 @@ DL_COMPILE_TAIL=@DL_COMPILE_TAIL@
 
 all-recurse:
 all-unix:: $(FAKEPREFIX)/lib
-all-mac::
 
 $(FAKEPREFIX)/lib:
 	$(SRCTOP)/config/mkinstalldirs $(FAKEPREFIX) && ln -s `pwd`/../lib $(FAKEPREFIX)
diff --git a/src/util/pty/ChangeLog b/src/util/pty/ChangeLog
index bcca22493..1610b797b 100644
--- a/src/util/pty/ChangeLog
+++ b/src/util/pty/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (clean-mac): Target deleted.
+
 2004-06-11  Ken Raeburn  <raeburn@mit.edu>
 
 	* pty-int.h (_AIX && _THREAD_SAFE): Undefine _THREAD_SAFE.
diff --git a/src/util/pty/Makefile.in b/src/util/pty/Makefile.in
index 0f179cfc0..81f7192e3 100644
--- a/src/util/pty/Makefile.in
+++ b/src/util/pty/Makefile.in
@@ -70,12 +70,6 @@ depend::  pty_err.h
 #install:: libpty.h
 #	$(INSTALL_DATA) $(srcdir)/libpty.h  $(DESTDIR)$(KRB5_INCDIR)/libpty.h
 
-clean-mac::
-	$(RM) libpty.a
-	$(RM) $(LIBOBJS)
-
-## 
-
 includes:: libpty.h
 	if cmp $(srcdir)/libpty.h \
 	$(BUILDTOP)/include/libpty.h >/dev/null 2>&1; then :; \
@@ -94,8 +88,6 @@ clean-unix::
 
 clean-unix:: clean-liblinks clean-libs clean-libobjs clean-files
 
-clean-mac:: clean-files
-
 clean-files::
 	rm -f *~ \#* *.bak \
 		*.otl *.aux *.toc *.PS *.dvi *.x9700 *.ps \
diff --git a/src/util/ss/ChangeLog b/src/util/ss/ChangeLog
index 91dccad47..b9b79719f 100644
--- a/src/util/ss/ChangeLog
+++ b/src/util/ss/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (all-mac): Target deleted.
+
 2004-06-04  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (LIBBASE): Renamed from LIB.
diff --git a/src/util/ss/Makefile.in b/src/util/ss/Makefile.in
index e5588885a..07cbab22f 100644
--- a/src/util/ss/Makefile.in
+++ b/src/util/ss/Makefile.in
@@ -76,7 +76,6 @@ FILES=	$(SRCS) $(MKCMDSFILES) $(HFILES) \
 
 all-unix::	mk_cmds ct_c.awk ct_c.sed includes # libss_p.a lint
 all-unix:: all-liblinks
-all-mac::
 all-windows::  all-unix
 
 dist:	archives