Commits

Anonymous committed c4c94fd

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>

Comments (0)

Files changed (191)

UnoControls/util/makefile.mk

 		$(TOOLSLIB) \
 		$(CPPUHELPERLIB) \
 		$(CPPULIB) \
-		$(VOSLIB) \
 		$(SALLIB)
 
 SHL1DEPN=		makefile.mk

automation/util/makefile.mk

 
 SHL3STDLIBS= \
 			$(TOOLSLIB) \
-			$(SVTOOLLIB) \
 			$(SVLLIB)       \
 			$(VCLLIB) \
-			$(BASICLIB) \
 			$(VOSLIB) \
 			$(SALLIB) \
-			$(CPPUHELPERLIB) \
-			$(CPPULIB) \
-			$(COMPHELPERLIB) \
-            $(SOTLIB) \
             $(VOSLIB) \
             $(SIMPLECMLIB)
 
 			$(VOSLIB) \
 			$(UCBHELPERLIB) \
 			$(COMPHELPERLIB) \
-            $(SOTLIB) \
             $(BASICLIB) \
             $(SIMPLECMLIB) \
-            $(BASEGFXLIB) $(I18NISOLANGLIB) $(TKLIB) $(I18NUTILLIB) \
-            $(ICUUCLIB) $(ICULELIB) $(ICUDATALIB) $(JVMFWKLIB) $(JVMACCESSLIB) \
-            $(SALHELPERLIB) $(XMLSCRIPTLIB) \
             $(COMMUNILIB)
 
 .IF "$(GUI)"=="UNX"
 			$(TOOLSLIB) \
 			$(SVTOOLLIB) \
 			$(VCLLIB) \
-                        $(BASEGFXLIB) $(I18NISOLANGLIB) $(TKLIB) $(I18NUTILLIB) \
-                        $(ICUUCLIB) $(ICULELIB) $(ICUDATALIB) $(JVMFWKLIB) $(JVMACCESSLIB) \
-                        $(SALHELPERLIB) $(UNOTOOLSLIB) $(SVLLIB) $(BASICLIB) $(SOTLIB) \
-                        $(XMLSCRIPTLIB) \
 			$(SJLIB)
 
 .IF "$(GUI)"=="UNX"

avmedia/util/makefile.mk

 
 SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
 SHL1IMPLIB=i$(TARGET)
-SHL1STDLIBS=$(UNOTOOLSLIB) $(TOOLSLIB) $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(SVTOOLLIB) $(SVLLIB) $(SFXLIB) $(SOTLIB) $(VOSLIB)
+SHL1STDLIBS=$(UNOTOOLSLIB) $(TOOLSLIB) $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(SVTOOLLIB) $(SVLLIB) $(SFXLIB) $(VOSLIB)
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 SHL1LIBS=$(SLB)$/$(TARGET).lib
 

basic/source/comp/codegen.cxx

 	m_nCnvtdSize = static_cast<S>( aTrnsfrmer.buffer().GetSize() );
 }
 
-void NeverRunsEver()
-{
-	// force instatiation of templates... I dunno why, but I have to do
-	// this to force instatiation of the template. Otherwise using the template
-	// in another code module results in link errors :-(
-	PCodeBuffConvertor< UINT16, UINT32 > aInst1(0,0);	
-	aInst1.convert();
-	PCodeBuffConvertor< UINT32, UINT16 > aInst2(0,0);	
-	aInst2.convert();
-}
+template class PCodeBuffConvertor< UINT16, UINT32 >;
+template class PCodeBuffConvertor< UINT32, UINT16 >;

binfilter/bf_basic/util/makefile.mk

             $(CPPULIB) \
             $(CPPUHELPERLIB) \
             $(BFSVTOOLLIB) \
-            $(VOSLIB) \
             $(SALLIB) \
             $(COMPHELPERLIB) \
             $(UNOTOOLSLIB) \
             $(SOTLIB) \
-            $(VOSLIB) \
-            $(VCLLIB) \
-            $(XMLSCRIPTLIB)
+            $(VCLLIB)
 
 .IF "$(GUI)"=="WNT"
 SHL1STDLIBS+=   \

binfilter/bf_forms/util/makefile.mk

 		$(VCLLIB) \
 		$(BFSVTOOLLIB) \
 		$(BFSVXLIB) \
-		$(LEGACYSMGRLIB)	\
 		$(VOSLIB) \
 		$(UNOTOOLSLIB) \
 		$(COMPHELPERLIB) \

binfilter/bf_offmgr/util/makefile.mk

 	$(BFSVXLIB) \
 	$(LEGACYSMGRLIB)	\
 	$(BFBASICLIB) \
-	$(BFGOODIESLIB) \
-	$(VCLLIB) \
 	$(TOOLSLIB) \
-	$(UNOTOOLSLIB) \
-	$(COMPHELPERLIB) \
 	$(CPPUHELPERLIB) \
 	$(CPPULIB) \
-	$(VOSLIB) \
     $(SALLIB)
 
 .IF "$(GUI)"=="WNT"

binfilter/bf_sc/util/makefile.mk

 	$(BFSO3LIB)		\
 	$(BFSVTOOLLIB)	\
 	$(BFSVXLIB)		\
-	$(BFGOODIESLIB)	\
 	$(BFOFALIB)		\
 	$(VCLLIB)		\
 	$(CPPULIB)		\
 	$(CPPUHELPERLIB)	\
 	$(COMPHELPERLIB)	\
 	$(UCBHELPERLIB)	\
-	$(TKLIB)		\
 	$(VOSLIB)		\
 	$(SALLIB)		\
 	$(TOOLSLIB)		\
 	$(I18NISOLANGLIB)   \
 	$(UNOTOOLSLIB)  \
 	$(SOTLIB)		\
-	$(BFXMLOFFLIB)	\
-	$(DBTOOLSLIB)
-
+	$(BFXMLOFFLIB)
 
 .IF "$(OS)" == "MACOSX"
 # static libraries must come at the end of list on MacOSX

binfilter/bf_sd/util/makefile.mk

 
 # dynamic libraries
 SHL1STDLIBS+= \
-	$(BFOFALIB) \
 	$(BFSVXLIB) \
 	$(LEGACYSMGRLIB)	\
-	$(BFBASICLIB) \
-	$(BFGOODIESLIB) \
 	$(BFSO3LIB) \
 	$(BFSVTOOLLIB) \
 	$(TKLIB) \
 	$(TOOLSLIB) \
 	$(I18NISOLANGLIB) \
 	$(COMPHELPERLIB) \
-	$(UCBHELPERLIB) \
 	$(CPPUHELPERLIB) \
 	$(CPPULIB) \
-	$(VOSLIB) \
 	$(SALLIB)
 
 

binfilter/bf_svtools/util/makefile.mk

 # dynamic libraries
 SHL1STDLIBS+= \
 		$(UNOTOOLSLIB)		\
-		$(TKLIB)			\
 		$(VCLLIB)			\
 		$(SOTLIB)			\
 		$(TOOLSLIB)			\
 		$(CPPUHELPERLIB)	\
 		$(CPPULIB)			\
 		$(VOSLIB)			\
-		$(SALLIB)			\
-		$(ICUUCLIB)		\
-		$(JVMFWKLIB)
+		$(SALLIB)
 		
 .IF "$(OS)"=="MACOSX"
 # static libraries go at end

binfilter/bf_svx/util/makefile.mk

 			$(VOSLIB) \
 			$(SALLIB) \
 			$(ICUUCLIB)\
-			$(FWELIB) \
 			$(LEGACYSMGRLIB) \
-			$(SALHELPERLIB) \
 			$(XMLSCRIPTLIB) \
 			$(SYSSHELLLIB)
 

binfilter/bf_sw/util/makefile.mk

 	$(BFXMLOFFLIB) \
 	$(BFBASICLIB) \
 	$(BFGOODIESLIB) \
-	$(GOODIESLIB) \
 	$(BFSVTOOLLIB) \
 	$(BFSO3LIB) \
 	$(TKLIB) \
 	$(UCBHELPERLIB) \
 	$(CPPUHELPERLIB) \
 	$(CPPULIB) \
-	$(VOSLIB) \
 	$(SALLIB) \
     $(ICUUCLIB)
 

binfilter/filter/source/bf_migrate/makefile.mk

 SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
 SHL1STDLIBS=$(CPPULIB)			\
 			$(CPPUHELPERLIB)	\
-			$(UNOTOOLSLIB)		\
-			$(COMPHELPERLIB)	\
-			$(VOSLIB)			\
 			$(SALLIB)			\
-			$(VCLLIB)			\
-			$(BFSVTOOLLIB)			\
             $(BFSO3LIB)                       \
 			$(ONELIB)			\
 			$(TOOLSLIB)			\
-			$(SOTLIB)			\
 			$(LEGACYSMGRLIB)	\
 			$(BFSVXLIB)
 

binfilter/filter/source/bf_offwrp/makefile.mk

 
 SHL1IMPLIB= ibf_wrp
 SHL1STDLIBS=    \
-				$(FWELIB)			\
-				$(BFBASICLIB) 		\
 				$(BFSO3LIB) 			\
 				$(SJLIB) 			\
-				$(TKLIB) 			\
 				$(BFSVTOOLLIB) 		\
 				$(BFOFALIB)			\
 				$(VCLLIB) 			\
 				$(SOTLIB) 			\
 				$(SALLIB)			\
-				$(VOSLIB)			\
 				$(TOOLSLIB)			\
 				$(CPPULIB)			\
 				$(CPPUHELPERLIB)	\

chart2/source/controller/makefile.mk

 				$(SVXLIB)			\
 				$(TKLIB)			\
 				$(TOOLSLIB) 		\
-				$(I18NISOLANGLIB)   \
 				$(VCLLIB)           \
 			    $(SFXLIB)			\
 				$(UNOTOOLSLIB)		\

chart2/source/model/makefile.mk

 #Links import libraries.
 
 SHL1STDLIBS=	$(CHARTTOOLS) 		\
-                $(BASEGFXLIB) 		\
 				$(CPPULIB)			\
 				$(CPPUHELPERLIB)	\
 				$(COMPHELPERLIB)	\
 				$(SVLLIB)			\
 				$(SVTOOLLIB)		\
 				$(GOODIESLIB)		\
-				$(SOTLIB)			\
 				$(SALLIB)			\
 				$(UCBHELPERLIB)
 

chart2/source/view/makefile.mk

 				$(CPPULIB)			\
 				$(CPPUHELPERLIB)	\
 				$(COMPHELPERLIB)	\
-				$(GOODIESLIB)		\
 				$(SALLIB)			\
 				$(SVLLIB)			\
 				$(SVTOOLLIB)		\
 				$(SVXLIB)			\
-				$(TKLIB)			\
 				$(TOOLSLIB) 		\
 				$(UNOTOOLSLIB)      \
-				$(I18NISOLANGLIB)   \
 				$(BASEGFXLIB) 		\
 				$(VCLLIB)           \
 			    $(SFXLIB)			\

codemaker/source/cppumaker/makefile.mk

 APP1OBJS=   $(OBJFILES)
 
 APP1DEPN= $(OUT)$/lib$/$(CODEMAKERLIBDEPN) $(OUT)$/lib$/$(COMMONCPPLIBDEPN)
-APP1STDLIBS= $(SALLIB) $(SALHELPERLIB) $(REGLIB) $(STORELIB) $(CODEMAKERLIBST) $(COMMONCPPLIBST)
+APP1STDLIBS= $(SALLIB) $(SALHELPERLIB) $(REGLIB) $(CODEMAKERLIBST) $(COMMONCPPLIBST)
 
 .INCLUDE :  target.mk

comphelper/util/makefile.mk

 .ENDIF
 SHL1STDLIBS= \
 	$(SALLIB) \
-	$(SALHELPERLIB) \
 	$(CPPUHELPERLIB) \
 	$(CPPULIB) \
 	$(UCBHELPERLIB) \