INTEGRATION: CWS fwkfinal3 (1.18.4); FILE MERGED

2005/03/22 08:27:04 abi 1.18.4.2: bdb change
2005/03/21 19:53:46 abi 1.18.4.1: bdb change

1 files changed, 28 insertions, 45 deletions

diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk
index f9784f2c8875..fc68402c47ce 100644
--- a/berkeleydb/makefile.mk
+++ b/berkeleydb/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.18 $
+#   $Revision: 1.19 $
 #
-#   last change: $Author: rt $ $Date: 2004-09-08 14:03:39 $
+#   last change: $Author: rt $ $Date: 2005-03-30 08:33:28 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -77,20 +77,20 @@ all:
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=db-3.2.9
-ADDITIONAL_FILES=btree$/makefile.mk clib$/makefile.mk common$/makefile.mk \
-                 cxx$/makefile.mk db$/makefile.mk dbm$/makefile.mk \
-                 env$/makefile.mk hash$/makefile.mk hsearch$/makefile.mk \
-                 libdb_java$/makefile.mk clib$/makefile.mk common$/makefile.mk \
-                 lock$/makefile.mk log$/makefile.mk mp$/makefile.mk \
-                 mutex$/makefile.mk os$/makefile.mk os_win32$/makefile.mk \
-                 qam$/makefile.mk txn$/makefile.mk xa$/makefile.mk \
-                 makefile.mk libdb32.dxp libdb_java32.dxp
+TARFILE_NAME=db-4.2.52.NC
+ADDITIONAL_FILES=    \
+    makefile.mk btree$/makefile.mk clib$/makefile.mk common$/makefile.mk  \
+    cxx$/makefile.mk db$/makefile.mk dbm$/makefile.mk dbreg$/makefile.mk  \
+    db_printlog$/makefile.mk env$/makefile.mk fileops$/makefile.mk hash$/makefile.mk  \
+    hmac$/makefile.mk hsearch$/makefile.mk libdb_java$/makefile.mk lock$/makefile.mk  \
+    log$/makefile.mk mp$/makefile.mk mutex$/makefile.mk os$/makefile.mk  \
+    os_win32$/makefile.mk qam$/makefile.mk rep$/makefile.mk txn$/makefile.mk  \
+    xa$/makefile.mk libdb42.dxp libdb_java42.dxp
 
 
 
 # not needed for win32. comment out when causing problems...
-PATCH_FILE_NAME=db-3.2.9.patch
+PATCH_FILE_NAME=db-4.2.52.patch
 
 .IF "$(GUI)"=="UNX"
 CONFIGURE_DIR=out
@@ -111,25 +111,20 @@ BUILD_ACTION=make
 .ENDIF
 
 OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST)
-
 .IF "$(SOLAR_JAVA)"!=""
-OUT2BIN=java$/classes$/db.jar
+OUT2BIN=$(BUILD_DIR)$/db.jar
+OUT2CLASS=$(BUILD_DIR)$/db.jar
 .ENDIF
 
+OUT2INC= \
+    $(BUILD_DIR)$/db.h
+
 .ENDIF			# "$(GUI)"=="UNX"
 
 .IF "$(GUI)"=="WNT"
 # make use of stlport headerfiles
 EXT_USE_STLPORT=TRUE
 
-.IF "$(SOLAR_JAVA)" != ""
-BUILD_JAVA_DEVENV= /build Release /project db_java /useenv
-BUILD_JAVA_MSDEV= /MAKE "db_java - RELEASE"
-BUILD_JAVA_BIN=java$/classes$/db.jar \
-        $(BUILD_DIR)$/Release$/libdb_java32.dll
-BUILD_JAVA_LIB=$(BUILD_DIR)$/Release$/libdb_java32.lib
-.ENDIF
-.IF "$(COMEX)"=="8" || "$(COMEX)"=="10"
 .IF "$(USE_SHELL)"!="4nt"
 BUILD_ACTION_SEP=;
 .ELSE # "$(USE_SHELL)"!="4nt"
@@ -137,31 +132,18 @@ BUILD_ACTION_SEP=^
 .ENDIF # "$(USE_SHELL)"!="4nt"
 BUILD_DIR=
 BUILD_ACTION=dmake
-.ELSE
-BUILD_DIR=build_win32
-BUILD_ACTION=msdev Berkeley_DB.dsw /useenv /MAKE "db_buildall - RELEASE" $(BUILD_JAVA_MSDEV)
-.ENDIF
-BUILD_DIR_OUT=build_win32
-.IF "$(COMEX)"=="9"
-OUT2BIN= $(BUILD_JAVA_BIN) \
-     $(BUILD_DIR)$/Release$/libdb32.dll
-
-OUT2LIB= \
-    $(BUILD_JAVA_LIB) \
-    $(BUILD_DIR)$/Release$/libdb32.lib
-.ENDIF
-.ENDIF			# "$(GUI)"=="WNT"
 
+BUILD_DIR_OUT=build_win32
+#OUT2LIB= \
+#	$(BUILD_DIR_OUT)$/Release$/libdb_java42.lib \
+#	$(BUILD_DIR_OUT)$/Release$/libdb42.lib
+#OUT2BIN=$(BUILD_DIR_OUT)$/Release$/db.jar \
+#	$(BUILD_DIR_OUT)$/Release$/libdb_java42.dll \
+#	$(BUILD_DIR_OUT)$/Release$/libdb42.dll
+#OUT2CLASS=$(BUILD_DIR_OUT)$/Release$/db.jar
 OUT2INC= \
-    $(BUILD_DIR_OUT)$/db.h \
-    include$/db_185.h \
-    include$/db_cxx.h
-
-.IF "$(GUI)"!="WNT" || ("$(GUI)=="WNT" && "$(COMEX)"=="9")
-.IF "$(SOLAR_JAVA)"!=""
-OUT2CLASS=java$/classes$/db.jar
-.ENDIF
-.ENDIF
+    $(BUILD_DIR_OUT)$/db.h
+.ENDIF			# "$(GUI)"=="WNT"
 
 # --- Targets ------------------------------------------------------
 
@@ -169,3 +151,4 @@ OUT2CLASS=java$/classes$/db.jar
 .INCLUDE :	target.mk
 .INCLUDE :	tg_ext.mk
 
+