summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2004-03-14 05:10:06 +0000
committerKen Raeburn <raeburn@mit.edu>2004-03-14 05:10:06 +0000
commitb0e9e6dbb168010e3cec14e714a4c1ae34a597d1 (patch)
tree4731179d6d21513e03b5f97daa4dda67042a8e22
parent7b6a6167c1dd23bf551e34c43362fac658227ce1 (diff)
downloadkrb5-b0e9e6dbb168010e3cec14e714a4c1ae34a597d1.tar.gz
krb5-b0e9e6dbb168010e3cec14e714a4c1ae34a597d1.tar.xz
krb5-b0e9e6dbb168010e3cec14e714a4c1ae34a597d1.zip
Make sure autoconf.h is updated early, since it's needed by the thread support
* Makefile.in (update-autoconf-h): New target. Checks that include/krb5/autoconf.h is current. (all-prerecurse): Depend on it. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16164 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/ChangeLog6
-rw-r--r--src/Makefile.in8
2 files changed, 14 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 22ee3073d..d52f85599 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-14 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (update-autoconf-h): New target. Checks that
+ include/krb5/autoconf.h is current.
+ (all-prerecurse): Depend on it.
+
2004-03-08 Ken Raeburn <raeburn@mit.edu>
* Makefile.in (SUBDIRS): Renamed from MY_SUBDIRS.
diff --git a/src/Makefile.in b/src/Makefile.in
index 1918d0b03..d424b4c6d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -15,6 +15,14 @@ DISTFILES = $(SRCS) $(HDRS) COPYING COPYING.LIB ChangeLog Makefile.in
all-unix:: krb5-config
+# Lots of things will start to depend on the thread support, which
+# needs autoconf.h, but building "all" in include requires that util/et
+# have been built first. Until we can untangle this, let's just check
+# that autoconf.h is up to date before going into any of the subdirectories.
+all-prerecurse: update-autoconf-h
+update-autoconf-h:
+ (cd include && $(MAKE) krb5/autoconf.h)
+
all-mac::
all-windows:: maybe-awk Makefile-windows