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

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 42fcc1e88cb90802a32311af4b6df74ea7a95151..8b14118ea432577d13510ad1e2a24866b26ab87f 100644 (file)
--- 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 83de180df3296998aa88a7ccc709bfef3ed8bf08..457449b18e5c281a3d1375cc888dfc20330f55a2 100644 (file)
--- 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 6044086024eff6d3c39040128c836346f190af24..302855e761d92e5c1e45105c50b30c2db4083c5c 100644 (file)
--- 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 9f601779628d58c50a3ea3a91a1bc750075f26ac..d486184e442eb5d045f5a3473bd265d1fdb3f8b0 100644 (file)
--- 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