From 85aceafed74104ffa09f65f68ef81b235be0e258 Mon Sep 17 00:00:00 2001
From: Tom Yu <tlyu@mit.edu>
Date: Sun, 29 May 1994 02:21:34 +0000
Subject: [PATCH] more tweaking of build

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3657 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/Imakefile      | 15 ++++++++-------
 src/Makefile.ini   |  2 +-
 src/util/Imakefile |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/Imakefile b/src/Imakefile
index b14fe335a..c7b5dd8be 100644
--- a/src/Imakefile
+++ b/src/Imakefile
@@ -28,14 +28,17 @@
 /* default target... */
 all::
 
+WORLDOPTS = -k
+
 world::
 	@date
 	cd $(IMAKESRC); $(MAKE) $(MFLAGS) -f Makefile.ini clean; $(MAKE) $(MFLAGS) -f Makefile.ini BOOSTRAPCFLAGS="$(BOOTSTAPCFLAGS)"
 	-$(RM) Makefile.bak; $(MV) Makefile Makefile.bak
 	$(MAKE) $(MFLAGS) -f Makefile.bak Makefile
-	$(MAKE) ${MFLAGS} mastermakefiles
-	$(MAKE) ${MFLAGS} depend
-	$(MAKE) ${MFLAGS} all
+	$(MAKE) $(MFLAGS) Makefiles
+	$(MAKE) $(MFLAGS) includes
+	$(MAKE) $(MFLAGS) depend
+	$(MAKE) $(MFLAGS) $(WORLDOPTS)
 	@date
 
 SUBDIRS = util include lib kdc admin kadmin slave clients appl tests \
@@ -50,17 +53,15 @@ install:: install-mkdirs
 
 MakeSubdirs($(SUBDIRS))
 
-depend:: includes
-
-
 install-mkdirs:
 	-mkdir $(INSTALLMKDIRS)
 
 install::
 	$(MAKE) $(MFLAGS) install.man
-
+#ifdef notdef
 /**/# rebuild the Makefiles in the master source tree
 mastermakefiles::
 	-$(MV) Makefile Makefile.bak
 	$(MAKE) -f Makefile.bak Makefile
 	$(MAKE) Makefiles
+#endif
diff --git a/src/Makefile.ini b/src/Makefile.ini
index df0904bc4..4ed8312ce 100644
--- a/src/Makefile.ini
+++ b/src/Makefile.ini
@@ -32,7 +32,7 @@ world:
 	cd $(IMAKESRC); $(MAKE) $(FLAGS) clean; $(MAKE) $(FLAGS)
 	-$(RM) Makefile.bak; $(MV) Makefile Makefile.bak
 	$(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
-	$(MAKE) $(MFLAGS) mastermakefiles
+	$(MAKE) $(MFLAGS) Makefiles
 	$(MAKE) $(MFLAGS) includes
 	$(MAKE) $(MFLAGS) depend
 	$(MAKE) $(MFLAGS) $(WORLDOPTS)
diff --git a/src/util/Imakefile b/src/util/Imakefile
index 31f1e24cd..86e14b48d 100644
--- a/src/util/Imakefile
+++ b/src/util/Imakefile
@@ -25,5 +25,5 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
-SUBDIRS=unifdef et ss makedepend
+SUBDIRS=makedepend unifdef et ss
 MakeSubdirs($(SUBDIRS))
-- 
2.26.2