diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 16:46:49 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 16:46:49 +0000 |
| commit | 5a2420c6bf530a8d6432dd85ae4414c457d42836 (patch) | |
| tree | e8f77cb33aaa05971595880747869631c4842323 /berkeleydb | |
| parent | cfe0b8d1cf0c866ffd44591deb5d49c95aefb4a7 (diff) | |
INTEGRATION: CWS ause079 (1.40.6); FILE MERGED
2007/06/20 12:25:21 hjs 1.40.6.1: #i66252# resorted lines to to find jni.h
Diffstat (limited to 'berkeleydb')
| -rw-r--r-- | berkeleydb/makefile.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 2da495932451..c87c3055ce77 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.40 $ +# $Revision: 1.41 $ # -# last change: $Author: vg $ $Date: 2007-05-25 10:48:51 $ +# last change: $Author: hr $ $Date: 2007-06-27 17:46:49 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -95,10 +95,6 @@ LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' -Wl,-z,noexecstack LDFLAGS:=-R\''$$$$ORIGIN'\' .EXPORT: LDFLAGS .ENDIF # "$(OS)$(COM)"=="SOLARISC52" -# just pass ARCH_FLAGS to native build -CFLAGS+:=$(ARCH_FLAGS) -CXXFLAGS+:=$(ARCH_FLAGS) -.EXPORT : CFLAGS CXXFLAGS CONFIGURE_DIR=out #relative to CONFIGURE_DIR CONFIGURE_ACTION= \ @@ -106,7 +102,12 @@ CONFIGURE_ACTION= \ CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185 .IF "$(SOLAR_JAVA)"!="" CONFIGURE_FLAGS+=--enable-java +ARCH_FLAGS+=-I$(JAVA_HOME)/include .ENDIF +# just pass ARCH_FLAGS to native build +CFLAGS+:=$(ARCH_FLAGS) +CXXFLAGS+:=$(ARCH_FLAGS) +.EXPORT : CFLAGS CXXFLAGS BUILD_DIR=$(CONFIGURE_DIR) BUILD_DIR_OUT=$(CONFIGURE_DIR) |