These are a bunch of intertwined changes to the windows build.

This log message includes all of the different changes across several
Makefile.in files (and win-pre.in and win-post.in):

- Remove "-" from recursive windows make invocations so that we can bail
  on a build error.  New MIGNORE option restores the previous bailing
  behavior.
- Update windows readme to reflect current practices.
- Add NO_OUTDIR synonym for NO_OUTPRE in windows build.
- Top-level windows Makefile now builds util which now builds
  util/windows, util/et, and util/profile (instead of building them
  directly).
- Remove trailing backslash from rule that creates the windows output dir.
  This backslash would cause the rule to always be invoked.
- Move WCONFIG and WCONFIG_EXE definitions into win-pre.in.
- Remove rules in include directory that blindly copy include header
  files from gssapi, et, and profile.  Instead, use/add build rules to
  the components that generate them that copy only when the file changes.
- Use dependencies in include/krb5 to copy header files instead of blindly
  copying them.  Add !if 0/!endif wrapper to Unix version of the rules.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11464 dc483132-0cff-0310-8789-dd5450dbe970

16 files changed, 115 insertions, 77 deletions

diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index 4bab41370f..a5cdf0b9a1 100644
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 18 19:52:56 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Remove - from recursive Win32 make invocation.
+
 Mon May 17 19:50:53 1999  Danilo Almeida  <dalmeida@mit.edu>
 
 	* Makefile.in: Use only one resource file per binary.
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index f80486579f..a602d82115 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -151,19 +151,19 @@ profile.lib: $(PLIB)
 all-windows:: 
 	@echo Making in lib\crypto
 	cd crypto
-	-$(MAKE) -$(MFLAGS)
+	$(MAKE) -$(MFLAGS)
 	@echo Making in lib\krb5
 	cd ..\krb5
-	-$(MAKE) -$(MFLAGS) 
+	$(MAKE) -$(MFLAGS) 
 	@echo Making in lib\des425
 	cd ..\des425
-	-$(MAKE) -$(MFLAGS) 
+	$(MAKE) -$(MFLAGS) 
 	@echo Making in lib\krb4
 	cd ..\krb4
-	-$(MAKE) -$(MFLAGS) 
+	$(MAKE) -$(MFLAGS) 
 	@echo Making in lib\gssapi
 	cd ..\gssapi
-	-$(MAKE) -$(MFLAGS) 
+	$(MAKE) -$(MFLAGS) 
 	@echo Making in lib
 	cd ..
 
@@ -173,18 +173,18 @@ lib-windows:: krb5.lib gssapi.lib krb4.lib
 clean-windows::
 	@echo Making clean in lib\crypto
 	cd crypto
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	@echo Making clean in lib\krb5
 	cd ..\krb5
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	@echo Making clean in lib\des425
 	cd ..\des425
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	@echo Making clean in lib\krb4
 	cd ..\krb4
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	@echo Making clean in lib\gssapi
 	cd ..\gssapi
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	@echo Making clean in lib
 	cd ..
diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index 9e5e9c60fa..7d4cf47d64 100644
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 18 19:52:56 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Remove - from recursive Win32 make invocation.
+
 Mon May 10 15:15:00 1999  Danilo Almeida  <dalmeida@mit.edu>
 
 	* Makefile.in: Do win32 build in subdir.
diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index 5717655e17..27956feea4 100644
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -140,108 +140,108 @@ clean::
 all-windows::
 	cd crc32
 	@echo Making in crypto\crc32
-	-$(MAKE) -$(MFLAGS)
+	$(MAKE) -$(MFLAGS)
 	cd ..\des
 	@echo Making in crypto\des
-	-$(MAKE) -$(MFLAGS)
+	$(MAKE) -$(MFLAGS)
 	cd ..\dk
 	@echo Making in crypto\dk
-	-$(MAKE) -$(MFLAGS)
+	$(MAKE) -$(MFLAGS)
 	cd ..\enc_provider
 	@echo Making in crypto\enc_provider
-	-$(MAKE) -$(MFLAGS)
+	$(MAKE) -$(MFLAGS)
 	cd ..\hash_provider
 	@echo Making in crypto\hash_provider
-	-$(MAKE) -$(MFLAGS)
+	$(MAKE) -$(MFLAGS)
 	cd ..\keyhash_provider
 	@echo Making in crypto\keyhash_provider
-	-$(MAKE) -$(MFLAGS)
+	$(MAKE) -$(MFLAGS)
 	cd ..\md4
 	@echo Making in crypto\md4
-	-$(MAKE) -$(MFLAGS)
+	$(MAKE) -$(MFLAGS)
 	cd ..\md5
 	@echo Making in crypto\md5
-	-$(MAKE) -$(MFLAGS)
+	$(MAKE) -$(MFLAGS)
 	cd ..\old
 	@echo Making in crypto\old
-	-$(MAKE) -$(MFLAGS)
+	$(MAKE) -$(MFLAGS)
 	cd ..\raw
 	@echo Making in crypto\raw
-	-$(MAKE) -$(MFLAGS)
+	$(MAKE) -$(MFLAGS)
 	cd ..\sha1
 	@echo Making in crypto\sha1
-	-$(MAKE) -$(MFLAGS)
+	$(MAKE) -$(MFLAGS)
 	cd ..
 
 clean-windows::
 	cd crc32
 	@echo Making in clean crypto\crc32
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..\des
 	@echo Making clean in crypto\des
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..\dk
 	@echo Making clean in crypto\dk
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..\enc_provider
 	@echo Making clean in crypto\enc_provider
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..\hash_provider
 	@echo Making clean in crypto\hash_provider
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..\keyhash_provider
 	@echo Making clean in crypto\keyhash_provider
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..\md4
 	@echo Making clean in crypto\md4
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..\md5
 	@echo Making clean in crypto\md5
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..\old
 	@echo Making clean in crypto\old
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..\raw
 	@echo Making clean in crypto\raw
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..\sha1
 	@echo Making clean in crypto\sha1
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..
 
 check-windows::
 	cd crc32
 	@echo Making in check crypto\crc32
-	-$(MAKE) -$(MFLAGS) check
+	$(MAKE) -$(MFLAGS) check
 	cd ..\des
 	@echo Making check in crypto\des
-	-$(MAKE) -$(MFLAGS) check
+	$(MAKE) -$(MFLAGS) check
 	cd ..\dk
 	@echo Making check in crypto\dk
-	-$(MAKE) -$(MFLAGS) check
+	$(MAKE) -$(MFLAGS) check
 	cd ..\enc_provider
 	@echo Making check in crypto\enc_provider
-	-$(MAKE) -$(MFLAGS) check
+	$(MAKE) -$(MFLAGS) check
 	cd ..\hash_provider
 	@echo Making check in crypto\hash_provider
-	-$(MAKE) -$(MFLAGS) check
+	$(MAKE) -$(MFLAGS) check
 	cd ..\keyhash_provider
 	@echo Making check in crypto\keyhash_provider
-	-$(MAKE) -$(MFLAGS) check
+	$(MAKE) -$(MFLAGS) check
 	cd ..\md4
 	@echo Making check in crypto\md4
-	-$(MAKE) -$(MFLAGS) check
+	$(MAKE) -$(MFLAGS) check
 	cd ..\md5
 	@echo Making check in crypto\md5
-	-$(MAKE) -$(MFLAGS) check
+	$(MAKE) -$(MFLAGS) check
 	cd ..\old
 	@echo Making check in crypto\old
-	-$(MAKE) -$(MFLAGS) check
+	$(MAKE) -$(MFLAGS) check
 	cd ..\raw
 	@echo Making check in crypto\raw
-	-$(MAKE) -$(MFLAGS) check
+	$(MAKE) -$(MFLAGS) check
 	cd ..\sha1
 	@echo Making check in crypto\sha1
-	-$(MAKE) -$(MFLAGS) check
+	$(MAKE) -$(MFLAGS) check
 	cd ..
 
diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index 1c0636f9bc..8f794fa718 100644
--- a/src/lib/gssapi/ChangeLog
+++ b/src/lib/gssapi/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 18 19:52:56 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Remove - from recursive Win32 make invocation.
+
 Mon May 10 15:21:50 1999  Danilo Almeida  <dalmeida@mit.edu>
 
 	* Makefile.in: Do win32 build in subdir.
diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index 30e6b9d544..992615d553 100644
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -37,25 +37,25 @@ clean-windows::
 all-windows::
 	cd generic
 	@echo Making in gssapi\generic
-	-$(MAKE) -$(MFLAGS)
+	$(MAKE) -$(MFLAGS)
 	cd ..\krb5
 	@echo Making in gssapi\krb5
-	-$(MAKE) -$(MFLAGS)
+	$(MAKE) -$(MFLAGS)
 #	cd ..\mechglue
 #	@echo Making in gssapi\mechglue
-#	-$(MAKE) -$(MFLAGS)
+#	$(MAKE) -$(MFLAGS)
 	cd ..
 
 clean-windows::
 	cd generic
 	@echo Making clean in gssapi\generic
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..\krb5
 	@echo Making clean in gssapi\krb5
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 #	cd ..\mechglue
 #	@echo Making clean in gssapi\mechglue
-#	-$(MAKE) -$(MFLAGS) clean
+#	$(MAKE) -$(MFLAGS) clean
 	cd ..
 	@echo Making clean in gssapi
 
diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 08a0e12002..c569582464 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 19 11:39:05 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Fix windows cleanup to ignore any errors while
+		removing gssapi include dir.
+
 Mon May 10 15:22:12 1999  Danilo Almeida  <dalmeida@mit.edu>
 
 	* Makefile.in: Do win32 build in subdir.
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 1e21e04fd2..3b8e8999a1 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -122,7 +122,7 @@ clean-unix:: clean-libobjs
 
 clean-windows::
 	$(RM) $(HDRS)
-	if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
+	-if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
 
 includes-unix::
 	@if test -d $(EHDRDIR); then :; else (set -x; mkdir $(EHDRDIR)) fi
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index e554d09b5f..8e4d75ac5c 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 19 11:40:52 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Add windows build rules for putting header files in
+		include dir.
+
 Mon May 10 15:22:27 1999  Danilo Almeida  <dalmeida@mit.edu>
 
 	* Makefile.in: Do win32 build in subdir.
diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index 0911be555d..54990db0bd 100644
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -170,7 +170,9 @@ EXPORTED_HEADERS= gssapi_krb5.h
 
 ##DOS##LIBOBJS = $(OBJS)
 
-all-windows:: win-include $(SRCS) $(HDRS)
+GSSAPI_KRB5_HDR=$(EHDRDIR)$(S)gssapi_krb5.h
+
+all-windows:: win-include $(GSSAPI_KRB5_HDR) $(SRCS) $(HDRS)
 
 all-unix:: $(SRCS) $(HDRS) includes
 all-unix:: all-libobjs
@@ -189,14 +191,16 @@ clean-unix::
 
 win-include::
 	if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR)
-	copy gssapi_krb5.h $(EHDRDIR)
+
+$(GSSAPI_KRB5_HDR): gssapi_krb5.h
+	$(CP) gssapi_krb5.h $@
 
 clean-unix:: clean-libobjs
 	$(RM) $(ETHDRS) $(ETSRCS)
 
 clean-windows::
 	$(RM) $(EHDRDIR)\gssapi_krb5.h
-	if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
+	-if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
 
 install::
 	@set -x; for f in $(EXPORTED_HEADERS) ; \
diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index 609d060383..796ef65863 100644
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 18 19:52:56 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Remove - from recursive Win32 make invocation.
+
 Mon May 17 14:09:28 1999  Danilo Almeida  <dalmeida@mit.edu>
 
 	* Makefile.in: Make directories for clean-windows target lowercase
diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index 92c319c316..15fd75d1cb 100644
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -65,55 +65,55 @@ clean-windows::
 all-windows::
 	cd asn.1
 	@echo Making in krb5\asn.1
-	-$(MAKE) -$(MFLAGS)
+	$(MAKE) -$(MFLAGS)
 	cd ..\ccache
 	@echo Making in krb5\ccache
-	-$(MAKE) -$(MFLAGS)
+	$(MAKE) -$(MFLAGS)
 	cd ..\error_tables
 	@echo Making in krb5\error_tables
-	-$(MAKE) -$(MFLAGS)
+	$(MAKE) -$(MFLAGS)
 	cd ..\keytab
 	@echo Making in krb5\keytab
-	-$(MAKE) -$(MFLAGS)
+	$(MAKE) -$(MFLAGS)
 	cd ..\krb
 	@echo Making in krb5\krb
-	-$(MAKE) -$(MFLAGS)
+	$(MAKE) -$(MFLAGS)
 	cd ..\os
 	@echo Making in krb5\os
-	-$(MAKE) -$(MFLAGS)
+	$(MAKE) -$(MFLAGS)
 	cd ..\posix
 	@echo Making in krb5\posix
-	-$(MAKE) -$(MFLAGS)
+	$(MAKE) -$(MFLAGS)
 	cd ..\rcache
 	@echo Making in krb5\rcache
-	-$(MAKE) -$(MFLAGS)
+	$(MAKE) -$(MFLAGS)
 	cd ..
 
 clean-windows::
 	cd asn.1
 	@echo Making clean in krb5\asn.1
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..\ccache
 	@echo Making clean in krb5\ccache
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..\error_tables
 	@echo Making clean in krb5\error_tables
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..\keytab
 	@echo Making clean in krb5\keytab
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..\krb
 	@echo Making clean in krb5\krb
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..\os
 	@echo Making clean in krb5\os
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..\posix
 	@echo Making clean in krb5\posix
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..\rcache
 	@echo Making clean in krb5\rcache
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..
 	@echo Making clean locally
 
diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index bb66af42bc..5080786448 100644
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 18 19:52:56 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Remove - from recursive Win32 make invocation.
+
 Mon May 17 14:11:45 1999  Danilo Almeida  <dalmeida@mit.edu>
 
 	* Makefile.in: Clean ccapi subdirectory in clean-windows target.
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index ddd34dbded..eafa55773c 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -44,19 +44,19 @@ all-windows:: subdirs $(OBJFILE)
 ##DOS##file\$(OUTPRE)file.lst::
 ##DOS##	cd file
 ##DOS##	@echo Making in krb5\ccache\file
-##DOS##	-$(MAKE) -$(MFLAGS)
+##DOS##	$(MAKE) -$(MFLAGS)
 ##DOS##	cd ..
 
 ##DOS##memory\$(OUTPRE)file.lst::
 ##DOS##	cd memory
 ##DOS##	@echo Making in krb5\ccache\memory
-##DOS##	-$(MAKE) -$(MFLAGS)
+##DOS##	$(MAKE) -$(MFLAGS)
 ##DOS##	cd ..
 
 ##DOS##ccapi\$(OUTPRE)file.lst::
 ##DOS##	cd ccapi
 ##DOS##	@echo Making in krb5\ccache\ccapi
-##DOS##	-$(MAKE) -$(MFLAGS)
+##DOS##	$(MAKE) -$(MFLAGS)
 ##DOS##	cd ..
 
 ##DOS##$(OBJFILE): $(OBJS) file\$(OUTPRE)file.lst memory\$(OUTPRE)file.lst ccapi\$(OUTPRE)file.lst
@@ -71,13 +71,13 @@ clean-unix:: clean-libobjs
 clean-windows::
 	cd file
 	@echo Making clean in krb5\ccache\file
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..\memory
 	@echo Making clean in krb5\ccache\memory
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..\ccapi
 	@echo Making clean in krb5\ccache\ccapi
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..
 	@echo Making clean in krb5\ccache
 	$(RM) $(OBJFILE)
diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog
index eeeac9f94a..9e4cf4c74f 100644
--- a/src/lib/krb5/keytab/ChangeLog
+++ b/src/lib/krb5/keytab/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 18 19:52:56 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Remove - from recursive Win32 make invocation.
+
 Mon May 10 15:25:32 1999  Danilo Almeida  <dalmeida@mit.edu>
 
 	* Makefile.in: Do win32 build in subdir.
diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in
index d4f98f9b74..890e6d5aa3 100644
--- a/src/lib/krb5/keytab/Makefile.in
+++ b/src/lib/krb5/keytab/Makefile.in
@@ -43,7 +43,7 @@ all-windows:: subdirs $(OBJFILE)
 ##DOSfile\$(OUTPRE)file.lst::
 ##DOS	cd file
 ##DOS	@echo Making in krb5\keytab\file
-##DOS	-$(MAKE) -$(MFLAGS)
+##DOS	$(MAKE) -$(MFLAGS)
 ##DOS	cd ..
 
 ##DOS$(OBJFILE): $(OBJS) file\$(OUTPRE)file.lst
@@ -57,7 +57,7 @@ clean-unix:: clean-libobjs
 clean-windows::
 	cd file
 	@echo Making clean in krb5\keytab\file
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..
 	@echo Making clean in krb5\keytab
 	$(RM) $(OBJFILE)