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

4 files changed, 42 insertions, 15 deletions

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 8fcd8e6c1..274302105 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,14 @@
+Wed May 19 11:33:15 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Remove copying of header files for Win32.  These
+		will be copied only if needed by the components that are
+		responsible for the header files (gssapi, et, and
+		profile).
+
+Tue May 18 19:52:56 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Remove - from recursive Win32 make invocation.
+
 Mon May 17 12:30:58 1999  Danilo Almeida  <dalmeida@mit.edu>
 
 	* Makefile.in: Add NO_OUTPRE flag to prevent creation of output
diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index 1f7a5100c..db023fc69 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -10,14 +10,9 @@ all-unix:: krb5.h adm_err.h
 all-mac::
 
 all-windows::
-	copy $(BUILDTOP)\util\et\com_err.h .
-	copy $(BUILDTOP)\util\profile\profile.h .
-	if not exist gssapi\nul mkdir gssapi
-	copy $(BUILDTOP)\lib\gssapi\generic\gssapi.h gssapi
-	copy $(BUILDTOP)\lib\gssapi\generic\gssapi_generic.h gssapi
-	cd krb5
 	@echo Making in include\krb5
-	-$(MAKE) -$(MFLAGS)
+	cd krb5
+	$(MAKE) -$(MFLAGS)
 	cd ..
 
 krb5/autoconf.h:
@@ -70,7 +65,7 @@ clean-windows::
 	if exist gssapi\nul rmdir gssapi
 	cd krb5
 	@echo Making clean in include\krb5
-	-$(MAKE) -$(MFLAGS) clean
+	$(MAKE) -$(MFLAGS) clean
 	cd ..
 	@echo Making clean in include
 
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 39f31f7ad..51b4ccbcc 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,11 @@
+Wed May 19 11:35:18 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Create build rules for windows instead of blindly
+		copying files.  Wrap Unix build rules with !if 0/!endif
+		that get used only in windows build.  People need to
+		remember to keep this !if/!endif in the proper place when
+		they modify this file.
+
 Mon May 17 12:33:58 1999  Danilo Almeida  <dalmeida@mit.edu>
 
 	* Makefile.in: Add NO_OUTPRE flag to prevent creation of output
diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index a3ab510a1..68dec6699 100644
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -17,11 +17,21 @@ BUILT_HEADERS = osconf.h
 
 all-unix:: autoconf.h $(BUILT_HEADERS)
 all-mac:: $(BUILT_HEADERS)
-all-windows::
-	$(RM) osconf.h autoconf.h autoconf.stamp
-	copy stock\osconf.h osconf.h
-	copy ..\win-mac.h autoconf.h
+all-windows:: autoconf.h $(BUILT_HEADERS)
+
+##DOS##autoconf.h: ..\win-mac.h
+##DOS##	$(CP) ..\win-mac.h $@
+##DOS##osconf.h: stock\osconf.h
+##DOS##	$(CP) stock\osconf.h $@
+
+# We need to comment out the Unix autoconf.h and osconf.h block below
+# if we're building for Windows.  Thus, we need to enclose them
+# between the lines "##DOS##!if 0" and "##DOS##!endif".  We enclosed
+# the entire section between the long hashed lines to make the block
+# stand out.
 
+###############################################################################
+##DOS##!if 0
 # Should only rebuild autoconf.h here (use CONFIG_FILES=), but the weird krb5
 # makefile post-processing is unconditional and would trash the makefile.
 autoconf.h: autoconf.stamp
@@ -29,9 +39,6 @@ autoconf.stamp: $(srcdir)/autoconf.h.in $(thisconfigdir)/config.status
 	(cd $(thisconfigdir) && $(SHELL) config.status)
 	touch autoconf.stamp
 
-depend::
-
-install::
 SYSCONFDIR = @sysconfdir@
 LOCALSTATEDIR = @localstatedir@
 PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$(KRB5RCTMPDIR)+" \
@@ -46,6 +53,12 @@ osconf.h: $(OSCONFSRC)
 	cat $(OSCONFSRC) | sed $(PROCESS_REPLACE) > osconf.new
 	@if cmp -s osconf.new osconf.h ; then :; \
 	else (set -x; $(RM) osconf.h ; $(CP) osconf.new osconf.h; $(RM) osconf.new) fi
+##DOS##!endif
+###############################################################################
+
+depend::
+
+install::
 
 clean::
 	$(RM) osconf.new $(BUILT_HEADERS)