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, 196 deletions

diff --git a/src/lib/crypto/nss/Makefile.in b/src/lib/crypto/nss/Makefile.in
index 7ce3cc8a9..7016e924b 100644
--- a/src/lib/crypto/nss/Makefile.in
+++ b/src/lib/crypto/nss/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/nss
+mydir=lib$(S)crypto$(S)nss
 BUILDTOP=$(REL)..$(S)..$(S)..
 SUBDIRS=des aes	camellia md4 md5  sha1 sha2 enc_provider hash_provider
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
@@ -18,12 +18,6 @@ PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 DEFS=
 
-##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=$(OUTPRE)crypto.lib
-##DOSOBJFILE=$(OUTPRE)crypto.lst
-##DOSOBJFILELIST=@$(OUTPRE)crypto.lst @$(OUTPRE)des.lst @$(OUTPRE)md4.lst @$(OUTPRE)md5.lst @$(OUTPRE)sha1.lst @$(OUTPRE)crc32.lst @$(OUTPRE)dk.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)enc_prov.lst @$(OUTPRE)hash_pro.lst @$(OUTPRE)kh_pro.lst @$(OUTPRE)yarrow.lst @$(OUTPRE)aes.lst
-##DOSOBJFILEDEP =$(OUTPRE)crypto.lst $(OUTPRE)des.lst $(OUTPRE)md4.lst $(OUTPRE)md5.lst $(OUTPRE)sha1.lst $(OUTPRE)crc32.lst $(OUTPRE)dk.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)enc_prov.lst $(OUTPRE)hash_pro.lst $(OUTPRE)kh_pro.lst $(OUTPRE)aes.lst
-
 STLIBOBJS=\
 	hmac.o	\
 	pbkdf2.o		
@@ -51,8 +45,6 @@ SUBDIROBJLISTS= des/OBJS.ST md4/OBJS.ST 	\
 		aes/OBJS.ST			\
 		camellia/OBJS.ST
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 includes:: depend
 
@@ -60,97 +52,6 @@ depend:: $(SRCS)
 
 clean-unix:: clean-libobjs
 
-all-windows::
-	cd ..\des
-	@echo Making in crypto\des
-	$(MAKE) -$(MFLAGS)
-	cd ..\md4
-	@echo Making in crypto\md4
-	$(MAKE) -$(MFLAGS)
-	cd ..\md5
-	@echo Making in crypto\md5
-	$(MAKE) -$(MFLAGS)
-	cd ..\sha1
-	@echo Making in crypto\sha1
-	$(MAKE) -$(MFLAGS)
-	cd ..\sha2
-	@echo Making in crypto\sh2a
-	$(MAKE) -$(MFLAGS)
-	cd ..\hash_provider
-	@echo Making in crypto\hash_provider
-	$(MAKE) -$(MFLAGS)
-	cd ..\enc_provider
-	@echo Making in crypto\enc_provider
-	$(MAKE) -$(MFLAGS)
-	cd ..\aes
-	@echo Making in crypto\aes
-	$(MAKE) -$(MFLAGS)
-	cd ..\camellia
-	@echo Making in crypto\aes
-	$(MAKE) -$(MFLAGS)
-	cd ..
-
-clean-windows::
-	cd ..\des
-	@echo Making clean in crypto\des
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\md4
-	@echo Making clean in crypto\md4
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\md5
-	@echo Making clean in crypto\md5
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\sha2
-	@echo Making clean in crypto\sha2
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\sha1
-	@echo Making clean in crypto\sha1
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\hash_provider
-	@echo Making clean in crypto\hash_provider
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\enc_provider
-	@echo Making clean in crypto\enc_provider
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\aes
-	@echo Making clean in crypto\aes
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\camellia
-	@echo Making clean in crypto\aes
-	$(MAKE) -$(MFLAGS) clean
-	cd ..
-
-check-windows::
-	cd ..\des
-	@echo Making check in crypto\des
-	$(MAKE) -$(MFLAGS) check
-	cd ..\md4
-	@echo Making check in crypto\md4
-	$(MAKE) -$(MFLAGS) check
-	cd ..\md5
-	@echo Making check in crypto\md5
-	$(MAKE) -$(MFLAGS) check
-	cd ..\sha1
-	@echo Making check in crypto\sha1
-	$(MAKE) -$(MFLAGS) check
-	cd ..\sha2
-	@echo Making check in crypto\sha2
-	$(MAKE) -$(MFLAGS) check
-	cd ..\hash_provider
-	@echo Making check in crypto\hash_provider
-	$(MAKE) -$(MFLAGS) check
-	cd ..\enc_provider
-	@echo Making check in crypto\enc_provider
-	$(MAKE) -$(MFLAGS) check
-	cd ..\aes
-	@echo Making check in crypto\aes
-	$(MAKE) -$(MFLAGS) check
-	cd ..\camellia
-	@echo Making check in crypto\aes
-	$(MAKE) -$(MFLAGS) check
-	cd ..
-
-
 @lib_frag@
 @libobj_frag@
 
diff --git a/src/lib/crypto/nss/aes/Makefile.in b/src/lib/crypto/nss/aes/Makefile.in
index 9855eafb0..ffbd4ba50 100644
--- a/src/lib/crypto/nss/aes/Makefile.in
+++ b/src/lib/crypto/nss/aes/Makefile.in
@@ -2,15 +2,11 @@
 # system currently assumes that all modules have the same directory
 # structure.
 
-mydir=lib/crypto/nss/aes
+mydir=lib$(S)crypto$(S)nss$(S)aes
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk  -I$(srcdir)/../../../../include
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=aes
-##DOS##OBJFILE=..\$(OUTPRE)aes.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -21,20 +17,13 @@ OBJS=
 SRCS=
 
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs 
 
 includes:: depend
 
 depend:: $(SRCS)
 
-check:: 
-
-
 clean-unix:: clean-libobjs
 
-clean::
-
 @libobj_frag@
 
diff --git a/src/lib/crypto/nss/camellia/Makefile.in b/src/lib/crypto/nss/camellia/Makefile.in
index c937f2197..b8feffc5d 100644
--- a/src/lib/crypto/nss/camellia/Makefile.in
+++ b/src/lib/crypto/nss/camellia/Makefile.in
@@ -2,15 +2,11 @@
 # system currently assumes that all modules have the same directory
 # structure.
 
-mydir=lib/crypto/nss/camellia
+mydir=lib$(S)crypto$(S)nss$(S)camellia
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk  -I$(srcdir)/../../../../include
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=camellia
-##DOS##OBJFILE=..\$(OUTPRE)camellia.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -21,20 +17,13 @@ OBJS=
 SRCS=
 
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs 
 
 includes:: depend
 
 depend:: $(SRCS)
 
-check:: 
-
-
 clean-unix:: clean-libobjs
 
-clean::
-
 @libobj_frag@
 
diff --git a/src/lib/crypto/nss/des/Makefile.in b/src/lib/crypto/nss/des/Makefile.in
index dc0e5e8ee..c8ab6e429 100644
--- a/src/lib/crypto/nss/des/Makefile.in
+++ b/src/lib/crypto/nss/des/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/nss/des
+mydir=lib$(S)crypto$(S)nss$(S)des
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../krb \
@@ -6,10 +6,6 @@ LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../krb \
 
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=des
-##DOS##OBJFILE=..\$(OUTPRE)des.lst
-
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
@@ -31,20 +27,12 @@ SRCS=	$(srcdir)/f_parity.c	\
 	$(srcdir)/string2key.c
 
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
-check-unix:: 
-
 includes:: depend
 
 depend:: $(SRCS)
 
-check-windows::
-
-clean::
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@
diff --git a/src/lib/crypto/nss/enc_provider/Makefile.in b/src/lib/crypto/nss/enc_provider/Makefile.in
index f1ed5fb06..579072df3 100644
--- a/src/lib/crypto/nss/enc_provider/Makefile.in
+++ b/src/lib/crypto/nss/enc_provider/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/nss/enc_provider
+mydir=lib$(S)crypto$(S)nss$(S)enc_provider
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/../des 	\
@@ -10,10 +10,6 @@ LOCALINCLUDES = -I$(srcdir)/../des 	\
 		$(CRYPTO_IMPL_CFLAGS)
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=enc_provider
-##DOS##OBJFILE=..\$(OUTPRE)enc_prov.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -41,8 +37,6 @@ SRCS= \
 	$(srcdir)/camellia.c 	\
 	$(srcdir)/rc4.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
diff --git a/src/lib/crypto/nss/hash_provider/Makefile.in b/src/lib/crypto/nss/hash_provider/Makefile.in
index 36ba7b2df..719b50079 100644
--- a/src/lib/crypto/nss/hash_provider/Makefile.in
+++ b/src/lib/crypto/nss/hash_provider/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/nss/hash_provider
+mydir=lib$(S)crypto$(S)nss$(S)hash_provider
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/../../krb/crc32 -I$(srcdir)/../md4 \
@@ -7,10 +7,6 @@ LOCALINCLUDES = -I$(srcdir)/../../krb/crc32 -I$(srcdir)/../md4 \
 
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=hash_provider
-##DOS##OBJFILE=..\$(OUTPRE)hash_pro.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -33,8 +29,6 @@ SRCS=	$(srcdir)/hash_gen.c	\
 	$(srcdir)/hash_md5.c 	\
 	$(srcdir)/hash_sha1.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
diff --git a/src/lib/crypto/nss/md4/Makefile.in b/src/lib/crypto/nss/md4/Makefile.in
index f7cb02835..dfb0182fa 100644
--- a/src/lib/crypto/nss/md4/Makefile.in
+++ b/src/lib/crypto/nss/md4/Makefile.in
@@ -1,12 +1,8 @@
-mydir=lib/crypto/nss/md4
+mydir=lib$(S)crypto$(S)nss$(S)md4
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=md4
-##DOS##OBJFILE=..\$(OUTPRE)md4.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -16,21 +12,12 @@ OBJS= $(OUTPRE)md4.$(OBJEXT)
 
 SRCS= $(srcdir)/md4.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
 
 depend:: $(SRCS)
 
-
-check-unix:: 
-
-check-windows::
-
-clean:: 
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@
diff --git a/src/lib/crypto/nss/md5/Makefile.in b/src/lib/crypto/nss/md5/Makefile.in
index 83699a3f1..b0cde50e9 100644
--- a/src/lib/crypto/nss/md5/Makefile.in
+++ b/src/lib/crypto/nss/md5/Makefile.in
@@ -1,11 +1,7 @@
-mydir=lib/crypto/nss/md5
+mydir=lib$(S)crypto$(S)nss$(S)md5
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=md5
-##DOS##OBJFILE=..\$(OUTPRE)md5.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
@@ -18,20 +14,12 @@ OBJS= $(OUTPRE)md5.$(OBJEXT)
 
 SRCS= $(srcdir)/md5.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
 
 depend:: $(SRCS)
 
-check-unix:: 
-
-check-windows::
-
-clean:: 
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@
diff --git a/src/lib/crypto/nss/sha1/Makefile.in b/src/lib/crypto/nss/sha1/Makefile.in
index 7afeb3813..82d6d9b91 100644
--- a/src/lib/crypto/nss/sha1/Makefile.in
+++ b/src/lib/crypto/nss/sha1/Makefile.in
@@ -1,13 +1,9 @@
-mydir=lib/crypto/nss/sha1
+mydir=lib$(S)crypto$(S)nss$(S)sha1
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/.. $(CRYPTO_IMPL_CFLAGS)
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=sha1
-##DOS##OBJFILE=..\$(OUTPRE)sha1.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -17,16 +13,12 @@ OBJS= $(OUTPRE)shs.$(OBJEXT)
 
 SRCS= $(srcdir)/shs.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
 
 depend:: $(SRCS)
 
-clean::
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@
diff --git a/src/lib/crypto/nss/sha2/Makefile.in b/src/lib/crypto/nss/sha2/Makefile.in
index c0605e8de..a8edb60d9 100644
--- a/src/lib/crypto/nss/sha2/Makefile.in
+++ b/src/lib/crypto/nss/sha2/Makefile.in
@@ -1,13 +1,9 @@
-mydir=lib/crypto/nss/sha2
+mydir=lib$(S)crypto$(S)nss$(S)sha2
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/.. $(CRYPTO_IMPL_CFLAGS)
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=sha1
-##DOS##OBJFILE=..\$(OUTPRE)sha2.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -17,16 +13,12 @@ OBJS= $(OUTPRE)sha2.$(OBJEXT)
 
 SRCS= $(srcdir)/sha2.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
 
 depend:: $(SRCS)
 
-clean::
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@