From 67e17b00f7ee483d6c909affe0f86c2cf286cc85 Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@mit.edu>
Date: Wed, 5 Oct 2005 01:40:26 +0000
Subject: [PATCH] Move "make depend" check for built-in db2 into db2 module
 directory

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17409 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/config/ChangeLog            |  4 ++++
 src/config/post.in              | 10 +---------
 src/modules/kdb/db2/ChangeLog   |  3 +++
 src/modules/kdb/db2/Makefile.in | 10 ++++++++++
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 42fcc1e88..8b14118ea 100644
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,5 +1,9 @@
 2005-10-04  Ken Raeburn  <raeburn@mit.edu>
 
+	* post.in ($(BUILDTOP)/.depend-verify-db, depend-verify-db-k5,
+	depend-verify-db-sys): Targets deleted.
+	(DEP_CFG_VERIFY): Don't depend on $(BUILDTOP)/.depend-verify-db.
+
 	* libnover.in (darwin.exports): New target.
 	($(LIBBASE)$(DYNOBJEXT)): New target, instead of
 	$(LIBBASE)$(SHLIBVEXT).
diff --git a/src/config/post.in b/src/config/post.in
index 83de180df..457449b18 100644
--- a/src/config/post.in
+++ b/src/config/post.in
@@ -47,13 +47,6 @@ depend-verify-ss-k5:
 depend-verify-ss-sys:
 	@echo 1>&2 error: cannot build dependencies using system ss package
 	@exit 1
-$(BUILDTOP)/.depend-verify-db: depend-verify-db-$(DB_VERSION)
-depend-verify-db-k5:
-	@if test -r $(BUILDTOP)/.depend-verify-db; then :; \
-		else (set -x; touch $(BUILDTOP)/.depend-verify-db); fi
-depend-verify-db-sys:
-	@echo 1>&2 error: cannot build dependencies using system db package
-	@exit 1
 $(BUILDTOP)/.depend-verify-gcc: depend-verify-gcc-@HAVE_GCC@
 depend-verify-gcc-yes:
 	@if test -r $(BUILDTOP)/.depend-verify-gcc; then :; \
@@ -64,8 +57,7 @@ depend-verify-gcc-no:
 	@exit 1
 
 DEP_CFG_VERIFY = $(BUILDTOP)/.depend-verify-srcdir \
-	$(BUILDTOP)/.depend-verify-et $(BUILDTOP)/.depend-verify-ss \
-	$(BUILDTOP)/.depend-verify-db
+	$(BUILDTOP)/.depend-verify-et $(BUILDTOP)/.depend-verify-ss
 DEP_VERIFY = $(DEP_CFG_VERIFY) $(BUILDTOP)/.depend-verify-gcc
 
 .d: $(ALL_DEP_SRCS) $(DEP_CFG_VERIFY) depend-dependencies
diff --git a/src/modules/kdb/db2/ChangeLog b/src/modules/kdb/db2/ChangeLog
index 604408602..302855e76 100644
--- a/src/modules/kdb/db2/ChangeLog
+++ b/src/modules/kdb/db2/ChangeLog
@@ -8,6 +8,9 @@
 	(DB_VERSION, DB_DEPS, DB_DEPS-sys, DB_DEPS-k5, DB_DEPS-redirect,
 	DB_LIB, KDB5_DB_LIB, DB_DEPLIB, DB_DEPLIB-k5, DB_DEPLIB-sys):
 	Variable definitions moved here from config/pre.in.
+	(.depend-verify-db, depend-verify-db-k5, depend-verify-db-sys):
+	New targets, moved from config/post.in.
+	(.d): Depend on .depend-verify-db.
 
 	* Makefile.in (SHLIB_EXPLIBS): Only use gssrpc and KDB5_DB_LIB.
 	* configure.in: Set enable_shared=yes.
diff --git a/src/modules/kdb/db2/Makefile.in b/src/modules/kdb/db2/Makefile.in
index 9f6017796..d486184e4 100644
--- a/src/modules/kdb/db2/Makefile.in
+++ b/src/modules/kdb/db2/Makefile.in
@@ -76,6 +76,16 @@ clean::
 # @libnover_frag@
 # @libobj_frag@
 
+.depend-verify-db: depend-verify-db-$(DB_VERSION)
+depend-verify-db-k5:
+	@if test -r .depend-verify-db; then :; \
+		else (set -x; touch .depend-verify-db); fi
+depend-verify-db-sys:
+	@echo 1>&2 error: cannot build dependencies using system db package
+	@exit 1
+
+.d: .depend-verify-db
+
 # +++ Dependency line eater +++
 # 
 # Makefile dependencies follow.  This must be the last section in
-- 
2.26.2