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

8 files changed, 8 insertions, 36 deletions

diff --git a/src/ccapi/Makefile.in b/src/ccapi/Makefile.in
index 43d5fc0810..3f80d87e1a 100644
--- a/src/ccapi/Makefile.in
+++ b/src/ccapi/Makefile.in
@@ -2,32 +2,4 @@ mydir=ccapi
 BUILDTOP=$(REL)..
 
 SUBDIRS= lib server test
-
-all-windows:: 
-	@echo Making in ccapi\lib\win
-	cd lib\win
-	cd
-	$(MAKE) -$(MFLAGS)
-	@echo Making in ccapi\server\win
-	cd ..\..\server\win
-	cd
-	$(MAKE) -$(MFLAGS)
-	@echo Making in ccapi\test
-	cd ..\..\test
-	cd
-	$(MAKE) -$(MFLAGS)
-
-clean-windows:: 
-	@echo Making clean in ccapi\lib\win
-	cd lib\win
-	cd
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in ccapi\server\win
-	cd ..\..\server\win
-	cd
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in ccapi\test
-	cd ..\..\test
-	cd
-	$(MAKE) -$(MFLAGS) clean
-
+WINSUBDIRS= lib\win server\win test
diff --git a/src/ccapi/common/Makefile.in b/src/ccapi/common/Makefile.in
index 7693485e3d..5a6e5fdd5d 100644
--- a/src/ccapi/common/Makefile.in
+++ b/src/ccapi/common/Makefile.in
@@ -1,4 +1,4 @@
-mydir=ccapi/common
+mydir=ccapi$(S)common
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS=unix
 
diff --git a/src/ccapi/common/unix/Makefile.in b/src/ccapi/common/unix/Makefile.in
index 4b176fc809..b2ebc9049b 100644
--- a/src/ccapi/common/unix/Makefile.in
+++ b/src/ccapi/common/unix/Makefile.in
@@ -1,4 +1,4 @@
-mydir=ccapi/common/unix
+mydir=ccapi$(S)common$(S)unix
 BUILDTOP=$(REL)..$(S)..$(S)..
 
 STLIBOBJS=
diff --git a/src/ccapi/lib/Makefile.in b/src/ccapi/lib/Makefile.in
index 1e2e13d369..f2655488e6 100644
--- a/src/ccapi/lib/Makefile.in
+++ b/src/ccapi/lib/Makefile.in
@@ -1,4 +1,4 @@
-mydir=ccapi/lib
+mydir=ccapi$(S)lib
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS=unix
 LOCALINCLUDES=-I$(srcdir)/../common -I.
diff --git a/src/ccapi/lib/unix/Makefile.in b/src/ccapi/lib/unix/Makefile.in
index 8a043c92a0..455b6b7b1e 100644
--- a/src/ccapi/lib/unix/Makefile.in
+++ b/src/ccapi/lib/unix/Makefile.in
@@ -1,4 +1,4 @@
-mydir=ccapi/lib/unix
+mydir=ccapi$(S)lib$(S)unix
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES= -I$(srcdir)/.. -I$(srcdir)/../../common
 
diff --git a/src/ccapi/server/Makefile.in b/src/ccapi/server/Makefile.in
index 0ca140ba6f..0cfa43a3ac 100644
--- a/src/ccapi/server/Makefile.in
+++ b/src/ccapi/server/Makefile.in
@@ -1,4 +1,4 @@
-mydir=ccapi/server
+mydir=ccapi$(S)server
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS=unix
 
diff --git a/src/ccapi/server/unix/Makefile.in b/src/ccapi/server/unix/Makefile.in
index 526826030e..1d45a5fc1e 100644
--- a/src/ccapi/server/unix/Makefile.in
+++ b/src/ccapi/server/unix/Makefile.in
@@ -1,4 +1,4 @@
-mydir=ccapi/server/unix
+mydir=ccapi$(S)server$(S)unix
 BUILDTOP=$(REL)..$(S)..$(S)..
 
 STLIBOBJS=
diff --git a/src/ccapi/server/win/Makefile.in b/src/ccapi/server/win/Makefile.in
index 36909b85eb..d5da00136b 100644
--- a/src/ccapi/server/win/Makefile.in
+++ b/src/ccapi/server/win/Makefile.in
@@ -106,4 +106,4 @@ clean::
 	if exist $(OUTPRE)*.map del $(OUTPRE)*.map
 	if exist $(OUTPRE)*.pdb del $(OUTPRE)*.pdb
 	if exist *.err del *.err
-    if exist $(SRCTMP) rm -rf $(SRCTMP)
+    if exist $(SRCTMP) rmdir /s /q $(SRCTMP)