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

5 files changed, 7 insertions, 37 deletions

diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index 1316c29fe..4a742ecc6 100644
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/gssapi
+mydir=lib$(S)gssapi
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS= generic krb5 spnego mechglue
 DEFS=-D_GSS_STATIC_LINK=1
@@ -56,37 +56,6 @@ merged-gssapi-header.h: $(EXPORTED_HEADERS)
 verify-calling-conventions-gssapi: merged-gssapi-header.h
 	$(PERL) -w $(top_srcdir)/util/def-check.pl merged-gssapi-header.h $(srcdir)/../gssapi32.def
 
-all-windows::
-	cd generic
-	@echo Making in gssapi\generic
-	$(MAKE) -$(MFLAGS)
-	cd ..\krb5
-	@echo Making in gssapi\krb5
-	$(MAKE) -$(MFLAGS)
-	cd ..\mechglue
-	@echo Making in gssapi\mechglue
-	$(MAKE) -$(MFLAGS)
-	cd ..\spnego
-	@echo Making in gssapi\spnego
-	$(MAKE) -$(MFLAGS)
-	cd ..
-
-clean-windows::
-	cd generic
-	@echo Making clean in gssapi\generic
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\krb5
-	@echo Making clean in gssapi\krb5
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\mechglue
-	@echo Making clean in gssapi\mechglue
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\spnego
-	@echo Making clean in gssapi\spnego
-	$(MAKE) -$(MFLAGS) clean
-	cd ..
-	@echo Making clean in gssapi
-
 # These rules are an attempt to handle several different problems:
 #
 # Certain files in subdirectories must be made current by the
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index d68e5f56b..9221d0b9a 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/gssapi/generic
+mydir=lib$(S)gssapi$(S)generic
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I. -I$(srcdir) -I$(srcdir)/..
 DEFS=
diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index a439bef7c..0ff0d39b2 100644
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/gssapi/krb5
+mydir=lib$(S)gssapi$(S)krb5
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I. -I$(srcdir) -I$(srcdir)/.. -I../generic -I$(srcdir)/../generic -I../mechglue -I$(srcdir)/../mechglue
 DEFS=-D_GSS_STATIC_LINK=1
@@ -237,7 +237,8 @@ error_map.h: $(top_srcdir)/util/gen-map.pl \
 		VALUE="char *" \
 		COMPARE=compare_OM_uint32 \
 		FREEVALUE=free_string
-	$(MV) error_map.new error_map.h
+	$(RM) $@
+	$(MV) error_map.new $@
 
 clean-unix::
 	$(RM) $(BUILDTOP)/include/gssapi/gssapi_krb5.h
diff --git a/src/lib/gssapi/mechglue/Makefile.in b/src/lib/gssapi/mechglue/Makefile.in
index d2dccb46b..7bb2069da 100644
--- a/src/lib/gssapi/mechglue/Makefile.in
+++ b/src/lib/gssapi/mechglue/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/gssapi/mechglue
+mydir=lib$(S)gssapi$(S)mechglue
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I. -I$(srcdir) -I$(srcdir)/.. -I../generic -I$(srcdir)/../generic -I../krb5 -I$(srcdir)/../krb5 -I../spnego -I$(srcdir)/../spnego
 DEFS=-D_GSS_STATIC_LINK=1
diff --git a/src/lib/gssapi/spnego/Makefile.in b/src/lib/gssapi/spnego/Makefile.in
index 16741eba4..49f67abc5 100644
--- a/src/lib/gssapi/spnego/Makefile.in
+++ b/src/lib/gssapi/spnego/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/gssapi/spnego
+mydir=lib$(S)gssapi$(S)spnego
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I. -I$(srcdir) -I$(srcdir)/.. -I../generic -I$(srcdir)/../generic -I../mechglue -I$(srcdir)/../mechglue
 DEFS=-D_GSS_STATIC_LINK=1