diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-04-17 08:58:46 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-04-17 08:58:46 +0000 |
| commit | a96ec9ab90e4e308ca07c239c93523b05840be90 (patch) | |
| tree | 82e1375f879812de115552c908a15582450ec9c4 /odk/settings | |
| parent | 971777a20159333a76fc5698230a7d71fed58061 (diff) | |
INTEGRATION: CWS sdk01 (1.1.4.1.6); FILE MERGED
2003/04/11 13:26:37 jsc 1.1.4.1.6.4: #108799# use lib prefix (temporary)
2003/04/10 11:47:35 jsc 1.1.4.1.6.3: #108799# use new naming convention for uno components
2003/03/28 14:42:15 jsc 1.1.4.1.6.2: #108153# correct rpath option
2003/03/28 14:04:28 jsc 1.1.4.1.6.1: #108153# use rpath ORIGIN option for linking
Diffstat (limited to 'odk/settings')
| -rw-r--r-- | odk/settings/settings.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 823a8c4d9f81..9bdef4055493 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -53,6 +53,7 @@ PACKAGE_LIB_DIR=windows.plt OSEP=^< CSEP=^> QUOTE= +QM= DEL=del DELRECURSIVE=rd /S /Q @@ -133,6 +134,7 @@ SHAREDLIB_OUT=$(OUT_LIB) OSEP=\< CSEP=\> QUOTE=$(subst S,\,S) +QM=\" DEL=rm -f DELRECURSIVE=rm -rf @@ -165,7 +167,7 @@ SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/ CC_DEFINES=-DUNX -DSOLARIS -DSPARC -DCPPU_ENV=sunpro5 CC_OUTPUT_SWITCH=-o -LIBRARY_LINK_FLAGS=-w -PIC -temp=/tmp -R /usr/lib -G -lthread -instances=static +LIBRARY_LINK_FLAGS=-w -PIC -temp=/tmp '-R $$ORIGIN' -norunpath -G -lthread -instances=static LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) LINK_JAVA_LIBS=-L$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE) @@ -220,6 +222,7 @@ endif OSEP=\< CSEP=\> QUOTE=$(subst S,\,S) +QM=\" DEL=rm -f DELRECURSIVE=rm -rf @@ -260,7 +263,7 @@ CC_DEFINES=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) CC_OUTPUT_SWITCH=-o -LIBRARY_LINK_FLAGS=-shared +LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN' ifeq "$(PROCTYPE)" "ppc" LIBRARY_LINK_FLAGS+=-fPIC |