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, 10 insertions, 107 deletions

diff --git a/src/lib/crypto/builtin/Makefile.in b/src/lib/crypto/builtin/Makefile.in
index 603c57cd07..66e16ce69e 100644
--- a/src/lib/crypto/builtin/Makefile.in
+++ b/src/lib/crypto/builtin/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin
+mydir=lib$(S)crypto$(S)builtin
 BUILDTOP=$(REL)..$(S)..$(S)..
 SUBDIRS=camellia des aes md4 md5 sha1 sha2 enc_provider hash_provider
 LOCALINCLUDES = -I$(srcdir)/../krb 			\
@@ -72,103 +72,6 @@ t_cf2$(EXEEXT): t_cf2.$(OBJEXT) $(SUPPORT_DEPLIB)
 clean::
 	$(RM)  t_cf2 t_cf2.o  t_cf2.output
 
-
-
-
-all-windows::
-	cd des
-	@echo Making in crypto\builtin\des
-	$(MAKE) -$(MFLAGS)
-	cd ..\md4
-	@echo Making in crypto\builtin\md4
-	$(MAKE) -$(MFLAGS)
-	cd ..\md5
-	@echo Making in crypto\builtin\md5
-	$(MAKE) -$(MFLAGS)
-	cd ..\sha1
-	@echo Making in crypto\builtin\sha1
-	$(MAKE) -$(MFLAGS)
-	cd ..\sha2
-	@echo Making in crypto\builtin\sha2
-	$(MAKE) -$(MFLAGS)
-	cd ..\hash_provider
-	@echo Making in crypto\builtin\hash_provider
-	$(MAKE) -$(MFLAGS)
-	cd ..\enc_provider
-	@echo Making in crypto\builtin\enc_provider
-	$(MAKE) -$(MFLAGS)
-	cd ..\aes
-	@echo Making in crypto\builtin\aes
-	$(MAKE) -$(MFLAGS)
-	cd ..\camellia
-	@echo Making in crypto\builtin\camellia
-	$(MAKE) -$(MFLAGS)
-	cd ..
-	@echo Making in crypto\builtin
-
-clean-windows::
-	cd des
-	@echo Making clean in crypto\builtin\des
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\md4
-	@echo Making clean in crypto\builtin\md4
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\md5
-	@echo Making clean in crypto\builtin\md5
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\sha1
-	@echo Making clean in crypto\builtin\sha1
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\sha2
-	@echo Making clean in crypto\builtin\sha2
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\hash_provider
-	@echo Making clean in crypto\builtin\hash_provider
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\enc_provider
-	@echo Making clean in crypto\builtin\enc_provider
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\aes
-	@echo Making clean in crypto\builtin\aes
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\camellia
-	@echo Making clean in crypto\builtin\camellia
-	$(MAKE) -$(MFLAGS) clean
-	cd ..
-	@echo Making clean in crypto\builtin
-
-check-windows::
-	cd des
-	@echo Making check in crypto\builtin\des
-	$(MAKE) -$(MFLAGS) check
-	cd ..\md4
-	@echo Making check in crypto\builtin\md4
-	$(MAKE) -$(MFLAGS) check
-	cd ..\md5
-	@echo Making check in crypto\builtin\md5
-	$(MAKE) -$(MFLAGS) check
-	cd ..\sha1
-	@echo Making check in crypto\builtin\sha1
-	$(MAKE) -$(MFLAGS) check
-	cd ..\sha2
-	@echo Making check in crypto\builtin\sha2
-	$(MAKE) -$(MFLAGS) check
-	cd ..\hash_provider
-	@echo Making check in crypto\builtin\hash_provider
-	$(MAKE) -$(MFLAGS) check
-	cd ..\enc_provider
-	@echo Making check in crypto\builtin\enc_provider
-	$(MAKE) -$(MFLAGS) check
-	cd ..\aes
-	@echo Making check in crypto\builtin\aes
-	$(MAKE) -$(MFLAGS) check
-	cd ..\camellia
-	@echo Making check in crypto\builtin\camellia
-	$(MAKE) -$(MFLAGS) check
-	cd ..
-	@echo Making check in crypto\builtin
-
-
 @lib_frag@
 @libobj_frag@
 
diff --git a/src/lib/crypto/builtin/aes/Makefile.in b/src/lib/crypto/builtin/aes/Makefile.in
index 64f73a379b..9a242cc45a 100644
--- a/src/lib/crypto/builtin/aes/Makefile.in
+++ b/src/lib/crypto/builtin/aes/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin/aes
+mydir=lib$(S)crypto$(S)builtin$(S)aes
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk  -I$(srcdir)/../../../../include
 DEFS=
diff --git a/src/lib/crypto/builtin/camellia/Makefile.in b/src/lib/crypto/builtin/camellia/Makefile.in
index 2ad3e73f66..b11716ecc9 100644
--- a/src/lib/crypto/builtin/camellia/Makefile.in
+++ b/src/lib/crypto/builtin/camellia/Makefile.in
@@ -1,6 +1,6 @@
 thisconfigdir=../../../..
 myfulldir=lib/crypto/builtin/camellia
-mydir=lib/crypto/builtin/camellia
+mydir=lib$(S)crypto$(S)builtin$(S)camellia
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk \
 	 -I$(srcdir)/../../../../include -I$(srcdir)/../aes
diff --git a/src/lib/crypto/builtin/des/Makefile.in b/src/lib/crypto/builtin/des/Makefile.in
index 5001d48bfc..9b5d814029 100644
--- a/src/lib/crypto/builtin/des/Makefile.in
+++ b/src/lib/crypto/builtin/des/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin/des
+mydir=lib$(S)crypto$(S)builtin$(S)des
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../krb
 DEFS=
diff --git a/src/lib/crypto/builtin/enc_provider/Makefile.in b/src/lib/crypto/builtin/enc_provider/Makefile.in
index 80bfc60bd3..e843d602a9 100644
--- a/src/lib/crypto/builtin/enc_provider/Makefile.in
+++ b/src/lib/crypto/builtin/enc_provider/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin/enc_provider
+mydir=lib$(S)crypto$(S)builtin$(S)enc_provider
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/../des 	\
 		-I$(srcdir)/../arcfour \
diff --git a/src/lib/crypto/builtin/hash_provider/Makefile.in b/src/lib/crypto/builtin/hash_provider/Makefile.in
index e91901ee5b..f008e7118b 100644
--- a/src/lib/crypto/builtin/hash_provider/Makefile.in
+++ b/src/lib/crypto/builtin/hash_provider/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin/hash_provider
+mydir=lib$(S)crypto$(S)builtin$(S)hash_provider
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/../../krb/crc32 -I$(srcdir)/../md4 \
 	-I$(srcdir)/../md5 -I$(srcdir)/../sha1 -I$(srcdir)/../../krb
diff --git a/src/lib/crypto/builtin/md4/Makefile.in b/src/lib/crypto/builtin/md4/Makefile.in
index 00ec64315a..3dbeb5bd70 100644
--- a/src/lib/crypto/builtin/md4/Makefile.in
+++ b/src/lib/crypto/builtin/md4/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin/md4
+mydir=lib$(S)crypto$(S)builtin$(S)md4
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)
 DEFS=
diff --git a/src/lib/crypto/builtin/md5/Makefile.in b/src/lib/crypto/builtin/md5/Makefile.in
index 840bb62b94..1ab1ce96fa 100644
--- a/src/lib/crypto/builtin/md5/Makefile.in
+++ b/src/lib/crypto/builtin/md5/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin/md5
+mydir=lib$(S)crypto$(S)builtin$(S)md5
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
diff --git a/src/lib/crypto/builtin/sha1/Makefile.in b/src/lib/crypto/builtin/sha1/Makefile.in
index 719f633702..00e6cb6d4a 100644
--- a/src/lib/crypto/builtin/sha1/Makefile.in
+++ b/src/lib/crypto/builtin/sha1/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin/sha1
+mydir=lib$(S)crypto$(S)builtin$(S)sha1
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
diff --git a/src/lib/crypto/builtin/sha2/Makefile.in b/src/lib/crypto/builtin/sha2/Makefile.in
index 3b854ec29e..da176e66d2 100644
--- a/src/lib/crypto/builtin/sha2/Makefile.in
+++ b/src/lib/crypto/builtin/sha2/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin/sha2
+mydir=lib$(S)crypto$(S)builtin$(S)sha2
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=