Update.

1998-09-23 13:52  Ulrich Drepper  <drepper@cygnus.com>

	* Makeconfig (all-subdirs): Add db.
	* Versions.def: Add definition for libdb1.
	* shlib-versions: Add definitions for libdb1.
	* db/Makefile (extra-libs): Replace by libdb1.
	(libdb-routines): Rename to libdb1-routines.
	(headers): Rename to db1-headers.
	(distribute): Add $(db1-headers).
	(install-others): Define to install symlink libdb.so.NN and the
	$(db1-headers).
	(CPPFLAGS): Add -USE_LIBDB1
	Remove rules to build makedb.
	* db/Versions: Rename libdb to libdb1.
	* include/db.h: If USE_LIBDB1 is defined include db/db.h.

	* scripts/versions.awk: Recognize digits in library names.

	* db/btree/bt_open.c: Fix compiler warnings.
	* db/btree/bt_put.c: Likewise.
	* db/btree/bt_split.c: Likewise.
	* db/hash/hash.c: Likewise.
	* db/hash/hash_bigkey.c: Likewise.
	* db/recno/rec_close.c: Likewise.

1 files changed, 36 insertions, 32 deletions

diff --git a/db/Makefile b/db/Makefile
index 32a637f..039a77e 100644
--- a/db/Makefile
+++ b/db/Makefile
@@ -8,30 +8,40 @@ subdir = db
 subdir-dirs = btree db hash mpool recno
 vpath %.c $(subdir-dirs)
 
-extra-libs := libdb
+extra-libs := libdb1
 extra-libs-others := $(extra-libs)
-libdb-routines := bt_close bt_conv bt_debug bt_delete bt_get \
-		  bt_open bt_overflow bt_page bt_put bt_search \
-		  bt_seq bt_split bt_utils \
-		  db \
-		  hash hash_bigkey hash_buf hash_func hash_log2 hash_page \
-		  ndbm \
-		  mpool \
-		  rec_close rec_delete rec_get rec_open rec_put rec_search \
-		  rec_seq rec_utils
-
-headers		:= db.h mpool.h ndbm.h
+libdb1-routines := bt_close bt_conv bt_debug bt_delete bt_get \
+		   bt_open bt_overflow bt_page bt_put bt_search \
+		   bt_seq bt_split bt_utils \
+		   db \
+		   hash hash_bigkey hash_buf hash_func hash_log2 hash_page \
+		   ndbm \
+		   mpool \
+		   rec_close rec_delete rec_get rec_open rec_put rec_search \
+		   rec_seq rec_utils
+
+db1-headers	:= db.h mpool.h ndbm.h
 distribute	:= compat.h					\
 		   btree/btree.h btree/extern.h			\
 		   hash/extern.h hash/hash.h hash/page.h	\
-		   recno/extern.h recno/recno.h
+		   recno/extern.h recno/recno.h			\
+		   $(db1-headers)
+
+include ../Makeconfig
+
+install-others	:= $(inst_slibdir)/libdb.so$(libdb1.so-version) \
+		   $(db1-headers:%=$(inst_includedir)/db1/%)
 
-others		:= makedb
-install-bin	:= makedb
+$(inst_slibdir)/libdb.so$(libdb1.so-version): $(inst_slibdir)/libdb1-$(version).so $(+force)
+	rm -f $@
+	$(LN_S) $(^F) $@
+
+$(db1-headers:%=$(inst_includedir)/db1/%): $(inst_includedir)/db1/%: % $(+force)
+	$(do-install)
 
 include ../Rules
 
-CPPFLAGS += -D__DBINTERFACE_PRIVATE
+CPPFLAGS += -D__DBINTERFACE_PRIVATE -DUSE_LIBDB1
 
 # This file defines some static functions for alternative hash algorithms
 # that are not actually used.
@@ -40,23 +50,17 @@ CFLAGS-hash_func.c := -Wno-unused
 # The db code outsmarts the compiler frequently.
 override CFLAGS += -Wno-uninitialized
 
-ifeq ($(build-shared),yes)
-$(objpfx)makedb: $(objpfx)libdb.so$(libdb.so-version)
-else
-$(objpfx)makedb: $(objpfx)libdb.a
-endif
-
 # Depend on libc.so so a DT_NEEDED is generated in the shared objects.
 # This ensures they will load libc.so for needed symbols if loaded by
 # a statically-linked program that hasn't already loaded it.
-$(objpfx)libdb.so: $(common-objpfx)libc.so
-
-subdir_install: $(inst_libdir)/libndbm.a
-$(inst_libdir)/libndbm.a: $(inst_libdir)/libdb.a $(+force)
-	$(make-link)
+$(objpfx)libdb1.so: $(common-objpfx)libc.so
 
-ifeq ($(build-shared),yes)
-subdir_install: $(inst_libdir)/libndbm.so
-$(inst_libdir)/libndbm.so: $(inst_libdir)/libdb.so $(+force)
-	$(make-link)
-endif
+#subdir_install: $(inst_libdir)/libndbm.a
+#$(inst_libdir)/libndbm.a: $(inst_libdir)/libdb1.a $(+force)
+#	$(make-link)
+#
+#ifeq ($(build-shared),yes)
+#subdir_install: $(inst_libdir)/libndbm.so
+#$(inst_libdir)/libndbm.so: $(inst_libdir)/libdb1.so $(+force)
+#	$(make-link)
+#endif