From 43e6c5bb19b61dcd315ecd83a00c37da12ef05c6 Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@mit.edu>
Date: Sat, 19 Jun 2004 00:06:48 +0000
Subject: [PATCH] * Makefile.in (all-windows): Make autoconf.h in include\krb5
 before building anything else. (WINMAKEFILES): Add util\support\Makefile.
 (util\support\Makefile) [DOS]: New target. (CE): New variable. ($(CE)test1.h,
 $(CE)test2.h, $(CE)test1.c, $(CE)test2.c): New targets.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16490 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/ChangeLog   | 10 ++++++++++
 src/Makefile.in | 17 ++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 5385ae13e..80b492bb3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2004-06-18  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (all-windows): Make autoconf.h in include\krb5
+	before building anything else.
+	(WINMAKEFILES): Add util\support\Makefile.
+	(util\support\Makefile) [DOS]: New target.
+	(CE): New variable.
+	($(CE)test1.h, $(CE)test2.h, $(CE)test1.c, $(CE)test2.c): New
+	targets.
+
 2004-06-16  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (MACFILES, MAC_SUBDIRS): Don't set.
diff --git a/src/Makefile.in b/src/Makefile.in
index 41017bfed..49c8614f1 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -24,8 +24,11 @@ update-autoconf-h:
 	(cd include && $(MAKE) krb5/autoconf.h)
 
 all-windows:: maybe-awk Makefile-windows
+	@echo Making autoconf.h in include\krb5
+	cd include\krb5
+	$(MAKE) -$(MFLAGS) autoconf.h
 	@echo Making in util
-	cd util
+	cd ..\..\util
 	$(MAKE) -$(MFLAGS)
 	@echo Making in include
 	cd ..\include
@@ -166,6 +169,7 @@ WINMAKEFILES=Makefile \
 	lib\krb5\rcache\Makefile \
 	util\Makefile \
 	util\et\Makefile util\profile\Makefile \
+	util\support\Makefile \
 	util\windows\Makefile \
 	windows\Makefile windows\lib\Makefile \
 	windows\cns\Makefile windows\gina\Makefile \
@@ -268,6 +272,8 @@ WINMAKEFILES=Makefile \
 ##DOS##	$(WCONFIG) config < $@.in > $@
 ##DOS##util\profile\Makefile: util\profile\Makefile.in $(MKFDEP)
 ##DOS##	$(WCONFIG) config < $@.in > $@
+##DOS##util\support\Makefile: util\support\Makefile.in $(MKFDEP)
+##DOS##	$(WCONFIG) config < $@.in > $@
 ##DOS##util\windows\Makefile: util\windows\Makefile.in $(MKFDEP)
 ##DOS##	$(WCONFIG) config < $@.in > $@
 ##DOS##windows\Makefile: windows\Makefile.in $(MKFDEP)
@@ -358,6 +364,7 @@ ET  = lib/krb5/error_tables/
 GG  = lib/gssapi/generic/
 GK  = lib/gssapi/krb5/
 PR  = util/profile/
+CE  = util/et/
 
 ETOUT =	\
 	$(INC)asn1_err.h $(ET)asn1_err.c \
@@ -435,6 +442,10 @@ $(GG)gssapi_err_generic.h: $(AH) $(GG)gssapi_err_generic.et
 	$(AWK) -f $(AH) outfile=$@ $(GG)gssapi_err_generic.et
 $(GK)gssapi_err_krb5.h: $(AH) $(GK)gssapi_err_krb5.et
 	$(AWK) -f $(AH) outfile=$@ $(GK)gssapi_err_krb5.et
+$(CE)test1.h: $(AH) $(CE)test1.et
+	$(AWK) -f $(AH) outfile=$@ $(CE)test1.et
+$(CE)test2.h: $(AH) $(CE)test2.et
+	$(AWK) -f $(AH) outfile=$@ $(CE)test2.et
 
 $(ET)asn1_err.c: $(AC) $(ET)asn1_err.et
 	$(AWK) -f $(AC) outfile=$@ $(ET)asn1_err.et
@@ -456,6 +467,10 @@ $(GG)gssapi_err_generic.c: $(AC) $(GG)gssapi_err_generic.et
 	$(AWK) -f $(AC) outfile=$@ $(GG)gssapi_err_generic.et
 $(GK)gssapi_err_krb5.c: $(AC) $(GK)gssapi_err_krb5.et
 	$(AWK) -f $(AC) outfile=$@ $(GK)gssapi_err_krb5.et
+$(CE)test1.c: $(AC) $(CE)test1.et
+	$(AWK) -f $(AC) outfile=$@ $(CE)test1.et
+$(CE)test2.c: $(AC) $(CE)test2.et
+	$(AWK) -f $(AC) outfile=$@ $(CE)test2.et
 
 lib/krb4/krb_err_txt.c: lib/krb4/krb_err.et
 	$(AWK) -f lib/krb4/et_errtxt.awk outfile=$@ \
-- 
2.26.2