diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:14:56 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:14:56 +0000 |
| commit | a2920d4825491d855b07c794c399ad0f0a877056 (patch) | |
| tree | 250dd28ccbf510399a37163d98ceff4b2d19129b | |
| parent | 5f8abeb513da2ac49019ae18906304762c27ea7d (diff) | |
INTEGRATION: CWS sb71 (1.17.8); FILE MERGED
2007/06/14 14:53:29 sb 1.17.8.1: #i75466# Adapted to new APP|SHLnRPATH.
| -rw-r--r-- | cpputools/source/registercomponent/makefile.mk | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/cpputools/source/registercomponent/makefile.mk b/cpputools/source/registercomponent/makefile.mk index 5bbb0fd1f..e942fd278 100644 --- a/cpputools/source/registercomponent/makefile.mk +++ b/cpputools/source/registercomponent/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.17 $ +# $Revision: 1.18 $ # -# last change: $Author: ihi $ $Date: 2006-12-20 12:21:23 $ +# last change: $Author: vg $ $Date: 2007-10-15 13:14:56 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -40,12 +40,6 @@ LIBTARGET=NO ENABLE_EXCEPTIONS=TRUE -.IF "$(OS)" == "LINUX" -LINKFLAGSRUNPATH = -Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' -.ELIF "$(OS)" == "SOLARIS" -LINKFLAGSRUNPATH = -R\''$$ORIGIN/../lib:$$ORIGIN'\' -.ENDIF - # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk @@ -75,6 +69,7 @@ DEPOBJFILES= $(OBJ)$/registercomponent.obj APP1TARGET= $(TARGET) APP1OBJS=$(DEPOBJFILES) +APP1RPATH=UREBIN APP1STDLIBS=\ $(SALLIB) \ |