svn rev #22572: trunk/src/ plugins/kdb/db2/libdb2/ plugins/kdb/db2/libdb2/btree/ ...
raeburn@MIT.EDU
raeburn at MIT.EDU
Fri Aug 21 18:37:56 EDT 2009
http://src.mit.edu/fisheye/changelog/krb5/?cs=22572
Commit By: raeburn
Log Message:
Rename db2 header files db.h and db-config.h in the source tree, so
that there will always be only one version of each name in the include
path (namely, the copy made in the build tree, or the generated db.h
if not using the in-tree one). This should fix some minor problems
with different dependency lists generated on different systems.
Sort and uniquify dependency header names before doing substitutions,
as well as after. Look for the db2 headers listed in sorted order.
Don't copy db-ndbm.h into the build tree; let libdb2 find it from the
source tree only.
Update dependencies.
Changed Files:
U trunk/src/plugins/kdb/db2/libdb2/Makefile.in
U trunk/src/plugins/kdb/db2/libdb2/btree/deps
U trunk/src/plugins/kdb/db2/libdb2/db/deps
U trunk/src/plugins/kdb/db2/libdb2/hash/deps
D trunk/src/plugins/kdb/db2/libdb2/include/db-config.h
A trunk/src/plugins/kdb/db2/libdb2/include/db-config.hin
D trunk/src/plugins/kdb/db2/libdb2/include/db.h
A trunk/src/plugins/kdb/db2/libdb2/include/db.hin
U trunk/src/plugins/kdb/db2/libdb2/mpool/deps
U trunk/src/plugins/kdb/db2/libdb2/recno/deps
U trunk/src/util/depfix.pl
Modified: trunk/src/plugins/kdb/db2/libdb2/Makefile.in
===================================================================
--- trunk/src/plugins/kdb/db2/libdb2/Makefile.in 2009-08-21 22:30:43 UTC (rev 22571)
+++ trunk/src/plugins/kdb/db2/libdb2/Makefile.in 2009-08-21 22:37:55 UTC (rev 22572)
@@ -13,7 +13,7 @@
RELDIR=../plugins/kdb/db2/libdb2
HDRDIR=$(BUILDTOP)/include
-HDRS = $(HDRDIR)/db.h $(HDRDIR)/db-config.h $(HDRDIR)/db-ndbm.h
+HDRS = $(HDRDIR)/db.h $(HDRDIR)/db-config.h
SHLIB_EXPDEPS=$(SUPPORT_DEPLIB)
SHLIB_EXPLIBS=$(SUPPORT_LIB)
@@ -26,12 +26,10 @@
includes:: $(HDRS)
-$(HDRDIR)/db.h: $(srcdir)/include/db.h
- $(CP) $(srcdir)/include/db.h $@
-$(HDRDIR)/db-config.h: include/db-config.h
- $(CP) $(srcdir)/include/db-config.h $@
-$(HDRDIR)/db-ndbm.h: $(srcdir)/include/db-ndbm.h
- $(CP) $(srcdir)/include/db-ndbm.h $@
+$(HDRDIR)/db.h: $(srcdir)/include/db.hin
+ $(CP) $(srcdir)/include/db.hin $@
+$(HDRDIR)/db-config.h: include/db-config.hin
+ $(CP) $(srcdir)/include/db-config.hin $@
clean-includes::
$(RM) $(HDRS) include/*.stmp
Modified: trunk/src/plugins/kdb/db2/libdb2/btree/deps
===================================================================
--- trunk/src/plugins/kdb/db2/libdb2/btree/deps 2009-08-21 22:30:43 UTC (rev 22571)
+++ trunk/src/plugins/kdb/db2/libdb2/btree/deps 2009-08-21 22:37:55 UTC (rev 22572)
@@ -2,75 +2,55 @@
# Generated makefile dependencies follow.
#
bt_close.so bt_close.po $(OUTPRE)bt_close.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
- $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
+ $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../include/config.h \
$(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
- $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
- bt_close.c btree.h extern.h
+ $(srcdir)/../mpool/mpool.h bt_close.c btree.h extern.h
bt_conv.so bt_conv.po $(OUTPRE)bt_conv.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \
- $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
- $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
- $(srcdir)/../mpool/mpool.h bt_conv.c btree.h extern.h
+ $(DB_DEPS) $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \
+ $(srcdir)/../include/db-queue.h $(srcdir)/../mpool/mpool.h \
+ bt_conv.c btree.h extern.h
bt_debug.so bt_debug.po $(OUTPRE)bt_debug.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
- $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
+ $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../include/config.h \
$(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
- $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
- bt_debug.c btree.h extern.h
+ $(srcdir)/../mpool/mpool.h bt_debug.c btree.h extern.h
bt_delete.so bt_delete.po $(OUTPRE)bt_delete.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
- $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
+ $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../include/config.h \
$(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
- $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
- bt_delete.c btree.h extern.h
+ $(srcdir)/../mpool/mpool.h bt_delete.c btree.h extern.h
bt_get.so bt_get.po $(OUTPRE)bt_get.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \
- $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
- $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
- $(srcdir)/../mpool/mpool.h bt_get.c btree.h extern.h
+ $(DB_DEPS) $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \
+ $(srcdir)/../include/db-queue.h $(srcdir)/../mpool/mpool.h \
+ bt_get.c btree.h extern.h
bt_open.so bt_open.po $(OUTPRE)bt_open.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/db-config.h $(SRCTOP)/include/k5-platform.h \
- $(SRCTOP)/include/k5-thread.h $(srcdir)/../include/config.h \
- $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
- $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
- $(srcdir)/../mpool/mpool.h bt_open.c btree.h extern.h
+ $(DB_DEPS) $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+ $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \
+ $(srcdir)/../include/db-queue.h $(srcdir)/../mpool/mpool.h \
+ bt_open.c btree.h extern.h
bt_overflow.so bt_overflow.po $(OUTPRE)bt_overflow.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
- $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
+ $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../include/config.h \
$(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
- $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
- bt_overflow.c btree.h extern.h
+ $(srcdir)/../mpool/mpool.h bt_overflow.c btree.h extern.h
bt_page.so bt_page.po $(OUTPRE)bt_page.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \
- $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
- $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
- $(srcdir)/../mpool/mpool.h bt_page.c btree.h extern.h
+ $(DB_DEPS) $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \
+ $(srcdir)/../include/db-queue.h $(srcdir)/../mpool/mpool.h \
+ bt_page.c btree.h extern.h
bt_put.so bt_put.po $(OUTPRE)bt_put.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \
- $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
- $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
- $(srcdir)/../mpool/mpool.h bt_put.c btree.h extern.h
+ $(DB_DEPS) $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \
+ $(srcdir)/../include/db-queue.h $(srcdir)/../mpool/mpool.h \
+ bt_put.c btree.h extern.h
bt_search.so bt_search.po $(OUTPRE)bt_search.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
- $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
+ $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../include/config.h \
$(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
- $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
- bt_search.c btree.h extern.h
+ $(srcdir)/../mpool/mpool.h bt_search.c btree.h extern.h
bt_seq.so bt_seq.po $(OUTPRE)bt_seq.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \
- $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
- $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
- $(srcdir)/../mpool/mpool.h bt_seq.c btree.h extern.h
+ $(DB_DEPS) $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \
+ $(srcdir)/../include/db-queue.h $(srcdir)/../mpool/mpool.h \
+ bt_seq.c btree.h extern.h
bt_split.so bt_split.po $(OUTPRE)bt_split.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
- $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
+ $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../include/config.h \
$(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
- $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
- bt_split.c btree.h extern.h
+ $(srcdir)/../mpool/mpool.h bt_split.c btree.h extern.h
bt_utils.so bt_utils.po $(OUTPRE)bt_utils.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
- $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
+ $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../include/config.h \
$(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
- $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
- bt_utils.c btree.h extern.h
+ $(srcdir)/../mpool/mpool.h bt_utils.c btree.h extern.h
Modified: trunk/src/plugins/kdb/db2/libdb2/db/deps
===================================================================
--- trunk/src/plugins/kdb/db2/libdb2/db/deps 2009-08-21 22:30:43 UTC (rev 22571)
+++ trunk/src/plugins/kdb/db2/libdb2/db/deps 2009-08-21 22:37:55 UTC (rev 22572)
@@ -2,6 +2,5 @@
# Generated makefile dependencies follow.
#
db.so db.po $(OUTPRE)db.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \
- $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
- $(srcdir)/../include/db.h db.c
+ $(DB_DEPS) $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \
+ db.c
Modified: trunk/src/plugins/kdb/db2/libdb2/hash/deps
===================================================================
--- trunk/src/plugins/kdb/db2/libdb2/hash/deps 2009-08-21 22:30:43 UTC (rev 22571)
+++ trunk/src/plugins/kdb/db2/libdb2/hash/deps 2009-08-21 22:37:55 UTC (rev 22572)
@@ -2,44 +2,36 @@
# Generated makefile dependencies follow.
#
hash.so hash.po $(OUTPRE)hash.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \
- $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
- $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
- $(srcdir)/../mpool/mpool.h extern.h hash.c hash.h page.h
+ $(DB_DEPS) $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \
+ $(srcdir)/../include/db-queue.h $(srcdir)/../mpool/mpool.h \
+ extern.h hash.c hash.h page.h
hash_bigkey.so hash_bigkey.po $(OUTPRE)hash_bigkey.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
- $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
+ $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../include/config.h \
$(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
- $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
- extern.h hash.h hash_bigkey.c page.h
+ $(srcdir)/../mpool/mpool.h extern.h hash.h hash_bigkey.c \
+ page.h
hash_debug.so hash_debug.po $(OUTPRE)hash_debug.$(OBJEXT): \
hash_debug.c
hash_func.so hash_func.po $(OUTPRE)hash_func.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
- $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
+ $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../include/config.h \
$(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
- $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
- extern.h hash.h hash_func.c page.h
+ $(srcdir)/../mpool/mpool.h extern.h hash.h hash_func.c \
+ page.h
hash_log2.so hash_log2.po $(OUTPRE)hash_log2.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
- $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
+ $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../include/config.h \
$(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
- $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
- extern.h hash.h hash_log2.c page.h
+ $(srcdir)/../mpool/mpool.h extern.h hash.h hash_log2.c \
+ page.h
hash_page.so hash_page.po $(OUTPRE)hash_page.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
- $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
+ $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../include/config.h \
$(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
- $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
- extern.h hash.h hash_page.c page.h
+ $(srcdir)/../mpool/mpool.h extern.h hash.h hash_page.c \
+ page.h
hsearch.so hsearch.po $(OUTPRE)hsearch.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \
- $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
- $(srcdir)/../include/db.h hsearch.c search.h
+ $(DB_DEPS) $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \
+ hsearch.c search.h
dbm.so dbm.po $(OUTPRE)dbm.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/db-config.h $(BUILDTOP)/include/db-ndbm.h \
- $(BUILDTOP)/include/db.h $(srcdir)/../include/config.h \
- $(srcdir)/../include/db-config.h $(srcdir)/../include/db-dbm.h \
- $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
- $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
+ $(DB_DEPS) $(srcdir)/../include/config.h $(srcdir)/../include/db-dbm.h \
+ $(srcdir)/../include/db-int.h $(srcdir)/../include/db-ndbm.h \
+ $(srcdir)/../include/db-queue.h $(srcdir)/../mpool/mpool.h \
dbm.c hash.h
Deleted: trunk/src/plugins/kdb/db2/libdb2/include/db-config.h
Copied: trunk/src/plugins/kdb/db2/libdb2/include/db-config.hin (from rev 22571, trunk/src/plugins/kdb/db2/libdb2/include/db-config.h)
Deleted: trunk/src/plugins/kdb/db2/libdb2/include/db.h
Copied: trunk/src/plugins/kdb/db2/libdb2/include/db.hin (from rev 22571, trunk/src/plugins/kdb/db2/libdb2/include/db.h)
Modified: trunk/src/plugins/kdb/db2/libdb2/mpool/deps
===================================================================
--- trunk/src/plugins/kdb/db2/libdb2/mpool/deps 2009-08-21 22:30:43 UTC (rev 22571)
+++ trunk/src/plugins/kdb/db2/libdb2/mpool/deps 2009-08-21 22:37:55 UTC (rev 22572)
@@ -2,7 +2,5 @@
# Generated makefile dependencies follow.
#
mpool.so mpool.po $(OUTPRE)mpool.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \
- $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
- $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
- mpool.c mpool.h
+ $(DB_DEPS) $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \
+ $(srcdir)/../include/db-queue.h mpool.c mpool.h
Modified: trunk/src/plugins/kdb/db2/libdb2/recno/deps
===================================================================
--- trunk/src/plugins/kdb/db2/libdb2/recno/deps 2009-08-21 22:30:43 UTC (rev 22571)
+++ trunk/src/plugins/kdb/db2/libdb2/recno/deps 2009-08-21 22:37:55 UTC (rev 22572)
@@ -2,55 +2,42 @@
# Generated makefile dependencies follow.
#
rec_close.so rec_close.po $(OUTPRE)rec_close.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
- $(srcdir)/../btree/btree.h $(srcdir)/../btree/extern.h \
- $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
+ $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../btree/btree.h \
+ $(srcdir)/../btree/extern.h $(srcdir)/../include/config.h \
$(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
- $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
- extern.h rec_close.c recno.h
+ $(srcdir)/../mpool/mpool.h extern.h rec_close.c recno.h
rec_delete.so rec_delete.po $(OUTPRE)rec_delete.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
- $(srcdir)/../btree/btree.h $(srcdir)/../btree/extern.h \
- $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
+ $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../btree/btree.h \
+ $(srcdir)/../btree/extern.h $(srcdir)/../include/config.h \
$(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
- $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
- extern.h rec_delete.c recno.h
+ $(srcdir)/../mpool/mpool.h extern.h rec_delete.c recno.h
rec_get.so rec_get.po $(OUTPRE)rec_get.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/db-config.h $(srcdir)/../btree/btree.h \
- $(srcdir)/../btree/extern.h $(srcdir)/../include/config.h \
- $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
- $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
- $(srcdir)/../mpool/mpool.h extern.h rec_get.c recno.h
+ $(DB_DEPS) $(srcdir)/../btree/btree.h $(srcdir)/../btree/extern.h \
+ $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \
+ $(srcdir)/../include/db-queue.h $(srcdir)/../mpool/mpool.h \
+ extern.h rec_get.c recno.h
rec_open.so rec_open.po $(OUTPRE)rec_open.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
- $(srcdir)/../btree/btree.h $(srcdir)/../btree/extern.h \
- $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
+ $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../btree/btree.h \
+ $(srcdir)/../btree/extern.h $(srcdir)/../include/config.h \
$(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
- $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
- extern.h rec_open.c recno.h
+ $(srcdir)/../mpool/mpool.h extern.h rec_open.c recno.h
rec_put.so rec_put.po $(OUTPRE)rec_put.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/db-config.h $(srcdir)/../btree/btree.h \
- $(srcdir)/../btree/extern.h $(srcdir)/../include/config.h \
- $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
- $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
- $(srcdir)/../mpool/mpool.h extern.h rec_put.c recno.h
+ $(DB_DEPS) $(srcdir)/../btree/btree.h $(srcdir)/../btree/extern.h \
+ $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \
+ $(srcdir)/../include/db-queue.h $(srcdir)/../mpool/mpool.h \
+ extern.h rec_put.c recno.h
rec_search.so rec_search.po $(OUTPRE)rec_search.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
- $(srcdir)/../btree/btree.h $(srcdir)/../btree/extern.h \
- $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
+ $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../btree/btree.h \
+ $(srcdir)/../btree/extern.h $(srcdir)/../include/config.h \
$(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
- $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
- extern.h rec_search.c recno.h
+ $(srcdir)/../mpool/mpool.h extern.h rec_search.c recno.h
rec_seq.so rec_seq.po $(OUTPRE)rec_seq.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/db-config.h $(srcdir)/../btree/btree.h \
- $(srcdir)/../btree/extern.h $(srcdir)/../include/config.h \
- $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \
- $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \
- $(srcdir)/../mpool/mpool.h extern.h rec_seq.c recno.h
+ $(DB_DEPS) $(srcdir)/../btree/btree.h $(srcdir)/../btree/extern.h \
+ $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \
+ $(srcdir)/../include/db-queue.h $(srcdir)/../mpool/mpool.h \
+ extern.h rec_seq.c recno.h
rec_utils.so rec_utils.po $(OUTPRE)rec_utils.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \
- $(srcdir)/../btree/btree.h $(srcdir)/../btree/extern.h \
- $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \
+ $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../btree/btree.h \
+ $(srcdir)/../btree/extern.h $(srcdir)/../include/config.h \
$(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \
- $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \
- extern.h rec_utils.c recno.h
+ $(srcdir)/../mpool/mpool.h extern.h rec_utils.c recno.h
Modified: trunk/src/util/depfix.pl
===================================================================
--- trunk/src/util/depfix.pl 2009-08-21 22:30:43 UTC (rev 22571)
+++ trunk/src/util/depfix.pl 2009-08-21 22:37:55 UTC (rev 22572)
@@ -155,10 +155,12 @@
# Use VPATH.
s;\$\(srcdir\)/([^ /]* );$1;g;
+ $_ = &uniquify($_);
+
# Allow override of some util dependencies in case local tools are used.
s;\$\(BUILDTOP\)/include/com_err.h ;\$(COM_ERR_DEPS) ;g;
s;\$\(BUILDTOP\)/include/ss/ss.h \$\(BUILDTOP\)/include/ss/ss_err.h ;\$(SS_DEPS) ;g;
- s;\$\(BUILDTOP\)/include/db.h \$\(BUILDTOP\)/include/db-config.h ;\$(DB_DEPS) ;g;
+ s;\$\(BUILDTOP\)/include/db-config.h \$\(BUILDTOP\)/include/db.h ;\$(DB_DEPS) ;g;
$_ = &uniquify($_);
More information about the cvs-krb5
mailing list