diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-18 11:54:06 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-18 11:54:06 +0000 |
| commit | 4a99cfe8c84660f672926cc534444ee3e3bb38cb (patch) | |
| tree | 0fa5873c176bd1b7d128cb450f73673361384cdf /solenv | |
| parent | 014467d75e9b12eaae3065449adc12fdcd5a6b8b (diff) | |
CWS-TOOLING: integrate CWS dtrans2vcl
2009-09-09 19:47:56 +0200 pl r276016 : merge fix for #i104390# into moved code
2009-09-07 12:50:47 +0200 pl r275891 : remove nonexistant header
2009-09-04 16:47:05 +0200 pl r275819 : forgot calling convention for Windoze
2009-09-04 13:27:36 +0200 pl r275800 : #150926# remove X11 dependency
2009-09-04 13:19:08 +0200 pl r275799 : #150926# move mac dtrans service to vcl to be used in service implementation
2009-09-03 21:19:01 +0200 pl r275774 : fix warning, adjust comment
2009-09-03 18:36:01 +0200 pl r275768 : no more sjlib
2009-09-03 17:56:49 +0200 pl r275767 : remove unused X11 link dependency
2009-09-03 17:43:35 +0200 pl r275766 : headless not used in X11 case
2009-09-03 17:34:36 +0200 pl r275765 : #150926# bye bye sj2
2009-09-03 16:19:04 +0200 pl r275761 : #150926# bye bye sj2, x11 dependenices removed where not necessary
2009-09-01 17:22:54 +0200 pl r275674 : #150926# step 1: move X11 code from dtrans to vcl, adapt glue code
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/libs.mk | 2 | ||||
| -rw-r--r-- | solenv/inc/unxlngi6.mk | 6 | ||||
| -rw-r--r-- | solenv/inc/unxlngx6.mk | 6 | ||||
| -rw-r--r-- | solenv/inc/unxsoli4.mk | 5 | ||||
| -rw-r--r-- | solenv/inc/unxsols4.mk | 5 |
5 files changed, 14 insertions, 10 deletions
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 610463787388..0d46f3ff9102 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -182,7 +182,6 @@ BTCOMMUNILIB=-lbtcommuni$(DLLPOSTFIX) AUTOMATIONLIB=-lsts$(DLLPOSTFIX) SVLLIB=-lsvl$(DLLPOSTFIX) TKTLIB=-ltkt$(DLLPOSTFIX) -SJLIB=-lj$(DLLPOSTFIX)_g GOODIESLIB=-lgo$(DLLPOSTFIX) SAXLIB=-lsax$(DLLPOSTFIX) MAILLIB=-lmail @@ -425,7 +424,6 @@ MAILLIB=mail.lib DOCMGRLIB=docmgr.lib BASICLIB=basic.lib TKTLIB=tkt.lib -SJLIB=sj.lib SVXCORELIB=isvxcore.lib SVXMSFILTERLIB=isvxmsfilter.lib SVXLIB=isvx.lib diff --git a/solenv/inc/unxlngi6.mk b/solenv/inc/unxlngi6.mk index e525748325b0..224159f1be02 100644 --- a/solenv/inc/unxlngi6.mk +++ b/solenv/inc/unxlngi6.mk @@ -207,12 +207,14 @@ LINKFLAGS += -Wl,-zdynsort .ENDIF # libraries for linking applications -STDLIBGUIMT+=-Wl,--as-needed -lX11 -ldl -lpthread -lm -Wl,--no-as-needed +STDLIBGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed STDLIBCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed # libraries for linking shared libraries -STDSHLGUIMT+=-Wl,--as-needed -lX11 -lXext -ldl -lpthread -lm -Wl,--no-as-needed +STDSHLGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed STDSHLCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed +X11LINK_DYNAMIC = -lX11 + LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive .IF "$(USE_STLP_DEBUG)" != "" diff --git a/solenv/inc/unxlngx6.mk b/solenv/inc/unxlngx6.mk index b55e53ada06e..c49e1c4526c5 100644 --- a/solenv/inc/unxlngx6.mk +++ b/solenv/inc/unxlngx6.mk @@ -199,12 +199,14 @@ STDOBJCUI= STDSLOCUI= # libraries for linking applications -STDLIBGUIMT+=-Wl,--as-needed -lX11 -ldl -lpthread -lm -Wl,--no-as-needed +STDLIBGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed STDLIBCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed # libraries for linking shared libraries -STDSHLGUIMT+=-Wl,--as-needed -lX11 -lXext -ldl -lpthread -lm -Wl,--no-as-needed +STDSHLGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed STDSHLCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed +X11LINK_DYNAMIC = -lX11 + LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive .IF "$(USE_STLP_DEBUG)" != "" diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk index bfa6f2b19afd..afcea59a9971 100644 --- a/solenv/inc/unxsoli4.mk +++ b/solenv/inc/unxsoli4.mk @@ -197,8 +197,9 @@ STDSHLGUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc # libdl.so - no really an GUI library but required in this context -STDLIBGUIMT+=-lX11 -ldl -STDSHLGUIMT+=-lX11 -ldl +STDLIBGUIMT+=-ldl +STDSHLGUIMT+=-ldl +X11LINK_DYNAMIC = -lX11 # @@@ interposer needed for -Bdirect @@@ # LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk index b52615209049..a28b097e13b4 100644 --- a/solenv/inc/unxsols4.mk +++ b/solenv/inc/unxsols4.mk @@ -203,8 +203,9 @@ STDSHLGUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc # libdl.so - no really an GUI library but required in this context -STDLIBGUIMT+=-lX11 -ldl -STDSHLGUIMT+=-lX11 -ldl +STDLIBGUIMT+=-ldl +STDSHLGUIMT+=-ldl +X11LINK_DYNAMIC = -lX11 # @@@ interposer needed for -Bdirect @@@ # LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract |