--- Makefile~	2003-04-16 17:32:42.000000000 -0700
+++ Makefile	2003-05-31 19:58:50.000000000 -0700
@@ -256,7 +256,7 @@
 
 # Make the IMAP Toolkit
 
-all:	SPECIALS c-client rebuild bundled
+all:	SPECIALS c-client rebuild 
 
 c-client:
 	@echo Not processed yet.  In a first-time build, you must specify
@@ -448,16 +448,9 @@
 	$(TOOLS)/$@ "$(LN)" src/ansilib c-client
 	$(TOOLS)/$@ "$(LN)" src/charset c-client
 	$(TOOLS)/$@ "$(LN)" src/osdep/$(SYSTEM) c-client
-	$(TOOLS)/$@ "$(LN)" src/mtest mtest
-	$(TOOLS)/$@ "$(LN)" src/ipopd ipopd
-	$(TOOLS)/$@ "$(LN)" src/imapd imapd
-	$(TOOLS)/$@ "$(LN)" src/mailutil mailutil
-	$(TOOLS)/$@ "$(LN)" src/mlock mlock
-	$(TOOLS)/$@ "$(LN)" src/dmail dmail
-	$(TOOLS)/$@ "$(LN)" src/tmail tmail
 	$(LN) $(TOOLS)/$@ .
 
-build:	OSTYPE rebuild rebuildclean bundled
+build:	OSTYPE rebuild rebuildclean
 
 OSTYPE:
 	@echo Building c-client for $(BUILDTYPE)...
@@ -472,8 +465,6 @@
 	echo $(BUILDTYPE) > OSTYPE
 	$(TOUCH) rebuild
 
-rebuild:
-	@$(SH) -c '(test $(BUILDTYPE) = rebuild -o $(BUILDTYPE) = `$(CAT) OSTYPE`) || (echo Already built for `$(CAT) OSTYPE` -- you must do \"make clean\" first && exit 1)'
 	@echo Rebuilding c-client for `$(CAT) OSTYPE`...
 	@$(TOUCH) SPECIALS
 	$(CD) c-client;$(MAKE) all CC=`$(CAT) CCTYPE` \
@@ -482,26 +473,6 @@
 rebuildclean:
 	$(SH) -c '$(RM) rebuild || true'
 
-bundled:
-	@echo Building bundled tools...
-	$(CD) mtest;$(MAKE)
-	$(CD) ipopd;$(MAKE)
-	$(CD) imapd;$(MAKE)
-	$(CD) mailutil;$(MAKE)
-	@$(SH) -c '(test -f /usr/include/sysexits.h ) || make sysexitwarn'
-	$(CD) mlock;$(MAKE) || true
-	$(CD) dmail;$(MAKE) || true
-	$(CD) tmail;$(MAKE) || true
-
-
-sysexitwarn:
-	@echo Hmm...it does not look like /usr/include/sysexits.h exists.
-	@echo Either your system is too ancient to have the sysexits.h
-	@echo include, or your C compiler gets it from some other location
-	@echo than /usr/include.  If your system is too old to have the
-	@echo sysexits.h include, you will not be able to build the
-	@echo following programs.
-
 clean:
 	@echo Removing old processed sources and binaries...
 	$(SH) -c '$(RM) an ua OSTYPE SPECIALS c-client mtest imapd ipopd mailutil mlock dmail tmail || true'