From 79b1acaf50e127c749c3de04ee0d083d27195e79 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov <vg@openoffice.org> Date: Mon, 15 Oct 2007 11:21:23 +0000 Subject: INTEGRATION: CWS sb71 (1.9.4); FILE MERGED 2007/10/02 09:06:29 sb 1.9.4.3: RESYNC: (1.11-1.12); FILE MERGED 2007/08/23 16:59:07 sb 1.9.4.2: RESYNC: (1.9-1.11); FILE MERGED 2007/06/14 15:03:35 sb 1.9.4.1: #i75466# Adapted to new APP|SHLnRPATH. --- cppu/util/makefile.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'cppu/util') diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk index a6d97c47d127..f08c16a6cbc0 100644 --- a/cppu/util/makefile.mk +++ b/cppu/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # -# last change: $Author: vg $ $Date: 2007-09-20 14:44:33 $ +# last change: $Author: vg $ $Date: 2007-10-15 12:21:23 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -73,6 +73,7 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def .ENDIF SHL1VERSIONMAP=$(TARGET).map +SHL1RPATH=URELIB DEF1NAME=$(SHL1TARGET) @@ -91,6 +92,7 @@ SHL2VERSIONMAP:=$(SHL2TARGET).map SHL2DEF := $(MISC)$/$(SHL2TARGET).def SHL2IMPLIB := i$(SHL2TARGET) SHL2STDLIBS := $(CPPULIB) $(SALHELPERLIB) $(SALLIB) +SHL2RPATH := URELIB SHL2OBJS := \ $(SLO)$/helper_purpenv_Environment.obj \ $(SLO)$/helper_purpenv_Mapping.obj \ -- cgit