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

3 files changed, 46 insertions, 22 deletions

diff --git a/src/windows/ChangeLog b/src/windows/ChangeLog
index 30d9bb78ec..4a40ba9437 100644
--- a/src/windows/ChangeLog
+++ b/src/windows/ChangeLog
@@ -1,3 +1,11 @@
+Tue May 18 19:52:56 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Remove - from recursive Win32 make invocation.
+
+	* readme: Update with Unix-less build method.  Add notice saying
+		we build with MSVC++ 6.0 and do not know whether it works
+		with other compiler/make utilties.
+
 Mon May 17 19:53:28 1999  Danilo Almeida  <dalmeida@mit.edu>
 
 	* version.rc: Boost version to 1.0.6.
diff --git a/src/windows/Makefile.in b/src/windows/Makefile.in
index 04899ae4e6..925a23c957 100644
--- a/src/windows/Makefile.in
+++ b/src/windows/Makefile.in
@@ -7,35 +7,35 @@ NO_OUTPRE=1
 all-windows::
 	@echo Making in windows\lib
 	cd lib
-	-$(MAKE) -$(MAKEFLAGS) LIBCMD=$(LIBCMD)
+	$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD)
 	@echo Making in windows\cns
 	cd ..\cns
-	-$(MAKE) -$(MAKEFLAGS) LIBCMD=$(LIBCMD)
+	$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD)
 	@echo Making in windows\wintel
 	cd ..\wintel
-	-$(MAKE) -$(MAKEFLAGS) LIBCMD=$(LIBCMD)
+	$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD)
 	@echo Making in windows\gss
 	cd ..\gss
-	-$(MAKE) -$(MAKEFLAGS) LIBCMD=$(LIBCMD)
+	$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD)
 	@echo Making in windows\gina
 	cd ..\gina
-	-$(MAKE) -$(MAKEFLAGS) LIBCMD=$(LIBCMD)
+	$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD)
 	cd ..
 
 clean-windows::
 	@echo Making clean in windows\lib
 	cd lib
-	-$(MAKE) -$(MAKEFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	@echo Making clean in windows\cns
 	cd ..\cns
-	-$(MAKE) -$(MAKEFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	@echo Making clean in windows\wintel
 	cd ..\wintel
-	-$(MAKE) -$(MAKEFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	@echo Making clean in windows\gss
 	cd ..\gss
-	-$(MAKE) -$(MAKEFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	@echo Making clean in windows\gina
 	cd ..\gina
-	-$(MAKE) -$(MAKEFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..
diff --git a/src/windows/readme b/src/windows/readme
index df4e5b2238..0bcedafe3a 100644
--- a/src/windows/readme
+++ b/src/windows/readme
@@ -1,11 +1,22 @@
-Windows Kerberos 5
+Building Windows Kerberos 5
 
-Here are the steps for making the Windows version of Kerberos 5.
+We build Kerberos 5 on Windows just with MSVC++ 6.0.  You should
+not need anything else.  We do not know whether it currently
+builds with other compilers or make utilities.
+
+There are two basic methods for making the Windows version of Kerberos
+5.  The traditional method involves starting on a Unix machine and
+creating a distribution that can be built on Windows.  The second
+method works from the sources that come from the CVS tree if you have
+certain Unix-type utilities.
+
+Traditional Method:
+------------------
 
 On the Unix side
 1) cd xxx/src                          # Go to where the source lives
-2) make -f Makefile.in kerbsrc.zip     # Does some Unix-side configuring
-                                       # ...and creates kerbsrc.zip
+2) make -f Makefile.in kerbsrc.zip     # Do some Unix-side configuring
+                                       # ...and create kerbsrc.zip
 3) <transfer kerbsrc.zip to the PC>
 
 
@@ -15,15 +26,20 @@ On the PC side
 3) unzip kerbsrc.zip
         - or -
    pkunzip -d kerbsrc.zip
+4) nmake -nologo                       # Build the sources
+5) nmake mkbin			       # Place binaries generated by the 
+                                       # ...build in the kbin directory
+6) <make sure the configuration file krb5.ini is in the \windows or \winnt 
+    directory.>
 
-4) nmake -c                            # Configures the makefiles and runs
-                                       # ...make in all the subdirectories.
 
-5) mkbin			       # This will run a patch file which
-				       # collects the DLL's and executables
-                                       # generated by the build procedure
-                                       # and place them in the kbin directory
+All-Windows Method:
+------------------
 
-6) <make sure the configuration file krb5.ini is in the \windows or \winnt 
-    directory.>
+First, make sure you have sed, gawk, cat, and cp.
 
+1) cd xxx/src                          # Go to where the source lives
+2) nmake -f Makefile.in prep-windows   # Create Makefile for Windows
+3) nmake -nologo                       # Build the sources
+4) nmake mkbin			       # Place binaries generated by the 
+                                       # ...build in the kbin directory