Library_merged.mk | 56 +++++++++---------- RepositoryModule_host.mk | 4 - connectivity/Module_connectivity.mk | 4 - i18npool/CustomTarget_localedata.mk | 2 reportdesign/Module_reportdesign.mk | 4 - sc/source/ui/attrdlg/scuiexp.cxx | 2 sd/source/ui/dlg/sduiexp.cxx | 2 solenv/gbuild/Library.mk | 3 + solenv/gbuild/LinkTarget.mk | 3 + solenv/gbuild/extensions/pre_MergedLibsList.mk | 73 +++++++++++++++++-------- sw/source/ui/dialog/swdialmgr.cxx | 2 sw/source/ui/dialog/swuiexp.cxx | 2 tools/README | 6 +- 13 files changed, 94 insertions(+), 69 deletions(-)
New commits: commit a93f651c345d3646c8720ac5b03346812f91aa9e Author: Peter Foley <pefol...@verizon.net> Date: Wed Mar 27 21:47:41 2013 -0400 add tl dependent libs to Library_merged Change-Id: Idd99db9c6afce3b7713f6262927a0972d16ae418 diff --git a/Library_merged.mk b/Library_merged.mk index 7122e4f..d712028 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -49,10 +49,13 @@ $(eval $(call gb_Library_use_static_libraries,merged,\ endif $(eval $(call gb_Library_use_externals,merged,\ + boostdatetime \ $(if $(filter-out IOS,$(OS)),cdr) \ $(call gb_Helper_optional,DESKTOP,clucene) \ + cmis \ cppunit \ cups \ + curl \ expat_utf8 \ hunspell \ hyphen \ @@ -63,6 +66,7 @@ $(eval $(call gb_Library_use_externals,merged,\ lcms2 \ libxml2 \ $(call gb_Helper_optional,DESKTOP,libxslt) \ + $(if $(filter-out IOS,$(OS)),lpsolve) \ $(if $(filter-out IOS,$(OS)),mspub) \ $(if $(filter-out IOS,$(OS)),mwaw) \ mythes \ diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index d515208..a8acf37 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -97,15 +97,18 @@ gb_MERGEDLIBS := \ sax \ sb \ sc \ + $(if $(DISABLE_SCRIPTING),,scriptframe) \ scui \ scfilt \ sd \ sdui \ sfx \ sofficeapp \ + $(if $(filter-out IOS,$(OS)),solver) \ sot \ spell \ spl \ + $(if $(DISABLE_SCRIPTING),,stringresource) \ subsequenttest \ svl \ svt \ @@ -115,9 +118,11 @@ gb_MERGEDLIBS := \ swui \ swd \ test \ + textfd \ tk \ $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) \ ucb1 \ + ucpcmis1 \ ucpfile1 \ unotest \ utl \ @@ -128,6 +133,8 @@ gb_MERGEDLIBS := \ $(if $(filter-out IOS,$(OS)),wpftdraw) \ $(if $(filter-out IOS,$(OS)),wpftwriter) \ writerfilter \ + xmlfa \ + xmlfd \ xmlscript \ xmlsecurity \ xo \ commit d5b337980d2f2d687e926f1a9055c6c18d634ad8 Author: Peter Foley <pefol...@verizon.net> Date: Wed Mar 27 16:01:58 2013 -0400 fix typos in README Change-Id: Ibc7134837e61c8af090751429d6e9d9fa3639c8c diff --git a/tools/README b/tools/README index c5ed912..16b6dba 100644 --- a/tools/README +++ b/tools/README @@ -1,7 +1,7 @@ -Predates sal - string etc . functions, url manip, stream stuff, +Predates sal - string functions, url manipulation, stream stuff, polygons, etc. -Exakt history ist lost before Sept. 18th, 2000, but old source code -comments show that part of the tools library date back until at least +Exact history is lost before Sept. 18th, 2000, but old source code +comments show that part of the tools library dates back until at least April 1991. commit b49c71ff2968e29706480a030f1a57c05a948be9 Author: Peter Foley <pefol...@verizon.net> Date: Wed Mar 27 14:58:23 2013 -0400 add pyuno and pythonloader to Library_merged Change-Id: Ib2bde93f7f99873c4c2f4d3857bb1ed5e3e7fd8a diff --git a/Library_merged.mk b/Library_merged.mk index 7efcf9e..7122e4f 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -69,6 +69,7 @@ $(eval $(call gb_Library_use_externals,merged,\ nss3 \ openssl \ orcus \ + $(call gb_Helper_optional,PYUNO,python) \ $(if $(filter-out IOS,$(OS)),wpd) \ $(if $(filter-out IOS,$(OS)),wpg) \ $(if $(filter-out IOS,$(OS)),wps) \ diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 172ca7a..d515208 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -89,6 +89,8 @@ gb_MERGEDLIBS := \ oox \ package2 \ pricing \ + $(call gb_Helper_optional,PYUNO,pythonloader) \ + $(call gb_Helper_optional,PYUNO,pyuno) \ $(call gb_Helper_optional,DBCONNECTIVITY,rpt) \ $(call gb_Helper_optional,DBCONNECTIVITY,rptui) \ $(call gb_Helper_optional,DBCONNECTIVITY,rptxml) \ commit b270066390132819b749d704ced9db69268ee120 Author: Peter Foley <pefol...@verizon.net> Date: Wed Mar 27 14:49:38 2013 -0400 add javaloader, java_uno, juh, and jvmaccess to Library_merged Change-Id: I9841860d7c7d34310b99ee339d7835e909702d4f diff --git a/Library_merged.mk b/Library_merged.mk index 651f608..7efcf9e 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -87,12 +87,6 @@ $(eval $(call gb_Library_use_externals,merged,\ )) endif -ifneq ($(OS),IOS) -$(eval $(call gb_Library_use_libraries,merged,\ - jvmaccess \ -)) -endif - ifeq ($(GUIBASE),unx) $(eval $(call gb_Library_use_externals,merged,\ fontconfig \ diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 81a85a2..172ca7a 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -70,7 +70,11 @@ gb_MERGEDLIBS := \ hyphen \ i18npool \ i18nutil \ + $(if $(filter TRUE,$(SOLAR_JAVA)),javaloader) \ $(if $(filter TRUE,$(SOLAR_JAVA)),javavm) \ + $(if $(filter TRUE,$(SOLAR_JAVA)),java_uno) \ + $(if $(filter TRUE,$(SOLAR_JAVA)),juh) \ + $(if $(filter-out IOS,$(OS)),jvmaccess) \ jvmfwk \ lng \ lnth \ commit c74f2edfce221960fe546e88f2b3222d69d53598 Author: Peter Foley <pefol...@verizon.net> Date: Wed Mar 27 14:24:21 2013 -0400 add lingucomponent libs to Library_merged Change-Id: Ib34f589b377991b9e2d043d43ecf0360031ddae3 diff --git a/Library_merged.mk b/Library_merged.mk index db8991d..651f608 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -49,10 +49,13 @@ $(eval $(call gb_Library_use_static_libraries,merged,\ endif $(eval $(call gb_Library_use_externals,merged,\ + $(if $(filter-out IOS,$(OS)),cdr) \ $(call gb_Helper_optional,DESKTOP,clucene) \ cppunit \ cups \ - $(call gb_Helper_optional,DESKTOP,expat_utf8) \ + expat_utf8 \ + hunspell \ + hyphen \ icui18n \ icule \ icuuc \ @@ -60,33 +63,23 @@ $(eval $(call gb_Library_use_externals,merged,\ lcms2 \ libxml2 \ $(call gb_Helper_optional,DESKTOP,libxslt) \ + $(if $(filter-out IOS,$(OS)),mspub) \ + $(if $(filter-out IOS,$(OS)),mwaw) \ + mythes \ nss3 \ openssl \ orcus \ - $(if $(filter-out IOS,$(OS)),\ - cdr \ - wpd \ - wpg \ - wps \ - mwaw \ - mspub \ - visio) \ + $(if $(filter-out IOS,$(OS)),wpd) \ + $(if $(filter-out IOS,$(OS)),wpg) \ + $(if $(filter-out IOS,$(OS)),wps) \ + $(if $(filter-out IOS,$(OS)),visio) \ zlib \ )) -# This would be needed on all platforms but only on android we merge libraries from lingucomponent -ifeq ($(OS),ANDROID) -$(eval $(call gb_Library_use_externals,merged,\ - hunspell \ - expat_utf8 \ - mythes \ - hyphen \ -)) $(eval $(call gb_Library_use_static_libraries,merged,\ sax_shared \ ulingu \ )) -endif ifeq ($(ENABLE_GRAPHITE),TRUE) $(eval $(call gb_Library_use_externals,merged,\ @@ -167,10 +160,6 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,merged,\ endif ifeq ($(OS),ANDROID) -$(eval $(call gb_Library_use_static_libraries,merged,\ - basebmp \ -)) - $(eval $(call gb_Library_use_libraries,merged,\ libotouch \ )) diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index f9aa251..81a85a2 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -29,6 +29,7 @@ ifeq ($(MERGELIBS),TRUE) # we link all object files from these libraries into one, merged library gb_MERGEDLIBS := \ + analysis \ avmedia \ $(if $(filter unx,$(GUIBASE)),basebmp) \ $(call gb_Helper_optional,DBCONNECTIVITY,calc) \ @@ -36,7 +37,9 @@ gb_MERGEDLIBS := \ chartcore \ configmgr \ cppcanvas \ + ctl \ cui \ + date \ $(call gb_Helper_optional,DBCONNECTIVITY,dba) \ $(call gb_Helper_optional,DBCONNECTIVITY,dbase) \ $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \ @@ -46,7 +49,11 @@ gb_MERGEDLIBS := \ desktopbe1 \ drawinglayer \ editeng \ + embobj \ + evtatt \ + fastsax \ $(call gb_Helper_optional,DBCONNECTIVITY,file) \ + fileacc \ filterconfig \ $(call gb_Helper_optional,DBCONNECTIVITY,flat) \ for \ @@ -57,12 +64,16 @@ gb_MERGEDLIBS := \ fwi \ fwk \ fwl \ + fwm \ $(call gb_Helper_optional,DESKTOP,helplinker) \ + hwp \ + hyphen \ i18npool \ i18nutil \ $(if $(filter TRUE,$(SOLAR_JAVA)),javavm) \ jvmfwk \ lng \ + lnth \ localebe1 \ localedata_en \ localedata_es \ @@ -73,6 +84,7 @@ gb_MERGEDLIBS := \ $(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \ oox \ package2 \ + pricing \ $(call gb_Helper_optional,DBCONNECTIVITY,rpt) \ $(call gb_Helper_optional,DBCONNECTIVITY,rptui) \ $(call gb_Helper_optional,DBCONNECTIVITY,rptxml) \ @@ -86,6 +98,7 @@ gb_MERGEDLIBS := \ sfx \ sofficeapp \ sot \ + spell \ spl \ subsequenttest \ svl \ @@ -111,29 +124,8 @@ gb_MERGEDLIBS := \ writerfilter \ xmlscript \ xmlsecurity \ - xo - -ifeq ($(OS),ANDROID) -gb_MERGEDLIBS += \ - analysis \ - ctl \ - date \ - embobj \ - evtatt \ - fastsax \ - fileacc \ - for \ - forui \ - fwl \ - fwm \ - hwp \ - hyphen \ - lnth \ - pricing \ - spell \ - xstor \ - -endif + xo \ + xstor endif commit 77169b9ceccfedeadef272f701425430cf1c719d Author: Peter Foley <pefol...@verizon.net> Date: Wed Mar 27 14:10:57 2013 -0400 add javavm and jvmfwk to Library_merged Change-Id: Ia59027e4eb9909b6afeab6dc6c7f76a6b60cd1c6 diff --git a/Library_merged.mk b/Library_merged.mk index 45119e9..db8991d 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_libraries,merged,\ cppu \ cppuhelper \ i18nisolang1 \ - jvmfwk \ sal \ salhelper \ tl \ diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 116d5c4..b5a9b4f 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -123,8 +123,11 @@ $(call gb_ComponentTarget_ComponentTarget,$(2),\ $(call gb_Library_get_runtime_filename,$(gb_Library__get_name))) $(call gb_Library__get_final_target,$(gb_Library__get_name)) : \ $(call gb_ComponentTarget_get_outdir_target,$(2)) +# prevent circular deps: Library_merged -> localedata -> saxparser -> services.rdb -> javavm.component +ifneq ($(gb_Library__get_name),merged) $(call gb_ComponentTarget_get_target,$(2)) :| \ $(call gb_Library_get_target,$(gb_Library__get_name)) +endif $(call gb_Library_get_clean_target,$(gb_Library__get_name)) : \ $(call gb_ComponentTarget_get_clean_target,$(2)) endef diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 3efa625..f9aa251 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -60,6 +60,8 @@ gb_MERGEDLIBS := \ $(call gb_Helper_optional,DESKTOP,helplinker) \ i18npool \ i18nutil \ + $(if $(filter TRUE,$(SOLAR_JAVA)),javavm) \ + jvmfwk \ lng \ localebe1 \ localedata_en \ commit 679ab714380c4e4508f123a6c6f6691289c9a653 Author: Peter Foley <pefol...@verizon.net> Date: Wed Mar 27 14:00:39 2013 -0400 add helplinker to Library_merged Change-Id: I33073859403edf11576fd88db6a68279f9055139 diff --git a/Library_merged.mk b/Library_merged.mk index e523814..45119e9 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -50,14 +50,17 @@ $(eval $(call gb_Library_use_static_libraries,merged,\ endif $(eval $(call gb_Library_use_externals,merged,\ + $(call gb_Helper_optional,DESKTOP,clucene) \ cppunit \ cups \ + $(call gb_Helper_optional,DESKTOP,expat_utf8) \ icui18n \ icule \ icuuc \ jpeg \ lcms2 \ libxml2 \ + $(call gb_Helper_optional,DESKTOP,libxslt) \ nss3 \ openssl \ orcus \ diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index b419e13..3efa625 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -57,6 +57,7 @@ gb_MERGEDLIBS := \ fwi \ fwk \ fwl \ + $(call gb_Helper_optional,DESKTOP,helplinker) \ i18npool \ i18nutil \ lng \ commit 470c5fefa5ea60183f3c8056da27dbde1e2c0078 Author: Peter Foley <pefol...@verizon.net> Date: Tue Mar 26 21:58:39 2013 -0400 add basebmp and unotest to Library_merged Change-Id: I13dadec895bc67a903956c6a4e6bdbfa9a1b8d84 diff --git a/Library_merged.mk b/Library_merged.mk index c4b14a0..e523814 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -29,7 +29,6 @@ $(eval $(call gb_Library_use_library_objects,merged,\ )) $(eval $(call gb_Library_use_libraries,merged,\ - $(if $(filter unx,$(GUIBASE)),basebmp) \ basegfx \ comphelper \ cppu \ @@ -40,7 +39,6 @@ $(eval $(call gb_Library_use_libraries,merged,\ salhelper \ tl \ ucbhelper \ - unotest \ xmlreader \ $(gb_UWINAPI) \ )) @@ -105,17 +103,6 @@ $(eval $(call gb_Library_use_externals,merged,\ fontconfig \ freetype \ )) -endif - -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_libs,merged,\ - -lm \ - -ldl \ - -lpthread \ -)) -endif - -ifeq ($(GUIBASE),unx) $(eval $(call gb_Library_add_libs,merged,\ -lX11 \ -lXext \ @@ -127,6 +114,14 @@ $(eval $(call gb_Library_use_static_libraries,merged,\ )) endif +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_libs,merged,\ + -lm \ + -ldl \ + -lpthread \ +)) +endif + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,merged,\ advapi32 \ diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 344655b..b419e13 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -30,6 +30,7 @@ ifeq ($(MERGELIBS),TRUE) # we link all object files from these libraries into one, merged library gb_MERGEDLIBS := \ avmedia \ + $(if $(filter unx,$(GUIBASE)),basebmp) \ $(call gb_Helper_optional,DBCONNECTIVITY,calc) \ canvastools \ chartcore \ @@ -96,6 +97,7 @@ gb_MERGEDLIBS := \ $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) \ ucb1 \ ucpfile1 \ + unotest \ utl \ uui \ $(if $(DISABLE_SCRIPTING),,vbahelper) \ commit 1081150d3575b2da393862214b71dbf30cc489a3 Author: Peter Foley <pefol...@verizon.net> Date: Tue Mar 26 21:44:21 2013 -0400 add rpt, rptui, and rptxml to Library_merged Change-Id: I8c20d81043602229a3fd936af6e7cdc337c40951 diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index c77357c..1d20b5f 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -162,7 +162,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ registry \ remotebridges \ reportbuilder \ - reportdesign \ + $(call gb_Helper_optional,DBCONNECTIVITY,reportdesign) \ $(call gb_Helper_optional,RHINO,rhino) \ ridljar \ rsc \ diff --git a/reportdesign/Module_reportdesign.mk b/reportdesign/Module_reportdesign.mk index 854a822..e72e430 100644 --- a/reportdesign/Module_reportdesign.mk +++ b/reportdesign/Module_reportdesign.mk @@ -27,8 +27,6 @@ $(eval $(call gb_Module_Module,reportdesign)) -ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) - $(eval $(call gb_Module_add_targets,reportdesign,\ AllLangResTarget_rpt \ AllLangResTarget_rptui \ @@ -44,6 +42,4 @@ $(eval $(call gb_Module_add_targets,reportdesign,\ JunitTest_reportdesign_complex \ )) -endif - # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index d036fb0..344655b 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -69,6 +69,9 @@ gb_MERGEDLIBS := \ $(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \ oox \ package2 \ + $(call gb_Helper_optional,DBCONNECTIVITY,rpt) \ + $(call gb_Helper_optional,DBCONNECTIVITY,rptui) \ + $(call gb_Helper_optional,DBCONNECTIVITY,rptxml) \ sax \ sb \ sc \ commit 1b55d8f34be39ba53f4bf80ebf3ec8d13f46410b Author: Peter Foley <pefol...@verizon.net> Date: Tue Mar 26 21:26:03 2013 -0400 add odbc and odbcbase to Library_merged Change-Id: I9f00d1bcd3b2d285c21eb9f7a4338a1b97d1eca0 diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index c416e6c..d036fb0 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -65,6 +65,8 @@ gb_MERGEDLIBS := \ localedata_euro \ localedata_others \ msfilter \ + $(if $(filter-out ANDROID IOS,$(OS)),odbc) \ + $(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \ oox \ package2 \ sax \ commit 6c8c54ee90a2a8d3a8d35b7e89fb39770500936f Author: Peter Foley <pefol...@verizon.net> Date: Tue Mar 26 21:19:56 2013 -0400 add fwl, scui, sdui, swui to Library_merged Change-Id: I2aaa67fef4350d60497b891bc93b43a698c12660 diff --git a/sc/source/ui/attrdlg/scuiexp.cxx b/sc/source/ui/attrdlg/scuiexp.cxx index 77e5b2e..9337434 100644 --- a/sc/source/ui/attrdlg/scuiexp.cxx +++ b/sc/source/ui/attrdlg/scuiexp.cxx @@ -36,7 +36,7 @@ namespace scui } } -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined (LIBO_MERGELIBS) #define CreateDialogFactory ScCreateDialogFactory #endif diff --git a/sd/source/ui/dlg/sduiexp.cxx b/sd/source/ui/dlg/sduiexp.cxx index d1a64e5..f3d935e 100644 --- a/sd/source/ui/dlg/sduiexp.cxx +++ b/sd/source/ui/dlg/sduiexp.cxx @@ -20,7 +20,7 @@ #include "sddlgfact.hxx" #include "sal/types.h" -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined (LIBO_MERGELIBS) #define CreateDialogFactory SdCreateDialogFactory #endif diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index a9f2365..c416e6c 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -55,6 +55,7 @@ gb_MERGEDLIBS := \ fwe \ fwi \ fwk \ + fwl \ i18npool \ i18nutil \ lng \ @@ -69,8 +70,10 @@ gb_MERGEDLIBS := \ sax \ sb \ sc \ + scui \ scfilt \ sd \ + sdui \ sfx \ sofficeapp \ sot \ @@ -81,6 +84,7 @@ gb_MERGEDLIBS := \ svx \ svxcore \ sw \ + swui \ swd \ test \ tk \ diff --git a/sw/source/ui/dialog/swdialmgr.cxx b/sw/source/ui/dialog/swdialmgr.cxx index fe14678..5775ed7 100644 --- a/sw/source/ui/dialog/swdialmgr.cxx +++ b/sw/source/ui/dialog/swdialmgr.cxx @@ -21,7 +21,7 @@ #include "tools/string.hxx" #include <sfx2/app.hxx> -#ifndef DISABLE_DYNLOADING +#if !defined(DISABLE_DYNLOADING) && !defined (LIBO_MERGELIBS) //copy from core\bastyp\swtypes.cxx String aEmptyStr; // constant strings diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx index 7b92e892..ee6231b 100644 --- a/sw/source/ui/dialog/swuiexp.cxx +++ b/sw/source/ui/dialog/swuiexp.cxx @@ -33,7 +33,7 @@ namespace swui } } -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined (LIBO_MERGELIBS) #define CreateDialogFactory SwCreateDialogFactory #endif commit 8042b521fd5cf71a46256599c84f766c6ae6c621 Author: Peter Foley <pefol...@verizon.net> Date: Tue Mar 26 20:53:13 2013 -0400 add calc, dbase, file, and flat to Library_merged Change-Id: Ib6b03cda815ba0450930cec970bfe7eb4d98ac44 diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index a2be8b8..c77357c 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -51,7 +51,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ $(call gb_Helper_optional,DESKTOP,codemaker) \ comphelper \ configmgr \ - connectivity \ + $(call gb_Helper_optional,DBCONNECTIVITY,connectivity) \ cosv \ cppcanvas \ cppu \ diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index bef94383..4ca6a6f 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -27,8 +27,6 @@ $(eval $(call gb_Module_Module,connectivity)) -ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) - $(eval $(call gb_Module_add_targets,connectivity,\ AllLangResTarget_cnr \ AllLangResTarget_sdbcl \ @@ -165,6 +163,4 @@ $(eval $(call gb_Module_add_check_targets,connectivity,\ CppunitTest_connectivity_commontools \ )) -endif - # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 60f71d7..a9f2365 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -30,12 +30,14 @@ ifeq ($(MERGELIBS),TRUE) # we link all object files from these libraries into one, merged library gb_MERGEDLIBS := \ avmedia \ + $(call gb_Helper_optional,DBCONNECTIVITY,calc) \ canvastools \ chartcore \ configmgr \ cppcanvas \ cui \ $(call gb_Helper_optional,DBCONNECTIVITY,dba) \ + $(call gb_Helper_optional,DBCONNECTIVITY,dbase) \ $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \ $(call gb_Helper_optional,DBCONNECTIVITY,dbu) \ deploymentmisc \ @@ -43,7 +45,9 @@ gb_MERGEDLIBS := \ desktopbe1 \ drawinglayer \ editeng \ + $(call gb_Helper_optional,DBCONNECTIVITY,file) \ filterconfig \ + $(call gb_Helper_optional,DBCONNECTIVITY,flat) \ for \ forui \ $(call gb_Helper_optional,DBCONNECTIVITY,frm) \ commit 3c8f17930eeacb7250ecfc01cbf557e50234e307 Author: Peter Foley <pefol...@verizon.net> Date: Tue Mar 26 20:42:09 2013 -0400 add desktop_detector, subsequenttest, test, and vclplug_svp to Library_merged Change-Id: Ic2201436d1e4fe01670e2086e7dd1c6c525c9e91 diff --git a/Library_merged.mk b/Library_merged.mk index 2a07894..c4b14a0 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_use_library_objects,merged,\ )) $(eval $(call gb_Library_use_libraries,merged,\ + $(if $(filter unx,$(GUIBASE)),basebmp) \ basegfx \ comphelper \ cppu \ @@ -39,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,merged,\ salhelper \ tl \ ucbhelper \ + unotest \ xmlreader \ $(gb_UWINAPI) \ )) @@ -50,6 +52,7 @@ $(eval $(call gb_Library_use_static_libraries,merged,\ endif $(eval $(call gb_Library_use_externals,merged,\ + cppunit \ cups \ icui18n \ icule \ @@ -112,6 +115,18 @@ $(eval $(call gb_Library_add_libs,merged,\ )) endif +ifeq ($(GUIBASE),unx) +$(eval $(call gb_Library_add_libs,merged,\ + -lX11 \ + -lXext \ + -lSM \ + -lICE \ +)) +$(eval $(call gb_Library_use_static_libraries,merged,\ + headless \ +)) +endif + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,merged,\ advapi32 \ diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 2217014..60f71d7 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -39,6 +39,7 @@ gb_MERGEDLIBS := \ $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \ $(call gb_Helper_optional,DBCONNECTIVITY,dbu) \ deploymentmisc \ + $(if $(filter unx,$(GUIBASE)),desktop_detector) \ desktopbe1 \ drawinglayer \ editeng \ @@ -70,12 +71,14 @@ gb_MERGEDLIBS := \ sofficeapp \ sot \ spl \ + subsequenttest \ svl \ svt \ svx \ svxcore \ sw \ swd \ + test \ tk \ $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) \ ucb1 \ @@ -84,6 +87,7 @@ gb_MERGEDLIBS := \ uui \ $(if $(DISABLE_SCRIPTING),,vbahelper) \ vcl \ + $(if $(filter unx,$(GUIBASE)),vclplug_svp) \ $(if $(filter-out IOS,$(OS)),wpftdraw) \ $(if $(filter-out IOS,$(OS)),wpftwriter) \ writerfilter \ commit 49d8bc1dcce4c662d85d894567501205f94f678d Author: Peter Foley <pefol...@verizon.net> Date: Tue Mar 26 20:41:06 2013 -0400 make saxparser deps order-only Change-Id: Ib45f9fb5b5b1b77dd209545a45ae5da6a381e100 diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk index 8284126..ceee958 100644 --- a/i18npool/CustomTarget_localedata.mk +++ b/i18npool/CustomTarget_localedata.mk @@ -39,7 +39,7 @@ define i18npool_LD_RULE $(i18npool_LDDIR)/localedata_$(1).cxx : \ $(SRCDIR)/i18npool/source/localedata/data/$(1).xml \ $(i18npool_LDDIR)/saxparser.rdb \ - $(call gb_Executable_get_runtime_dependencies,saxparser) + | $(call gb_Executable_get_runtime_dependencies,saxparser) $$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),$(true),SAX,1) $$(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_execute,saxparser) $(1) $$< $$@.tmp \ commit 2cd5d5b12dab9042f78db74909bce9255fd93e31 Author: Peter Foley <pefol...@verizon.net> Date: Tue Mar 26 16:22:38 2013 -0400 collapse merged libs in module-deps.pl Change-Id: Id22ff49b1c1910e608c1968eee7bf9be97d46750 diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 52d2684..cd3f39b 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -832,8 +832,11 @@ gb_LINKED_LIBS := $(if $(filter $(gb_MERGEDLIBS),$(2)), \ # used by bin/module-deps.pl ifneq ($(ENABLE_PRINT_DEPS),) +# exclude libraries in Library_merged +ifeq ($(filter $(1),$(foreach lib,$(gb_MERGEDLIBS),$(call gb_Library_get_linktargetname,$(lib)))),) $$(eval $$(call gb_PrintDeps_info,$(1),$$(gb_LINKED_LIBS),$(3),$(4))) endif +endif $(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS += $$(gb_LINKED_LIBS) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits