summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>1994-05-29 02:21:34 +0000
committerTom Yu <tlyu@mit.edu>1994-05-29 02:21:34 +0000
commit85aceafed74104ffa09f65f68ef81b235be0e258 (patch)
tree8d5ef7446978b16abac693e4a0b6afd2c7d0ecdd /src
parentb871f56f6a2c50de7d359fbae0d7228927f9e8a2 (diff)
downloadkrb5-85aceafed74104ffa09f65f68ef81b235be0e258.tar.gz
krb5-85aceafed74104ffa09f65f68ef81b235be0e258.tar.xz
krb5-85aceafed74104ffa09f65f68ef81b235be0e258.zip
more tweaking of build
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3657 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/Imakefile15
-rw-r--r--src/Makefile.ini2
-rw-r--r--src/util/Imakefile2
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))