summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-04-27 11:24:10 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-04-27 11:24:10 +0000
commit877e2382243e915fe85bb6c29282d90fd7cfd4f2 (patch)
tree58428b82a08aa6cc42d2d8bea3a0ddb148cb92f5
parent819f089c0a9e3512e8674651d05b4173fd6a811f (diff)
CWS-TOOLING: integrate CWS sb107
2009-04-14 13:09:13 +0200 sb r270758 : CWS-TOOLING: rebase CWS sb107 to trunk@270723 (milestone: DEV300:m46) 2009-04-06 14:11:54 +0200 sb r270545 : #i100884# improve pagein effectiveness: wrap system libs in --as-needed on unxlngi6/unxlngx6 to avoid needing them where unneeded; link pagein as C program to avoid unneeded C++ runtime dependency; reorder pagein and javaldx in soffice startup script so that javaldx benefits from pagein 2009-03-31 16:40:23 +0200 sb r270287 : decrease collisions in hashCode computation 2009-03-30 11:48:39 +0200 sb r270207 : #i100668# corrected explicit template instantiation 2009-03-26 14:16:26 +0100 sb r270078 : #i100408# inadvertently dropped libexslt dynamic library in previous rev 269789 2009-03-26 10:52:51 +0100 sb r270058 : #i100576# fixed erroneous modification of RPM in previous rev 270057 2009-03-26 10:46:36 +0100 sb r270057 : #i100576# Enable HAVE_LD_HASH_STYLE in sdev300.ini for unxlgni6 and unxlngx6; corrected unxlngx6.mk so that HAVE_LD_HASH_STYLE actually has an effect on ultimate LINKFLAGS value. 2009-03-25 16:53:39 +0100 sb r270038 : #i85679# applied speed-symbolic-functions.diff provided by pmladek; re-ran autoconf; enabled HAVE_LD_BSYMBOLIC_FUNCTIONS for unxlngi6 and unxlngx6 in sdev300.ini 2009-03-25 15:29:12 +0100 sb r270031 : #i100408# missing fixes in addition to -c 269789 (to actually only put single instances of certain libraries into installation sets) 2009-03-25 15:17:10 +0100 sb r270029 : #i10084# revert masterfix additions of libraries to APPnSTDLIBs (during -r269000:269199) and instead use -rpath-link to avoid linker warnings on unxlngi6 and unxlngx6 2009-03-25 14:15:23 +0100 sb r270023 : added svn:ignore 2009-03-25 10:25:08 +0100 sb r270002 : #i10000# copied over trunk -c 269820 2009-03-23 10:16:00 +0100 sb r269858 : CWS-TOOLING: rebase CWS sb107 to trunk@269781 (milestone: DEV300:m44) 2009-03-20 11:22:27 +0100 sb r269789 : #i100408# reduce (multiple copies of) libraries delivered to solver; for that to work fine, deliver symlink feature got improved to only create a symlink if the original file exists 2009-03-20 09:21:32 +0100 sb r269782 : #i100396# replace s(HTML|RTF)_xxx declarations with OOO_STRING_SVTOOLS_(HTML|RTF)_xxx macros to reduce symbolic relocations at load time (at least on ELF systems). 2009-03-19 11:34:56 +0100 sb r269734 : #i100348# added VISIBILITY_HIDDEN=TRUE so that symbols from the resulting archive are not erroneously exported from dynamic libraries including the archive 2009-03-19 11:32:20 +0100 sb r269733 : #i100348# as a prerequisite for following changes, brought jpeg-6b.patch into "dmake create_patch" format and removed application/octet-stream svn:mime-type 2009-03-12 10:39:08 +0100 sb r269370 : duplicated cws/odfmetadata2/solenv/inc/target.mk -c 268831 2009-03-04 17:25:16 +0100 sb r268849 : #i99880# missing AUGMENT_LIBRARY_PATH 2009-02-25 17:54:34 +0100 sb r268459 : CWS-TOOLING: rebase CWS sb107 to trunk@268395 (milestone: DEV300:m42) 2009-02-25 09:23:15 +0100 sb r268413 : #i99584# avoid undefined operations on nOffset (patch by cmc) 2009-02-23 10:02:25 +0100 sb r268344 : #i99519 removed unnecessary library dependencies 2009-02-18 17:54:24 +0100 sb r268250 : avoid warnings about format specifier and argument mismatch (on 64bit debug builds) 2009-02-18 17:50:34 +0100 sb r268249 : avoid erroneous warning that control reaches end of non-void function 2009-02-18 17:33:53 +0100 sb r268248 : sdext/source/pdfimport/misc/pdfihelper.cxx: #include <vcl/canvastools.hxx>
-rw-r--r--UnoControls/util/makefile.mk1
-rw-r--r--automation/util/makefile.mk14
-rw-r--r--extensions/source/plugin/unx/makefile.mk1
-rw-r--r--extensions/source/preload/makefile.mk1
-rw-r--r--extensions/source/resource/makefile.mk4
-rw-r--r--extensions/source/scanner/makefile.mk3
-rw-r--r--lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk4
-rw-r--r--lingucomponent/source/languageguessing/makefile.mk1
-rw-r--r--lingucomponent/source/spellcheck/spell/makefile.mk5
-rw-r--r--lingucomponent/source/thesaurus/libnth/makefile.mk4
-rw-r--r--xmlsecurity/util/makefile.mk4
11 files changed, 1 insertions, 41 deletions
diff --git a/UnoControls/util/makefile.mk b/UnoControls/util/makefile.mk
index c7483269b62f..d2c225a4b214 100644
--- a/UnoControls/util/makefile.mk
+++ b/UnoControls/util/makefile.mk
@@ -56,7 +56,6 @@ SHL1STDLIBS= \
$(TOOLSLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(VOSLIB) \
$(SALLIB)
SHL1DEPN= makefile.mk
diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk
index 3d936164bff9..f96910a01325 100644
--- a/automation/util/makefile.mk
+++ b/automation/util/makefile.mk
@@ -111,16 +111,10 @@ SHL3IMPLIB= icommuni
SHL3STDLIBS= \
$(TOOLSLIB) \
- $(SVTOOLLIB) \
$(SVLLIB) \
$(VCLLIB) \
- $(BASICLIB) \
$(VOSLIB) \
$(SALLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(COMPHELPERLIB) \
- $(SOTLIB) \
$(VOSLIB) \
$(SIMPLECMLIB)
@@ -167,12 +161,8 @@ APP1STDLIBS+= \
$(VOSLIB) \
$(UCBHELPERLIB) \
$(COMPHELPERLIB) \
- $(SOTLIB) \
$(BASICLIB) \
$(SIMPLECMLIB) \
- $(BASEGFXLIB) $(I18NISOLANGLIB) $(TKLIB) $(I18NUTILLIB) \
- $(ICUUCLIB) $(ICULELIB) $(ICUDATALIB) $(JVMFWKLIB) $(JVMACCESSLIB) \
- $(SALHELPERLIB) $(XMLSCRIPTLIB) \
$(COMMUNILIB)
.IF "$(GUI)"=="UNX"
@@ -232,10 +222,6 @@ APP3STDLIBS= \
$(TOOLSLIB) \
$(SVTOOLLIB) \
$(VCLLIB) \
- $(BASEGFXLIB) $(I18NISOLANGLIB) $(TKLIB) $(I18NUTILLIB) \
- $(ICUUCLIB) $(ICULELIB) $(ICUDATALIB) $(JVMFWKLIB) $(JVMACCESSLIB) \
- $(SALHELPERLIB) $(UNOTOOLSLIB) $(SVLLIB) $(BASICLIB) $(SOTLIB) \
- $(XMLSCRIPTLIB) \
$(SJLIB)
.IF "$(GUI)"=="UNX"
diff --git a/extensions/source/plugin/unx/makefile.mk b/extensions/source/plugin/unx/makefile.mk
index d2cb4b888f37..902348f0cb7d 100644
--- a/extensions/source/plugin/unx/makefile.mk
+++ b/extensions/source/plugin/unx/makefile.mk
@@ -74,7 +74,6 @@ OBJFILES=\
APP1TARGET=pluginapp.bin
APP1OBJS=$(OBJFILES)
APP1STDLIBS=\
- $(TOOLSLIB) \
$(VOSLIB) \
$(SALLIB)
.IF "$(OS)"=="SOLARIS" || "$(OS)"=="SCO" || "$(OS)"=="HPUX"
diff --git a/extensions/source/preload/makefile.mk b/extensions/source/preload/makefile.mk
index 54de572a875d..db8b58b6e118 100644
--- a/extensions/source/preload/makefile.mk
+++ b/extensions/source/preload/makefile.mk
@@ -64,7 +64,6 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
SHL1VERSIONMAP= $(TARGET).map
SHL1STDLIBS= \
- $(SVXLIB) \
$(SFXLIB) \
$(SVTOOLLIB)\
$(VCLLIB) \
diff --git a/extensions/source/resource/makefile.mk b/extensions/source/resource/makefile.mk
index 26d40800b9e0..5fdd7ee03603 100644
--- a/extensions/source/resource/makefile.mk
+++ b/extensions/source/resource/makefile.mk
@@ -55,12 +55,8 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
SHL1STDLIBS= \
$(CPPULIB) \
$(CPPUHELPERLIB) \
- $(VOSLIB) \
$(SALLIB) \
$(VCLLIB) \
- $(COMPHELPERLIB) \
- $(SVTOOLLIB) \
- $(UNOTOOLSLIB) \
$(TOOLSLIB)
SHL1DEPN=
diff --git a/extensions/source/scanner/makefile.mk b/extensions/source/scanner/makefile.mk
index f1bf116e456d..e4e36e44a790 100644
--- a/extensions/source/scanner/makefile.mk
+++ b/extensions/source/scanner/makefile.mk
@@ -79,8 +79,7 @@ SHL1STDLIBS=\
$(ONELIB) \
$(TOOLSLIB) \
$(VCLLIB) \
- $(SVTOOLLIB) \
- $(GOODIESLIB)
+ $(SVTOOLLIB)
.IF "$(GUI)"=="UNX"
.IF "$(OS)"!="FREEBSD"
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
index c3f9e49a714d..dd48e3b1ec0f 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
@@ -71,14 +71,10 @@ SHL1TARGET= $(REALNAME)$(DLLPOSTFIX)
SHL1STDLIBS= \
$(CPPULIB) \
$(CPPUHELPERLIB) \
- $(VOSLIB) \
$(I18NISOLANGLIB) \
$(TOOLSLIB) \
- $(SVTOOLLIB) \
$(SVLLIB) \
- $(VCLLIB) \
$(SALLIB) \
- $(UCBHELPERLIB) \
$(UNOTOOLSLIB) \
$(LNGLIB) \
$(HNJLIB) \
diff --git a/lingucomponent/source/languageguessing/makefile.mk b/lingucomponent/source/languageguessing/makefile.mk
index 653e7935a3ce..7650df0c0bce 100644
--- a/lingucomponent/source/languageguessing/makefile.mk
+++ b/lingucomponent/source/languageguessing/makefile.mk
@@ -63,7 +63,6 @@ SHL1STDLIBS= \
$(LIBTEXTCATLIB) \
$(SALLIB) \
$(SVLLIB) \
- $(SVTOOLLIB) \
$(TOOLSLIB) \
$(UNOTOOLSLIB)
diff --git a/lingucomponent/source/spellcheck/spell/makefile.mk b/lingucomponent/source/spellcheck/spell/makefile.mk
index c203e22f4afa..3a9c081cb5c1 100644
--- a/lingucomponent/source/spellcheck/spell/makefile.mk
+++ b/lingucomponent/source/spellcheck/spell/makefile.mk
@@ -66,14 +66,9 @@ SHL1STDLIBS= \
$(CPPULIB) \
$(CPPUHELPERLIB) \
$(I18NISOLANGLIB) \
- $(VOSLIB) \
$(TOOLSLIB) \
- $(SVTOOLLIB) \
$(SVLLIB) \
- $(VCLLIB) \
$(SALLIB) \
- $(UCBHELPERLIB) \
- $(UNOTOOLSLIB) \
$(LNGLIB) \
$(ULINGULIB) \
$(ICUUCLIB) \
diff --git a/lingucomponent/source/thesaurus/libnth/makefile.mk b/lingucomponent/source/thesaurus/libnth/makefile.mk
index 80c7e761d788..0f91226794a4 100644
--- a/lingucomponent/source/thesaurus/libnth/makefile.mk
+++ b/lingucomponent/source/thesaurus/libnth/makefile.mk
@@ -84,14 +84,10 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
SHL1STDLIBS= \
$(CPPULIB) \
$(CPPUHELPERLIB) \
- $(VOSLIB) \
$(TOOLSLIB) \
$(I18NISOLANGLIB) \
- $(SVTOOLLIB) \
$(SVLLIB) \
- $(VCLLIB) \
$(SALLIB) \
- $(UCBHELPERLIB) \
$(UNOTOOLSLIB) \
$(LNGLIB) \
$(ULINGULIB) \
diff --git a/xmlsecurity/util/makefile.mk b/xmlsecurity/util/makefile.mk
index e3ea9a9011c7..e3f78a45592f 100644
--- a/xmlsecurity/util/makefile.mk
+++ b/xmlsecurity/util/makefile.mk
@@ -92,7 +92,6 @@ SHL2STDLIBS += \
$(CPPULIB) \
$(CPPUHELPERLIB) \
$(SALLIB) \
- $(UNOTOOLSLIB) \
$(SVLLIB) \
$(TOOLSLIB) \
$(COMPHELPERLIB) \
@@ -151,10 +150,7 @@ SHL4STDLIBS=\
$(TOOLSLIB) \
$(SVTOOLLIB) \
$(SALLIB) \
- $(VOSLIB) \
- $(SOTLIB) \
$(SVLLIB) \
- $(SFXLIB) \
$(XMLOFFLIB) \
$(SVXLIB)