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

10 files changed, 11 insertions, 71 deletions

diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index adaba32aa..9b95c02ba 100644
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -1,7 +1,8 @@
-mydir=lib/krb5
+mydir=lib$(S)krb5
 BUILDTOP=$(REL)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/ccache -I$(srcdir)/keytab -I$(srcdir)/rcache -I$(srcdir)/os -I$(srcdir)/unicode
 SUBDIRS= error_tables asn.1 ccache keytab krb os rcache unicode
+WINSUBDIRS= $(SUBDIRS) posix
 DEFS=
 
 ##DOSBUILDTOP = ..\..
@@ -68,67 +69,6 @@ clean-unix:: clean-liblinks clean-libs clean-libobjs
 clean-windows::
 	$(RM) $(OUTPRE)krb5.lib krb5.bak
 
-all-windows::
-	cd asn.1
-	@echo Making in krb5\asn.1
-	$(MAKE) -$(MFLAGS)
-	cd ..\ccache
-	@echo Making in krb5\ccache
-	$(MAKE) -$(MFLAGS)
-	cd ..\error_tables
-	@echo Making in krb5\error_tables
-	$(MAKE) -$(MFLAGS)
-	cd ..\keytab
-	@echo Making in krb5\keytab
-	$(MAKE) -$(MFLAGS)
-	cd ..\krb
-	@echo Making in krb5\krb
-	$(MAKE) -$(MFLAGS)
-	cd ..\os
-	@echo Making in krb5\os
-	$(MAKE) -$(MFLAGS)
-	cd ..\posix
-	@echo Making in krb5\posix
-	$(MAKE) -$(MFLAGS)
-	cd ..\rcache
-	@echo Making in krb5\rcache
-	$(MAKE) -$(MFLAGS)
-	cd ..\unicode
-	@echo Making in krb5\unicode
-	$(MAKE) -$(MFLAGS)
-	cd ..
-
-clean-windows::
-	cd asn.1
-	@echo Making clean in krb5\asn.1
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\ccache
-	@echo Making clean in krb5\ccache
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\error_tables
-	@echo Making clean in krb5\error_tables
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\keytab
-	@echo Making clean in krb5\keytab
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\krb
-	@echo Making clean in krb5\krb
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\os
-	@echo Making clean in krb5\os
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\posix
-	@echo Making clean in krb5\posix
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\rcache
-	@echo Making clean in krb5\rcache
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\unicode
-	@echo Making clean in krb5\unicode
-	$(MAKE) -$(MFLAGS) clean
-	cd ..
-	@echo Making clean locally
-
 install-unix:: install-libs
 
 @lib_frag@
diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in
index d0566c120..ec8455ca6 100644
--- a/src/lib/krb5/asn.1/Makefile.in
+++ b/src/lib/krb5/asn.1/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/krb5/asn.1
+mydir=lib$(S)krb5$(S)asn.1
 BUILDTOP=$(REL)..$(S)..$(S)..
 DEFS=
 
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index b421c031f..021bd7602 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/krb5/ccache
+mydir=lib$(S)krb5$(S)ccache
 BUILDTOP=$(REL)..$(S)..$(S)..
 SUBDIRS = # ccapi
 DEFS=
diff --git a/src/lib/krb5/ccache/ccapi/Makefile.in b/src/lib/krb5/ccache/ccapi/Makefile.in
index 135672b0c..7adfb208e 100644
--- a/src/lib/krb5/ccache/ccapi/Makefile.in
+++ b/src/lib/krb5/ccache/ccapi/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/krb5/ccache/ccapi
+mydir=lib$(S)krb5$(S)ccache$(S)ccapi
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = $(WIN_INCLUDES)
 DEFS= -DUSE_CCAPI -DUSE_CCAPI_V3
diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in
index d340b7b15..eb890d196 100644
--- a/src/lib/krb5/error_tables/Makefile.in
+++ b/src/lib/krb5/error_tables/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/krb5/error_tables
+mydir=lib$(S)krb5$(S)error_tables
 BUILDTOP=$(REL)..$(S)..$(S)..
 DEFS=
 
diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in
index 258eac7d3..ccb4a6a2a 100644
--- a/src/lib/krb5/keytab/Makefile.in
+++ b/src/lib/krb5/keytab/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/krb5/keytab
+mydir=lib$(S)krb5$(S)keytab
 BUILDTOP=$(REL)..$(S)..$(S)..
 DEFS=
 
diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in
index d4db454d4..b96229986 100644
--- a/src/lib/krb5/krb/Makefile.in
+++ b/src/lib/krb5/krb/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/krb5/krb
+mydir=lib$(S)krb5$(S)krb
 BUILDTOP=$(REL)..$(S)..$(S)..
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in
index dc9d09b1e..903d86af1 100644
--- a/src/lib/krb5/os/Makefile.in
+++ b/src/lib/krb5/os/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/krb5/os
+mydir=lib$(S)krb5$(S)os
 BUILDTOP=$(REL)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in
index fec270bc7..83e709670 100644
--- a/src/lib/krb5/rcache/Makefile.in
+++ b/src/lib/krb5/rcache/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/krb5/rcache
+mydir=lib$(S)krb5$(S)rcache
 BUILDTOP=$(REL)..$(S)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/lib/krb5/unicode/Makefile.in b/src/lib/krb5/unicode/Makefile.in
index 5ae89fbe7..63e08c9df 100644
--- a/src/lib/krb5/unicode/Makefile.in
+++ b/src/lib/krb5/unicode/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/krb5/unicode
+mydir=lib$(S)krb5$(S)unicode
 BUILDTOP=$(REL)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)