Use for loops for recursion in the Windows build, cutting down on the

verbiage in Makefile.in files.  For correctness of output, every
Makefile.in mydir= definition is changed to use $(S) instead of /.

ticket: 6826

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

7 files changed, 10 insertions, 36 deletions

diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index ec92828c4..cd9dc0e8d 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -1,12 +1,12 @@
 mydir=util
-##WIN32###Windows NMAKE doesn't like @ in make variable names, and on
-##WIN32### Windows we don't do the @FOO@ substitutions we do with UNIX
-##WIN32### configure scripts.  The set of subdirs to use is hard-coded
-##WIN32### below in the 'all-windows' target anyways, so just hide this.
+# Windows NMAKE doesn't like @ in make variable names, and on
+# Windows we don't do the @FOO@ substitutions we do with UNIX
+# configure scripts, so hide this.
 ##WIN32##!if 0
 SUBDIRS=support $(MAYBE_ET_@COM_ERR_VERSION@) $(MAYBE_SS_@SS_VERSION@) \
 	profile send-pr
 ##WIN32##!endif
+WINSUBDIRS=windows support et profile
 BUILDTOP=$(REL)..
 
 MAYBE_ET_k5 = et
@@ -20,32 +20,6 @@ clean-unix::
 	$(RM) -r $(FAKEPREFIX)
 
 NO_OUTDIR=1
-all-windows::
-	@echo Making in util\windows
-	cd windows
-	$(MAKE) -$(MFLAGS)
-	@echo Making in util\support
-	cd ..\support
-	$(MAKE) -$(MFLAGS)
-	@echo Making in util\et
-	cd ..\et
-	$(MAKE) -$(MFLAGS) 
-	@echo Making in util\profile
-	cd ..\profile
-	$(MAKE) -$(MFLAGS) 
-	cd ..
-
-clean-windows::
-	@echo Making clean in util\windows
-	cd windows
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in util\et
-	cd ..\et
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in util\profile
-	cd ..\profile
-	$(MAKE) -$(MFLAGS) clean
-	cd ..
 
 install::
 	@echo nothing to install in util
diff --git a/src/util/collected-client-lib/Makefile.in b/src/util/collected-client-lib/Makefile.in
index f23f1e5cb..1f7d31012 100644
--- a/src/util/collected-client-lib/Makefile.in
+++ b/src/util/collected-client-lib/Makefile.in
@@ -1,4 +1,4 @@
-mydir=util/collected-client-lib
+mydir=util$(S)collected-client-lib
 BUILDTOP=$(REL)..$(S)..
 RELDIR=../util/collected-client-lib
 DEFS=
diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in
index e585fb3fc..8a5648c2d 100644
--- a/src/util/et/Makefile.in
+++ b/src/util/et/Makefile.in
@@ -2,7 +2,7 @@ prefix=@prefix@
 bindir=@bindir@
 datadir=@datadir@
 mydatadir=$(datadir)/et
-mydir=util/et
+mydir=util$(S)et
 BUILDTOP=$(REL)..$(S)..
 RELDIR=../util/et
 SED = sed
diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in
index b857d435c..326fd1967 100644
--- a/src/util/profile/Makefile.in
+++ b/src/util/profile/Makefile.in
@@ -1,4 +1,4 @@
-mydir=util/profile
+mydir=util$(S)profile
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD) $(TCL_LIBPATH) -L.
 PROG_RPATH=$(KRB5_LIBDIR)$(TCL_RPATH)
diff --git a/src/util/send-pr/Makefile.in b/src/util/send-pr/Makefile.in
index 5ee5ae5d8..24d884feb 100644
--- a/src/util/send-pr/Makefile.in
+++ b/src/util/send-pr/Makefile.in
@@ -1,4 +1,4 @@
-mydir=util/send-pr
+mydir=util$(S)send-pr
 BUILDTOP=$(REL)..$(S)..
 #
 # Makefile for building a standalone send-pr.
diff --git a/src/util/ss/Makefile.in b/src/util/ss/Makefile.in
index d13df4282..3f6fd84f9 100644
--- a/src/util/ss/Makefile.in
+++ b/src/util/ss/Makefile.in
@@ -1,4 +1,4 @@
-mydir=util/ss
+mydir=util$(S)ss
 BUILDTOP=$(REL)..$(S)..
 SED = sed
 DEFS=
diff --git a/src/util/support/Makefile.in b/src/util/support/Makefile.in
index 6c2be57bb..88520438f 100644
--- a/src/util/support/Makefile.in
+++ b/src/util/support/Makefile.in
@@ -1,4 +1,4 @@
-mydir=util/support
+mydir=util$(S)support
 BUILDTOP=$(REL)..$(S)..
 RELDIR=../util/support
 DEFS=