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

6 files changed, 52 insertions, 6 deletions

diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index 61ce7d7ef..c72703068 100644
--- a/src/util/ChangeLog
+++ b/src/util/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 19 11:43:36 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Add all and cleanup rules for windows for windows,
+		et, and profile subdirectories.
+
 Sat May 15 19:48:31 1999  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* makeshlib.sh (library): Add -bnoentry to the AIX shared library
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 9777d7972..b374d7cd4 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -14,7 +14,31 @@ SLIBSH=sed -e 's,@''CC''@,$(CC),g' -e 's,@''HOST_TYPE''@,$(HOST_TYPE),g' -e 's,@
 
 all-recurse: libupdate makeshlib
 all-mac::
-all-windows: libupdate
+
+NO_OUTDIR=1
+all-windows::
+	@echo Making in util\windows
+	cd windows
+	$(MAKE) -$(MFLAGS)
+	@echo Making in util\et
+	cd ..\et
+	$(MAKE) -$(MFLAGS) 
+	@echo Making in util\profile
+	cd ..\profile
+	$(MAKE) -$(MFLAGS) 
+	cd ..
+
+clean-windows::
+	@echo Making clean in util\windows
+	cd windows
+	$(MAKE) -$(MFLAGS) clean
+	@echo Making clean in util\et
+	cd ..\et
+	$(MAKE) -$(MFLAGS) clean
+	@echo Making clean in util\profile
+	cd ..\profile
+	$(MAKE) -$(MFLAGS) clean
+	cd ..
 
 # this is necessary because the db2 build, which is intended to be
 # standalone, of course does not know to make symlinks in the right
diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog
index 80fcb44cd..e11c67ce0 100644
--- a/src/util/et/ChangeLog
+++ b/src/util/et/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 19 11:44:31 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Add windows build rules for putting header files in
+		include dir.  Do cleanup of header for windows clean.
+
 Mon May 10 15:27:07 1999  Danilo Almeida  <dalmeida@mit.edu>
 
 	* Makefile.in: Do win32 build in subdir.
diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in
index ff81a70e2..7385943df 100644
--- a/src/util/et/Makefile.in
+++ b/src/util/et/Makefile.in
@@ -61,10 +61,12 @@ SHLIB_LIBS=
 SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@	
 SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
 
+COM_ERR_HDR=$(BUILDTOP)$(S)include$(S)com_err.h
 
-all-windows:: $(OBJFILE)
-	copy com_err.h $(BUILDTOP)\include
+all-windows:: $(COM_ERR_HDR)
 
+$(COM_ERR_HDR): com_err.h
+	$(CP) com_err.h $@
 
 error_table.c: et_lex.lex.c 
 error_table.c: $(srcdir)/error_table.y
@@ -145,7 +147,7 @@ clean-files::
 		eddep makedep *.ln
 
 clean-windows::
-	$(RM) $(OUTPRE)comerr.lib comerr.bak
+	$(RM) $(COM_ERR_HDR)
 
 com_err.ps : com_err.dvi
 com_err.dvi: com_err.texinfo
diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog
index 31bebbb9a..e9917c633 100644
--- a/src/util/profile/ChangeLog
+++ b/src/util/profile/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 19 11:46:02 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Add windows build rules for putting header files in
+		include dir.  Do cleanup of header for windows clean.
+
 Mon May 10 15:27:19 1999  Danilo Almeida  <dalmeida@mit.edu>
 
 	* Makefile.in: Do win32 build in subdir.
diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in
index 1dc5ee026..4d15050a3 100644
--- a/src/util/profile/Makefile.in
+++ b/src/util/profile/Makefile.in
@@ -51,9 +51,14 @@ SHLIB_RDIRS=$(KRB5_LIBDIR)
 
 STOBJLISTS=OBJS.ST
 
+PROFILE_HDR=$(BUILDTOP)$(S)include$(S)profile.h
+
 all-unix:: includes test_parse test_profile
 all-unix:: all-libs
-all-windows::
+all-windows:: $(PROFILE_HDR)
+
+$(PROFILE_HDR):: profile.h
+	$(CP) profile.h $@
 
 includes:: profile.h
 	if cmp profile.h \
@@ -106,7 +111,7 @@ clean-unix:: clean-libs clean-libobjs
 		prof_err.c test_profile profile.h
 
 clean-windows::
-	$(RM) $(OUTPRE)profile.lib profile.bak $(OUTPRE)test_parse.exe $(OUTPRE)test_profile.exe
+	$(RM) $(PROFILE_HDR)
 
 check-windows:: $(OUTPRE)test_profile.exe $(OUTPRE)test_parse.exe
 	$(RM) $(OUTPRE)*.obj