diff options
author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 08:13:12 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 08:13:12 +0000 |
commit | 45d6cd73a362037853c3bf59239b430d29783aa6 (patch) | |
tree | 189fd96e09f425f9a7b3ae653f5b45061b27445e /solenv/inc/unxsols4.mk | |
parent | 30983b64a2b1315aabf1c8c8dfdae3718fcfd381 (diff) |
INTEGRATION: CWS ause076 (1.36.18); FILE MERGED
2007/03/01 16:50:04 hjs 1.36.18.1: #i75028# kick obsolete settings
Diffstat (limited to 'solenv/inc/unxsols4.mk')
-rw-r--r-- | solenv/inc/unxsols4.mk | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk index a4fc57667027..a63617f0d42d 100644 --- a/solenv/inc/unxsols4.mk +++ b/solenv/inc/unxsols4.mk @@ -4,9 +4,9 @@ # # $RCSfile: unxsols4.mk,v $ # -# $Revision: 1.37 $ +# $Revision: 1.38 $ # -# last change: $Author: vg $ $Date: 2007-02-27 11:48:47 $ +# last change: $Author: obo $ $Date: 2007-03-09 09:13:12 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -71,8 +71,6 @@ CFLAGSENABLESYMBOLS_CC_ONLY=-g -xs # was temporarily commented out, reenabled be CFLAGSEXCEPTIONS= CFLAGS_NO_EXCEPTIONS=-noex -CFLAGSOBJGUIST=-KPIC -CFLAGSOBJCUIST=-KPIC CFLAGSOBJGUIMT=-KPIC -mt CFLAGSOBJCUIMT=-KPIC -mt CFLAGSSLOGUIMT=-KPIC -mt @@ -196,19 +194,13 @@ STDOBJCUI= STDSLOCUI= # CPPRUNTIME - define where to place C++ runtime if required -STDLIBGUIST=$(DYNAMIC) -lm -STDLIBCUIST=$(DYNAMIC) -lm STDLIBGUIMT=$(DYNAMIC) -lpthread -lm STDLIBCUIMT=$(DYNAMIC) -lpthread -lm -STDSHLGUIST=$(DYNAMIC) CPPRUNTIME -lm -lc -STDSHLCUIST=$(DYNAMIC) CPPRUNTIME -lm -lc STDSHLGUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc # libdl.so - no really an GUI library but required in this context -STDLIBGUIST+=-lX11 -ldl STDLIBGUIMT+=-lX11 -ldl -STDSHLGUIST+=-lX11 -ldl STDSHLGUIMT+=-lX11 -ldl # @@@ interposer needed for -Bdirect @@@ |