diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-05-25 09:48:51 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-05-25 09:48:51 +0000 |
| commit | ba11f4059f2861c06be96b7b1a1f6d357617041a (patch) | |
| tree | 054721f07f0897f14441dc5e1742fe5e3ffe747e /berkeleydb | |
| parent | 418775a88cecb3b2203796203057fa54e9edf0ab (diff) | |
INTEGRATION: CWS mingwport04 (1.38.2); FILE MERGED
2007/04/17 12:57:36 vg 1.38.2.1: #i75844# MinGW port efforts part 2
Diffstat (limited to 'berkeleydb')
| -rw-r--r-- | berkeleydb/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 2ebb561a92a5..2da495932451 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.39 $ +# $Revision: 1.40 $ # -# last change: $Author: kz $ $Date: 2007-05-09 13:20:58 $ +# last change: $Author: vg $ $Date: 2007-05-25 10:48:51 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -141,9 +141,9 @@ CFLAGS+=-nostdinc -D_MT CONFIGURE_ACTION=..$/dist$/configure CONFIGURE_FLAGS=--enable-cxx --enable-dynamic --enable-shared --build=i586-pc-mingw32 --host=i586-pc-mingw32 --enable-mingw LN_S=ln NM="$(WRAPCMD) nm" OBJDUMP="$(WRAPCMD) objdump" JAVA="$(WRAPCMD) -env java" JAVAC="$(WRAPCMD) -env javac" CFLAGS="$(CFLAGS)" CPPFLAGS="$(INCLUDE)" LIBS="-lmingwthrd" LIBSO_LIBS="-lmingwthrd" LIBJSO_LIBS="-lmingwthrd" LIBXSO_LIBS="-lmingwthrd $(LIBSTLPORT)" .IF "$(USE_MINGW)"=="cygwin" -CONFIGURE_FLAGS+=LDFLAGS="-no-undefined -L$(SOLARVER)/$(UPD)/$(INPATH)/lib -L$(SOLARVER)/$(UPD)/$(INPATH)/bin -L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api -L$(COMPATH)/lib" +CONFIGURE_FLAGS+=LDFLAGS="-no-undefined -L$(SOLARVER)/$(INPATH)/lib -L$(SOLARVER)/$(INPATH)/bin -L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api -L$(COMPATH)/lib" .ELSE -CONFIGURE_FLAGS+=LDFLAGS="-no-undefined -L$(SOLARVER)/$(UPD)/$(INPATH)/lib -L$(SOLARVER)/$(UPD)/$(INPATH)/bin -L$(COMPATH)/lib" +CONFIGURE_FLAGS+=LDFLAGS="-no-undefined -L$(SOLARVER)/$(INPATH)/lib -L$(SOLARVER)/$(INPATH)/bin -L$(COMPATH)/lib" .ENDIF .IF "$(SOLAR_JAVA)"!="" CONFIGURE_FLAGS+=--enable-java |