diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-19 12:32:17 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-19 12:32:17 +0000 |
| commit | a6b6857bb76e7713b08e15512d1de7fe42487ca7 (patch) | |
| tree | f5a028718e710c11af926671645f44301e516e51 /berkeleydb | |
| parent | 2a285bd54c44458692323167717884d3b295ef27 (diff) | |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'berkeleydb')
| -rw-r--r-- | berkeleydb/makefile.mk | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 86e69a6fa17b..88d646e7bb27 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: mh $ $Date: 2002-11-20 10:35:32 $ +# last change: $Author: hr $ $Date: 2003-03-19 13:32:17 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -88,7 +88,7 @@ BUILD_ACTION=make OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*.so OUT2BIN=java$/classes$/db.jar - + .ENDIF # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" @@ -96,7 +96,11 @@ OUT2BIN=java$/classes$/db.jar EXT_USE_STLPORT=TRUE BUILD_DIR=build_win32 +.IF "$(COMEX)"=="8" +BUILD_ACTION=wdevenv Berkeley_DB Release +.ELSE BUILD_ACTION=msdev Berkeley_DB.dsw /useenv /MAKE "db_buildall - RELEASE" /MAKE "db_java - RELEASE" +.ENDIF OUT2BIN=java$/classes$/db.jar \ $(BUILD_DIR)$/Release$/libdb_java32.dll \ @@ -105,7 +109,7 @@ OUT2BIN=java$/classes$/db.jar \ OUT2LIB= \ $(BUILD_DIR)$/Release$/libdb_java32.lib \ $(BUILD_DIR)$/Release$/libdb32.lib - + .ENDIF # "$(GUI)"=="WNT" OUT2INC= \ @@ -121,10 +125,3 @@ OUT2CLASS=java$/classes$/db.jar .INCLUDE : target.mk .INCLUDE : tg_ext.mk -TG_DELIVER : $(INPATH)$/misc$/build$/so_predeliver - $(DELIVER) - -.IF "$(BUILD_PREDELIVER)"!="" -ALLTAR : TG_DELIVER -.ENDIF # "$(BUILD_PREDELIVER)"!="" - |