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, 7 insertions, 53 deletions

diff --git a/src/clients/Makefile.in b/src/clients/Makefile.in
index 891da9e20a..4ae8361946 100644
--- a/src/clients/Makefile.in
+++ b/src/clients/Makefile.in
@@ -2,52 +2,6 @@ mydir=clients
 BUILDTOP=$(REL)..
 
 SUBDIRS= klist kinit kdestroy kpasswd ksu kvno kcpytkt kdeltkt
+WINSUBDIRS= klist kinit kdestroy kpasswd kvno kcpytkt kdeltkt
 
 NO_OUTPRE=1
-all-windows::
-	@echo Making all in clients\klist
-	cd klist
-	$(MAKE) -$(MFLAGS)
-	@echo Making all in clients\kdestroy
-	cd ..\kdestroy
-	$(MAKE) -$(MFLAGS)
-	@echo Making all in clients\kinit
-	cd ..\kinit
-	$(MAKE) -$(MFLAGS)
-	@echo Making all in clients\kpasswd
-	cd ..\kpasswd
-	$(MAKE) -$(MFLAGS)
-	@echo Making all in clients\kvno
-	cd ..\kvno
-	$(MAKE) -$(MFLAGS)
-	@echo Making all in clients\kcpytkt
-	cd ..\kcpytkt
-	$(MAKE) -$(MFLAGS)
-	@echo Making all in clients\kdeltkt
-	cd ..\kdeltkt
-	$(MAKE) -$(MFLAGS)
-	cd ..
-
-clean-windows::
-	@echo Making clean in clients\klist
-	cd klist
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in clients\kdestroy
-	cd ..\kdestroy
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in clients\kinit
-	cd ..\kinit
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in clients\kpasswd
-	cd ..\kpasswd
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in clients\kvno
-	cd ..\kvno
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in clients\kcpytkt
-	cd ..\kcpytkt
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in clients\kdeltkt
-	cd ..\kdeltkt
-	$(MAKE) -$(MFLAGS) clean
-	cd ..
diff --git a/src/clients/kdestroy/Makefile.in b/src/clients/kdestroy/Makefile.in
index 64a2dff565..b3bb0b2812 100644
--- a/src/clients/kdestroy/Makefile.in
+++ b/src/clients/kdestroy/Makefile.in
@@ -1,4 +1,4 @@
-mydir=clients/kdestroy
+mydir=clients$(S)kdestroy
 BUILDTOP=$(REL)..$(S)..
 DEFS=
 
diff --git a/src/clients/kinit/Makefile.in b/src/clients/kinit/Makefile.in
index d60b1c7ae5..aeaba560fb 100644
--- a/src/clients/kinit/Makefile.in
+++ b/src/clients/kinit/Makefile.in
@@ -1,4 +1,4 @@
-mydir=clients/kinit
+mydir=clients$(S)kinit
 BUILDTOP=$(REL)..$(S)..
 DEFS=
 
diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in
index af43750630..c2b4d412a3 100644
--- a/src/clients/klist/Makefile.in
+++ b/src/clients/klist/Makefile.in
@@ -1,4 +1,4 @@
-mydir=clients/klist
+mydir=clients$(S)klist
 BUILDTOP=$(REL)..$(S)..
 DEFS=
 
diff --git a/src/clients/kpasswd/Makefile.in b/src/clients/kpasswd/Makefile.in
index d53b922168..50abc89c60 100644
--- a/src/clients/kpasswd/Makefile.in
+++ b/src/clients/kpasswd/Makefile.in
@@ -1,4 +1,4 @@
-mydir=clients/kpasswd
+mydir=clients$(S)kpasswd
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/clients/ksu/Makefile.in b/src/clients/ksu/Makefile.in
index daf9059e9d..9309b97ac6 100644
--- a/src/clients/ksu/Makefile.in
+++ b/src/clients/ksu/Makefile.in
@@ -1,4 +1,4 @@
-mydir=clients/ksu
+mydir=clients$(S)ksu
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"'
 DEFS=
diff --git a/src/clients/kvno/Makefile.in b/src/clients/kvno/Makefile.in
index bbbb79c7af..741c738442 100644
--- a/src/clients/kvno/Makefile.in
+++ b/src/clients/kvno/Makefile.in
@@ -1,4 +1,4 @@
-mydir=clients/kvno
+mydir=clients$(S)kvno
 BUILDTOP=$(REL)..$(S)..
 DEFS=