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

9 files changed, 9 insertions, 20 deletions

diff --git a/src/appl/Makefile.in b/src/appl/Makefile.in
index 015961110d..32fe175c31 100644
--- a/src/appl/Makefile.in
+++ b/src/appl/Makefile.in
@@ -2,15 +2,4 @@ mydir=appl
 BUILDTOP=$(REL)..
 
 SUBDIRS= sample simple user_user gss-sample
-
-all-windows:: 
-	@echo Making in gss-sample
-	cd gss-sample
-	$(MAKE) -$(MFLAGS)
-	cd ..
-
-clean-windows::
-	@echo Making clean in lib\crypto
-	cd gss-sample
-	$(MAKE) -$(MFLAGS) clean
-	cd ..
+WINSUBDIRS= gss-sample
diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in
index 301f05cc9d..87931b94d1 100644
--- a/src/appl/gss-sample/Makefile.in
+++ b/src/appl/gss-sample/Makefile.in
@@ -1,4 +1,4 @@
-mydir=appl/gss-sample
+mydir=appl$(S)gss-sample
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DUSE_AUTOCONF_H -DGSSAPI_V2
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/appl/sample/Makefile.in b/src/appl/sample/Makefile.in
index dde058f553..63ac42e472 100644
--- a/src/appl/sample/Makefile.in
+++ b/src/appl/sample/Makefile.in
@@ -1,3 +1,3 @@
-mydir=appl/sample
+mydir=appl$(S)sample
 SUBDIRS = sclient sserver
 BUILDTOP=$(REL)..$(S)..
diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in
index 481d81e853..59d897446c 100644
--- a/src/appl/sample/sclient/Makefile.in
+++ b/src/appl/sample/sclient/Makefile.in
@@ -1,4 +1,4 @@
-mydir=appl/sample/sclient
+mydir=appl$(S)sample$(S)sclient
 
 BUILDTOP=$(REL)..$(S)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in
index 01265331b1..096dc7a63a 100644
--- a/src/appl/sample/sserver/Makefile.in
+++ b/src/appl/sample/sserver/Makefile.in
@@ -1,4 +1,4 @@
-mydir=appl/sample/sserver
+mydir=appl$(S)sample$(S)sserver
 
 BUILDTOP=$(REL)..$(S)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/appl/simple/Makefile.in b/src/appl/simple/Makefile.in
index 7681efb685..a6056167f4 100644
--- a/src/appl/simple/Makefile.in
+++ b/src/appl/simple/Makefile.in
@@ -1,3 +1,3 @@
-mydir=appl/simple
+mydir=appl$(S)simple
 SUBDIRS = client server
 BUILDTOP=$(REL)..$(S)..
diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in
index 3e53f5e138..c357c1253c 100644
--- a/src/appl/simple/client/Makefile.in
+++ b/src/appl/simple/client/Makefile.in
@@ -1,4 +1,4 @@
-mydir=appl/simple/client
+mydir=appl$(S)simple$(S)client
 BUILDTOP=$(REL)..$(S)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in
index ef64bed6d8..1795bc8960 100644
--- a/src/appl/simple/server/Makefile.in
+++ b/src/appl/simple/server/Makefile.in
@@ -1,4 +1,4 @@
-mydir=appl/simple/server
+mydir=appl$(S)simple$(S)server
 BUILDTOP=$(REL)..$(S)..$(S)..
 
 LOCALINCLUDES= -I.. -I$(srcdir)/..
diff --git a/src/appl/user_user/Makefile.in b/src/appl/user_user/Makefile.in
index 0d45a18648..381ece63c8 100644
--- a/src/appl/user_user/Makefile.in
+++ b/src/appl/user_user/Makefile.in
@@ -1,4 +1,4 @@
-mydir=appl/user_user
+mydir=appl$(S)user_user
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DDEBUG
 PROG_LIBPATH=-L$(TOPLIBD)