diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 10:58:19 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 10:58:19 +0000 |
| commit | 1fef92abeea396200b852db2198eed8e4075d3ba (patch) | |
| tree | a6dbe624e7dd15c905521856bf16bc2c1340fbc7 /bridges | |
| parent | d127dbdd5755a30c11fb1631c7e5b49dab87e1ec (diff) | |
INTEGRATION: CWS sb71 (1.4.26); FILE MERGED
2007/06/14 15:04:35 sb 1.4.26.1: #i75466# Adapted to new APP|SHLnRPATH.
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_netbsd_intel/makefile.mk | 5 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_solaris_intel/makefile.mk | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/bridges/source/cpp_uno/gcc3_netbsd_intel/makefile.mk b/bridges/source/cpp_uno/gcc3_netbsd_intel/makefile.mk index 15856b54f625..72beed66b9ec 100644 --- a/bridges/source/cpp_uno/gcc3_netbsd_intel/makefile.mk +++ b/bridges/source/cpp_uno/gcc3_netbsd_intel/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: obo $ $Date: 2007-01-25 13:29:19 $ +# last change: $Author: vg $ $Date: 2007-10-15 11:58:06 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -64,6 +64,7 @@ SHL1TARGET= $(TARGET) SHL1DEF=$(MISC)$/$(SHL1TARGET).def SHL1IMPLIB=i$(TARGET) SHL1VERSIONMAP=..$/..$/bridge_exports.map +SHL1RPATH=URELIB SHL1OBJS= \ $(SLO)$/except.obj \ diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/makefile.mk b/bridges/source/cpp_uno/gcc3_solaris_intel/makefile.mk index 6301ce985a54..a4a6dc4ea37c 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/makefile.mk +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: obo $ $Date: 2007-01-25 13:29:47 $ +# last change: $Author: vg $ $Date: 2007-10-15 11:58:19 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -64,6 +64,7 @@ SHL1TARGET= $(TARGET) SHL1DEF=$(MISC)$/$(SHL1TARGET).def SHL1IMPLIB=i$(TARGET) SHL1VERSIONMAP=..$/..$/bridge_exports.map +SHL1RPATH=URELIB SHL1OBJS = $(SLOFILES) SHL1LIBS = $(SLB)$/cpp_uno_shared.lib |