add a 'world' target to do the Right Thing, and change all to be just

a rebuild step

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

diff --git a/src/Imakefile b/src/Imakefile
index 2cd73ce5159e4339e7d8a79c695efa0905eadada..811950821408ebbcec88b544f615ef544d9fbe73 100644 (file)
--- a/src/Imakefile
+++ b/src/Imakefile
@@ -10,13 +10,16 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+/* default target... */
+all::
+
 #ifdef UseComErrInstalled
 COMERRDIR=
-all::
+world::
        $(RM) include/com_err.h
 #else
 COMERRDIR=comerr
-all::
+world::
        $(RM) include/com_err.h
        $(LN) ../comerr/com_err.h include/com_err.h
 #endif
@@ -30,19 +33,28 @@ UNIFDIR=
 #else
 UNIFDIR=util/unifdef
 #endif
-all::
-       make includes
+world::
+       make ${MFLAGS} mastermakefiles
+       make ${MFLAGS} depend
+       make ${MFLAGS} all
 
-        SUBDIRS = $(UNIFDIR) include $(COMERRDIR) $(SSDIR) lib kdc admin clients appl
-  LNINSTALLDIRS = 
+SUBDIRS = $(UNIFDIR) include $(COMERRDIR) $(SSDIR) lib kdc admin clients appl
+LNINSTALLDIRS = 
 
 MakeSubdirs($(SUBDIRS))
 
 depend:: includes
 
 /**/# rebuild the Makefiles in the master source tree
+#ifdef UseImakeInstalled
+mastermakefiles::
+       -$(MV) Makefile Makefile.bak
+       $(MAKE) -f Makefile.bak Makefile
+       $(MAKE) Makefiles
+#else
 mastermakefiles::
        cd $(IMAKESRC); $(MAKE) -f Makefile.ini clean; $(MAKE) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"
        -$(MV) Makefile Makefile.bak
        $(MAKE) -f Makefile.bak Makefile
        $(MAKE) Makefiles
+#endif