Move the db2 library to the site of its one use, the kdb-db2 module.
authorKen Raeburn <raeburn@mit.edu>
Tue, 4 Oct 2005 23:38:37 +0000 (23:38 +0000)
committerKen Raeburn <raeburn@mit.edu>
Tue, 4 Oct 2005 23:38:37 +0000 (23:38 +0000)
Update configuration scripts, pathname make variables, etc., accordingly.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17407 dc483132-0cff-0310-8789-dd5450dbe970

123 files changed:
src/ChangeLog
src/configure.in
src/modules/kdb/db2/ChangeLog
src/modules/kdb/db2/Makefile.in
src/modules/kdb/db2/configure.in
src/modules/kdb/db2/libdb2/CHANGELOG.db2 [moved from src/util/db2/CHANGELOG.db2 with 100% similarity]
src/modules/kdb/db2/libdb2/ChangeLog [moved from src/util/db2/ChangeLog with 96% similarity]
src/modules/kdb/db2/libdb2/Makefile.in [moved from src/util/db2/Makefile.in with 92% similarity]
src/modules/kdb/db2/libdb2/Makefile.inc [moved from src/util/db2/Makefile.inc with 100% similarity]
src/modules/kdb/db2/libdb2/README [moved from src/util/db2/README with 100% similarity]
src/modules/kdb/db2/libdb2/README.NOT.SLEEPYCAT.DB [moved from src/util/db2/README.NOT.SLEEPYCAT.DB with 100% similarity]
src/modules/kdb/db2/libdb2/README.db2 [moved from src/util/db2/README.db2 with 100% similarity]
src/modules/kdb/db2/libdb2/btree/Makefile.in [moved from src/util/db2/btree/Makefile.in with 81% similarity]
src/modules/kdb/db2/libdb2/btree/Makefile.inc [moved from src/util/db2/btree/Makefile.inc with 100% similarity]
src/modules/kdb/db2/libdb2/btree/bt_close.c [moved from src/util/db2/btree/bt_close.c with 100% similarity]
src/modules/kdb/db2/libdb2/btree/bt_conv.c [moved from src/util/db2/btree/bt_conv.c with 100% similarity]
src/modules/kdb/db2/libdb2/btree/bt_debug.c [moved from src/util/db2/btree/bt_debug.c with 100% similarity]
src/modules/kdb/db2/libdb2/btree/bt_delete.c [moved from src/util/db2/btree/bt_delete.c with 100% similarity]
src/modules/kdb/db2/libdb2/btree/bt_get.c [moved from src/util/db2/btree/bt_get.c with 100% similarity]
src/modules/kdb/db2/libdb2/btree/bt_open.c [moved from src/util/db2/btree/bt_open.c with 100% similarity]
src/modules/kdb/db2/libdb2/btree/bt_overflow.c [moved from src/util/db2/btree/bt_overflow.c with 100% similarity]
src/modules/kdb/db2/libdb2/btree/bt_page.c [moved from src/util/db2/btree/bt_page.c with 100% similarity]
src/modules/kdb/db2/libdb2/btree/bt_put.c [moved from src/util/db2/btree/bt_put.c with 100% similarity]
src/modules/kdb/db2/libdb2/btree/bt_search.c [moved from src/util/db2/btree/bt_search.c with 100% similarity]
src/modules/kdb/db2/libdb2/btree/bt_seq.c [moved from src/util/db2/btree/bt_seq.c with 100% similarity]
src/modules/kdb/db2/libdb2/btree/bt_split.c [moved from src/util/db2/btree/bt_split.c with 100% similarity]
src/modules/kdb/db2/libdb2/btree/bt_utils.c [moved from src/util/db2/btree/bt_utils.c with 100% similarity]
src/modules/kdb/db2/libdb2/btree/btree.h [moved from src/util/db2/btree/btree.h with 100% similarity]
src/modules/kdb/db2/libdb2/btree/extern.h [moved from src/util/db2/btree/extern.h with 100% similarity]
src/modules/kdb/db2/libdb2/clib/Makefile.in [moved from src/util/db2/clib/Makefile.in with 68% similarity]
src/modules/kdb/db2/libdb2/clib/memmove.c [moved from src/util/db2/clib/memmove.c with 100% similarity]
src/modules/kdb/db2/libdb2/clib/mkstemp.c [moved from src/util/db2/clib/mkstemp.c with 100% similarity]
src/modules/kdb/db2/libdb2/clib/strerror.c [moved from src/util/db2/clib/strerror.c with 100% similarity]
src/modules/kdb/db2/libdb2/configure.in [moved from src/util/db2/configure.in with 100% similarity]
src/modules/kdb/db2/libdb2/db/Makefile.in [moved from src/util/db2/db/Makefile.in with 70% similarity]
src/modules/kdb/db2/libdb2/db/Makefile.inc [moved from src/util/db2/db/Makefile.inc with 100% similarity]
src/modules/kdb/db2/libdb2/db/db.c [moved from src/util/db2/db/db.c with 100% similarity]
src/modules/kdb/db2/libdb2/docs/btree.3.ps [moved from src/util/db2/docs/btree.3.ps with 100% similarity]
src/modules/kdb/db2/libdb2/docs/dbopen.3.ps [moved from src/util/db2/docs/dbopen.3.ps with 100% similarity]
src/modules/kdb/db2/libdb2/docs/hash.3.ps [moved from src/util/db2/docs/hash.3.ps with 100% similarity]
src/modules/kdb/db2/libdb2/docs/hash.usenix.ps [moved from src/util/db2/docs/hash.usenix.ps with 100% similarity]
src/modules/kdb/db2/libdb2/docs/libtp.usenix.ps [moved from src/util/db2/docs/libtp.usenix.ps with 100% similarity]
src/modules/kdb/db2/libdb2/docs/mpool.3.ps [moved from src/util/db2/docs/mpool.3.ps with 100% similarity]
src/modules/kdb/db2/libdb2/docs/recno.3.ps [moved from src/util/db2/docs/recno.3.ps with 100% similarity]
src/modules/kdb/db2/libdb2/hash/Makefile.in [moved from src/util/db2/hash/Makefile.in with 78% similarity]
src/modules/kdb/db2/libdb2/hash/Makefile.inc [moved from src/util/db2/hash/Makefile.inc with 100% similarity]
src/modules/kdb/db2/libdb2/hash/dbm.c [moved from src/util/db2/hash/dbm.c with 100% similarity]
src/modules/kdb/db2/libdb2/hash/extern.h [moved from src/util/db2/hash/extern.h with 100% similarity]
src/modules/kdb/db2/libdb2/hash/hash.c [moved from src/util/db2/hash/hash.c with 100% similarity]
src/modules/kdb/db2/libdb2/hash/hash.c.patch [moved from src/util/db2/hash/hash.c.patch with 100% similarity]
src/modules/kdb/db2/libdb2/hash/hash.h [moved from src/util/db2/hash/hash.h with 100% similarity]
src/modules/kdb/db2/libdb2/hash/hash_bigkey.c [moved from src/util/db2/hash/hash_bigkey.c with 100% similarity]
src/modules/kdb/db2/libdb2/hash/hash_debug.c [moved from src/util/db2/hash/hash_debug.c with 100% similarity]
src/modules/kdb/db2/libdb2/hash/hash_func.c [moved from src/util/db2/hash/hash_func.c with 100% similarity]
src/modules/kdb/db2/libdb2/hash/hash_log2.c [moved from src/util/db2/hash/hash_log2.c with 100% similarity]
src/modules/kdb/db2/libdb2/hash/hash_page.c [moved from src/util/db2/hash/hash_page.c with 100% similarity]
src/modules/kdb/db2/libdb2/hash/hsearch.c [moved from src/util/db2/hash/hsearch.c with 100% similarity]
src/modules/kdb/db2/libdb2/hash/page.h [moved from src/util/db2/hash/page.h with 100% similarity]
src/modules/kdb/db2/libdb2/hash/page.h.patch [moved from src/util/db2/hash/page.h.patch with 100% similarity]
src/modules/kdb/db2/libdb2/hash/search.h [moved from src/util/db2/hash/search.h with 100% similarity]
src/modules/kdb/db2/libdb2/include/ChangeLog [moved from src/util/db2/include/ChangeLog with 100% similarity]
src/modules/kdb/db2/libdb2/include/db-config.h.in [moved from src/util/db2/include/db-config.h.in with 100% similarity]
src/modules/kdb/db2/libdb2/include/db-dbm.h [moved from src/util/db2/include/db-dbm.h with 100% similarity]
src/modules/kdb/db2/libdb2/include/db-int.h [moved from src/util/db2/include/db-int.h with 100% similarity]
src/modules/kdb/db2/libdb2/include/db-ndbm.h [moved from src/util/db2/include/db-ndbm.h with 100% similarity]
src/modules/kdb/db2/libdb2/include/db-queue.h [moved from src/util/db2/include/db-queue.h with 100% similarity]
src/modules/kdb/db2/libdb2/include/db.h [moved from src/util/db2/include/db.h with 100% similarity]
src/modules/kdb/db2/libdb2/libdb.exports [moved from src/util/db2/libdb.exports with 100% similarity]
src/modules/kdb/db2/libdb2/man/Makefile.inc [moved from src/util/db2/man/Makefile.inc with 100% similarity]
src/modules/kdb/db2/libdb2/man/db.man.ps [moved from src/util/db2/man/db.man.ps with 100% similarity]
src/modules/kdb/db2/libdb2/man/db_btree.3 [moved from src/util/db2/man/db_btree.3 with 100% similarity]
src/modules/kdb/db2/libdb2/man/db_hash.3 [moved from src/util/db2/man/db_hash.3 with 100% similarity]
src/modules/kdb/db2/libdb2/man/db_lock.3 [moved from src/util/db2/man/db_lock.3 with 100% similarity]
src/modules/kdb/db2/libdb2/man/db_log.3 [moved from src/util/db2/man/db_log.3 with 100% similarity]
src/modules/kdb/db2/libdb2/man/db_mpool.3 [moved from src/util/db2/man/db_mpool.3 with 100% similarity]
src/modules/kdb/db2/libdb2/man/db_open.3 [moved from src/util/db2/man/db_open.3 with 100% similarity]
src/modules/kdb/db2/libdb2/man/db_recno.3 [moved from src/util/db2/man/db_recno.3 with 100% similarity]
src/modules/kdb/db2/libdb2/man/db_txn.3 [moved from src/util/db2/man/db_txn.3 with 100% similarity]
src/modules/kdb/db2/libdb2/man/spell.ok [moved from src/util/db2/man/spell.ok with 100% similarity]
src/modules/kdb/db2/libdb2/mpool/Makefile.in [moved from src/util/db2/mpool/Makefile.in with 70% similarity]
src/modules/kdb/db2/libdb2/mpool/Makefile.inc [moved from src/util/db2/mpool/Makefile.inc with 100% similarity]
src/modules/kdb/db2/libdb2/mpool/README [moved from src/util/db2/mpool/README with 100% similarity]
src/modules/kdb/db2/libdb2/mpool/mpool.c [moved from src/util/db2/mpool/mpool.c with 100% similarity]
src/modules/kdb/db2/libdb2/mpool/mpool.h [moved from src/util/db2/mpool/mpool.h with 100% similarity]
src/modules/kdb/db2/libdb2/recno/Makefile.in [moved from src/util/db2/recno/Makefile.in with 78% similarity]
src/modules/kdb/db2/libdb2/recno/Makefile.inc [moved from src/util/db2/recno/Makefile.inc with 100% similarity]
src/modules/kdb/db2/libdb2/recno/extern.h [moved from src/util/db2/recno/extern.h with 100% similarity]
src/modules/kdb/db2/libdb2/recno/rec_close.c [moved from src/util/db2/recno/rec_close.c with 100% similarity]
src/modules/kdb/db2/libdb2/recno/rec_delete.c [moved from src/util/db2/recno/rec_delete.c with 100% similarity]
src/modules/kdb/db2/libdb2/recno/rec_get.c [moved from src/util/db2/recno/rec_get.c with 100% similarity]
src/modules/kdb/db2/libdb2/recno/rec_open.c [moved from src/util/db2/recno/rec_open.c with 100% similarity]
src/modules/kdb/db2/libdb2/recno/rec_put.c [moved from src/util/db2/recno/rec_put.c with 100% similarity]
src/modules/kdb/db2/libdb2/recno/rec_search.c [moved from src/util/db2/recno/rec_search.c with 100% similarity]
src/modules/kdb/db2/libdb2/recno/rec_seq.c [moved from src/util/db2/recno/rec_seq.c with 100% similarity]
src/modules/kdb/db2/libdb2/recno/rec_utils.c [moved from src/util/db2/recno/rec_utils.c with 100% similarity]
src/modules/kdb/db2/libdb2/recno/recno.h [moved from src/util/db2/recno/recno.h with 100% similarity]
src/modules/kdb/db2/libdb2/test/ChangeLog [moved from src/util/db2/test/ChangeLog with 95% similarity]
src/modules/kdb/db2/libdb2/test/Makefile.in [moved from src/util/db2/test/Makefile.in with 89% similarity]
src/modules/kdb/db2/libdb2/test/README [moved from src/util/db2/test/README with 100% similarity]
src/modules/kdb/db2/libdb2/test/SEQ_TEST/data [moved from src/util/db2/test/SEQ_TEST/data with 100% similarity]
src/modules/kdb/db2/libdb2/test/SEQ_TEST/mbox [moved from src/util/db2/test/SEQ_TEST/mbox with 100% similarity]
src/modules/kdb/db2/libdb2/test/SEQ_TEST/t.c [moved from src/util/db2/test/SEQ_TEST/t.c with 100% similarity]
src/modules/kdb/db2/libdb2/test/btree.tests/ChangeLog [moved from src/util/db2/test/btree.tests/ChangeLog with 100% similarity]
src/modules/kdb/db2/libdb2/test/btree.tests/main.c [moved from src/util/db2/test/btree.tests/main.c with 100% similarity]
src/modules/kdb/db2/libdb2/test/dbtest.c [moved from src/util/db2/test/dbtest.c with 100% similarity]
src/modules/kdb/db2/libdb2/test/dictionary [moved from src/util/db2/test/dictionary with 100% similarity]
src/modules/kdb/db2/libdb2/test/hash1.tests/Makefile [moved from src/util/db2/test/hash1.tests/Makefile with 100% similarity]
src/modules/kdb/db2/libdb2/test/hash1.tests/driver2.c [moved from src/util/db2/test/hash1.tests/driver2.c with 100% similarity]
src/modules/kdb/db2/libdb2/test/hash1.tests/makedb.sh [moved from src/util/db2/test/hash1.tests/makedb.sh with 100% similarity]
src/modules/kdb/db2/libdb2/test/hash1.tests/tcreat3.c [moved from src/util/db2/test/hash1.tests/tcreat3.c with 100% similarity]
src/modules/kdb/db2/libdb2/test/hash1.tests/tdel.c [moved from src/util/db2/test/hash1.tests/tdel.c with 100% similarity]
src/modules/kdb/db2/libdb2/test/hash1.tests/testit [moved from src/util/db2/test/hash1.tests/testit with 100% similarity]
src/modules/kdb/db2/libdb2/test/hash1.tests/thash4.c [moved from src/util/db2/test/hash1.tests/thash4.c with 100% similarity]
src/modules/kdb/db2/libdb2/test/hash1.tests/tread2.c [moved from src/util/db2/test/hash1.tests/tread2.c with 100% similarity]
src/modules/kdb/db2/libdb2/test/hash1.tests/tseq.c [moved from src/util/db2/test/hash1.tests/tseq.c with 100% similarity]
src/modules/kdb/db2/libdb2/test/hash1.tests/tverify.c [moved from src/util/db2/test/hash1.tests/tverify.c with 100% similarity]
src/modules/kdb/db2/libdb2/test/hash2.tests/README [moved from src/util/db2/test/hash2.tests/README with 100% similarity]
src/modules/kdb/db2/libdb2/test/hash2.tests/bigtest.c [moved from src/util/db2/test/hash2.tests/bigtest.c with 100% similarity]
src/modules/kdb/db2/libdb2/test/hash2.tests/passtest.c [moved from src/util/db2/test/hash2.tests/passtest.c with 100% similarity]
src/modules/kdb/db2/libdb2/test/hash2.tests/passwd/genpass.c [moved from src/util/db2/test/hash2.tests/passwd/genpass.c with 100% similarity]
src/modules/kdb/db2/libdb2/test/run.test [moved from src/util/db2/test/run.test with 100% similarity]
src/util/ChangeLog
src/util/Makefile.in

index b8c19b067da33587ea48e56fad128b66d61ad6d1..15ed1e29b5976214ff225528bcb0ac420adf52c0 100644 (file)
@@ -1,3 +1,7 @@
+2005-10-04  Ken Raeburn  <raeburn@mit.edu>
+
+       * configure.in: Don't configure util/db2.
+
 2005-09-26  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in (fake-install): Do install in modules/kdb/db2.
index 5b78d37ca3e4d17a981594e6ecb1efb946f39837..68ec28ce126d6b7d310ac4db9c83fad0ece2f80c 100644 (file)
@@ -536,9 +536,6 @@ if test "$SS_VERSION" = k5 ; then
   AC_CONFIG_SUBDIRS(util/ss)
 fi
 AC_CONFIG_SUBDIRS(util/profile util/pty)
-if test "$DB_VERSION" = k5 ; then
-  AC_CONFIG_SUBDIRS(util/db2)
-fi
 AC_CONFIG_SUBDIRS(lib/crypto lib/krb5 lib/des425 lib/apputils)
 if test -n "$KRB4_LIB"; then
   AC_CONFIG_SUBDIRS(lib/krb4)
index ec784f99671c71b281e82b257ec5e121f1043d0e..23c4afcd78f7d4881da469e0978eeab90ffbae06 100644 (file)
@@ -1,5 +1,11 @@
 2005-10-04  Ken Raeburn  <raeburn@mit.edu>
 
+       * libdb2: Directory moved from util/db2.
+       * configure.in: Configure it, unless a system version is to be
+       used.
+       * Makefile.in (DBDIR): Updated.
+       ($(DB_DEPS)): Depend on all-recurse.
+
        * Makefile.in (SHLIB_EXPLIBS): Only use gssrpc.
        * configure.in: Set enable_shared=yes.
 
index 5b8cf6baff086899735156cbe7d9df23f0824fb6..cf1763e244c7462f03313cc774652f39e335ef70 100644 (file)
@@ -25,7 +25,7 @@ SHLIB_EXPLIBS= -lgssrpc # $(GSSRPC_LIBS) -lkrb5 -lcom_err -lk5crypto $(KDB5_DB_L
 SHLIB_DIRS=-L$(TOPLIBD)
 SHLIB_RDIRS=$(KRB5_LIBDIR)
 
-DBDIR = $(BUILDTOP)/util/db2
+DBDIR = libdb2
 DBOBJLISTS = $(DBOBJLISTS-@DB_VERSION@)
 DBOBJLISTS-sys =
 DBOBJLISTS-k5 = $(DBDIR)/hash/OBJS.ST $(DBDIR)/btree/OBJS.ST \
@@ -53,14 +53,14 @@ all-unix:: $(LIBBASE)$(SO_EXT)
 install-unix:: install-libs
 clean-unix:: clean-libs clean-libobjs
 
+$(DB_DEPS): all-recurse
+
 #lib$(LIBBASE)$(SO_EXT): db2_exp.o
 #      $(CC) -shared -o $@ -L$(TOPLIBD) $^ -ldb $(SHLIB_EXPLIBS)
 
 clean::
        $(RM) lib$(LIBBASE)$(SO_EXT) db2_exp.o
 
-#adb_openclose.c adb_policy.c : ../adb_err.h
-
 # @libnover_frag@
 # @libobj_frag@
 
index 44c6540c28a0dd9eb735ce2c8e1c815d509fe8bb..234c1cc0a2c67474d91d02cc235bb33bd4c599b0 100644 (file)
@@ -20,4 +20,7 @@ dnl The following is for check...
 KRB5_BUILD_PROGRAM
 KRB5_BUILD_LIBOBJS
 KRB5_BUILD_LIBRARY_WITH_DEPS
+if test "$DB_VERSION" = k5 ; then
+  AC_CONFIG_SUBDIRS(libdb2)
+fi
 V5_AC_OUTPUT_MAKEFILE
similarity index 96%
rename from src/util/db2/ChangeLog
rename to src/modules/kdb/db2/libdb2/ChangeLog
index 83fe66af495fb2d0e6dadfe9b59f26141a62cb83..617a075eb3a10c853239782ee748241ea37ae288 100644 (file)
@@ -1,3 +1,15 @@
+2005-10-04  Ken Raeburn  <raeburn@mit.edu>
+
+       * Directory moved from util/db2 to modules/kdb/db2/libdb2.
+       * Makefile.in (myfulldir, RELTOP, BUILDTOP): Updated for directory
+       move.
+       * btree/Makefile.in (myfulldir, BUILDTOP): Likewise.
+       * hash/Makefile.in (myfulldir, BUILDTOP): Likewise.
+       * db/Makefile.in (myfulldir, BUILDTOP): Likewise.
+       * mpool/Makefile.in (myfulldir, BUILDTOP): Likewise.
+       * recno/Makefile.in (myfulldir, BUILDTOP): Likewise.
+       * clib/Makefile.in (myfulldir, BUILDTOP): Likewise.
+
 2005-08-20  Ken Raeburn  <raeburn@mit.edu>
 
        * configure.in: Use K5_AC_INIT instead of AC_INIT.
similarity index 92%
rename from src/util/db2/Makefile.in
rename to src/modules/kdb/db2/libdb2/Makefile.in
index 37542aee4506f7eb0a2c1e1005ec1e1de1bbdfed..75553edf3a9a5a2845461c9d4ece950be53f65bb 100644 (file)
@@ -1,7 +1,7 @@
 thisconfigdir=.
-myfulldir=util/db2
+myfulldir=modules/kdb/db2/libdb2
 mydir=.
-BUILDTOP=$(REL)..$(S)..
+BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCAL_SUBDIRS=hash btree db mpool recno clib test
 
 LIBBASE=db
@@ -10,7 +10,7 @@ LIBMINOR=1
 STOBJLISTS=hash/OBJS.ST btree/OBJS.ST db/OBJS.ST mpool/OBJS.ST \
        recno/OBJS.ST clib/OBJS.ST
 SUBDIROBJLISTS=$(STOBJLISTS)
-RELDIR=../util/db2
+RELDIR=../modules/kdb/db2/libdb2
 
 HDRDIR=$(BUILDTOP)/include
 HDRS = $(HDRDIR)/db.h $(HDRDIR)/db-config.h $(HDRDIR)/db-ndbm.h
similarity index 81%
rename from src/util/db2/btree/Makefile.in
rename to src/modules/kdb/db2/libdb2/btree/Makefile.in
index d3b02652a6cc4164c8d2ed5f500e015bb97d1b01..11f4c84348066c226fa60cb7b538d5a317aad288 100644 (file)
@@ -1,7 +1,7 @@
 thisconfigdir=./..
-myfulldir=util/db2/btree
+myfulldir=modules/kdb/db2/libdb2/btree
 mydir=btree
-BUILDTOP=$(REL)..$(S)..$(S)..
+BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=     bt_close.o bt_conv.o bt_debug.o bt_delete.o bt_get.o \
                bt_open.o bt_overflow.o bt_page.o bt_put.o bt_search.o \
                bt_seq.o bt_split.o bt_utils.o
similarity index 68%
rename from src/util/db2/clib/Makefile.in
rename to src/modules/kdb/db2/libdb2/clib/Makefile.in
index 3f3d2b8be4422aab437e19c85745ce4af06906bf..c5ab5596774c9c71637f1d1c9e886d32a11c115c 100644 (file)
@@ -1,7 +1,7 @@
 thisconfigdir=./..
-myfulldir=util/db2/clib
+myfulldir=modules/kdb/db2/libdb2/clib
 mydir=clib
-BUILDTOP=$(REL)..$(S)..$(S)..
+BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=@MEMMOVE_OBJ@ @MKSTEMP_OBJ@ @STRERROR_OBJ@
 
 LOCALINCLUDES=-I../include
similarity index 70%
rename from src/util/db2/db/Makefile.in
rename to src/modules/kdb/db2/libdb2/db/Makefile.in
index b173b0d79ed80a40a3ed365eba3098a9d15385db..9c7d7c269190c12a0bc2571a5d01b393f6e2aa0c 100644 (file)
@@ -1,7 +1,7 @@
 thisconfigdir=./..
-myfulldir=util/db2/db
+myfulldir=modules/kdb/db2/libdb2/db
 mydir=db
-BUILDTOP=$(REL)..$(S)..$(S)..
+BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=db.o
 
 LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool
similarity index 78%
rename from src/util/db2/hash/Makefile.in
rename to src/modules/kdb/db2/libdb2/hash/Makefile.in
index e8cbe63bd7655a654395ec59b103d836b0c7e641..0e3b1adcdfebafa865f4023007c5e4f176fecdc2 100644 (file)
@@ -1,7 +1,7 @@
 thisconfigdir=./..
-myfulldir=util/db2/hash
+myfulldir=modules/kdb/db2/libdb2/hash
 mydir=hash
-BUILDTOP=$(REL)..$(S)..$(S)..
+BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=     hash.o hash_bigkey.o hash_debug.o hash_func.o hash_log2.o \
                hash_page.o hsearch.o dbm.o
 
similarity index 70%
rename from src/util/db2/mpool/Makefile.in
rename to src/modules/kdb/db2/libdb2/mpool/Makefile.in
index 6f487ee6d260263a086eafafe16aa45dd95cf198..e40c161745e8515696db877b8d16c9f9539ec1c5 100644 (file)
@@ -1,7 +1,7 @@
 thisconfigdir=./..
-myfulldir=util/db2/mpool
+myfulldir=modules/kdb/db2/libdb2/mpool
 mydir=mpool
-BUILDTOP=$(REL)..$(S)..$(S)..
+BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=mpool.o
 
 LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../db
similarity index 78%
rename from src/util/db2/recno/Makefile.in
rename to src/modules/kdb/db2/libdb2/recno/Makefile.in
index 6726227c67a2b418072c4a7f40ac282af2e9d3ee..e90a7cb3daca957c839fcb800633fd6e073deee6 100644 (file)
@@ -1,7 +1,7 @@
 thisconfigdir=./..
-myfulldir=util/db2/recno
+myfulldir=modules/kdb/db2/libdb2/recno
 mydir=recno
-BUILDTOP=$(REL)..$(S)..$(S)..
+BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=     rec_close.o rec_delete.o rec_get.o rec_open.o rec_put.o \
                rec_search.o rec_seq.o rec_utils.o
 
similarity index 95%
rename from src/util/db2/test/ChangeLog
rename to src/modules/kdb/db2/libdb2/test/ChangeLog
index cfcce7d7fa0dd3db5ca41c44f63f86a8f1a67f3a..aad74b4c77fefc838d9569a0531a0ee50c5404df 100644 (file)
@@ -1,3 +1,7 @@
+2005-10-04  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (BUILDTOP, myfulldir): Updated for directory move.
+
 2004-08-27  Ken Raeburn  <raeburn@mit.edu>
 
        * run.test (getnwords): Run data through "cat -v", because at
similarity index 89%
rename from src/util/db2/test/Makefile.in
rename to src/modules/kdb/db2/libdb2/test/Makefile.in
index 18d366ca83c773426ab70340c0156e012c694bea..5df1d2f600ac6b4cf552596ec1cd383734ab11fa 100644 (file)
@@ -1,7 +1,7 @@
 thisconfigdir=./..
-myfulldir=util/db2/test
+myfulldir=modules/kdb/db2/libdb2/test
 mydir=test
-BUILDTOP=$(REL)..$(S)..$(S)..
+BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 
 FCTSH = @FCTSH@
 TMPDIR=.
index 47761a1098cda5db8a9c8d7cff87f060a38c3eab..56872aeac94d4a30c407e40a4a7e6befed5d3c3e 100644 (file)
@@ -1,3 +1,9 @@
+2005-10-04  Ken Raeburn  <raeburn@mit.edu>
+
+       * db2: Directory moved to modules/kdb/db2/libdb2.
+       * Makefile.in (LOCAL_SUBDIRS): Don't reference it.
+       (MAYBE_DB_k5, MAYBE_DB_sys): Variables deleted.
+
 2005-09-08  Tom Yu  <tlyu@mit.edu>
 
        * mkrel: Update for svn.
index ecad6b2b82d888853b6c914d973fb4c58b15d75a..c9fd1d8ce6cb5dbf223d1ccf9b295dce6f689ea7 100644 (file)
@@ -7,16 +7,14 @@ mydir=util
 ##WIN32### below in the 'all-windows' target anyways, so just hide this.
 ##WIN32##!if 0
 LOCAL_SUBDIRS=support $(MAYBE_ET_@COM_ERR_VERSION@) $(MAYBE_SS_@SS_VERSION@) \
-       profile pty $(MAYBE_DB_@DB_VERSION@) send-pr
+       profile pty send-pr
 ##WIN32##!endif
 BUILDTOP=$(REL)..
 
 MAYBE_ET_k5 = et
 MAYBE_SS_k5 = ss
-MAYBE_DB_k5 = db2
 MAYBE_ET_sys =
 MAYBE_SS_sys =
-MAYBE_DB_sys =
 
 editsh = sed -e 's,@''ARADD''@,$(ARADD),g' -e 's,@''ARCHIVE''@,$(ARCHIVE),g'
 HOST_TYPE=@HOST_TYPE@