more tweaking of build

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

diff --git a/src/Imakefile b/src/Imakefile
index b14fe335a2caf834969e3670bcd4de696ba67444..c7b5dd8be6e8e5d74e925856bb28431fe8b72c46 100644 (file)
--- 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 df0904bc49e6c9facb90ed131b90606c0d18a235..4ed8312ce0c4e1f5af7a80a7d7a0dc3941644f22 100644 (file)
--- 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 31f1e24cd69718d12bb0fe42dba328cb14966f1e..86e14b48db8cee1ca65b1086d7e4e42747d9d603 100644 (file)
--- 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))