diff options
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | connectivity/CppunitTest_connectivity_commontools.mk | 2 | ||||
| -rwxr-xr-x | solenv/bin/install-gdb-printers | 2 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 96 |
4 files changed, 5 insertions, 107 deletions
diff --git a/configure.ac b/configure.ac index 0d492ad38dd2..d2a7aba97ed8 100644 --- a/configure.ac +++ b/configure.ac @@ -915,11 +915,10 @@ AC_ARG_ENABLE([hardlink-deliver], ) AC_ARG_ENABLE(mergelibs, - AS_HELP_STRING([--enable-mergelibs=<all/yes>], + AS_HELP_STRING([--enable-mergelibs], [Enables linking of big, merged, library. Experimental feature, tested only for Linux at some stage in history, but possibly does not work even - for Linux any more. 'all' will link a lot of libraries into libmerged - while 'yes' will do it for just a core set of libraries.]) + for Linux any more. This will link a core set of libraries into libmerged.]) ) AC_ARG_ENABLE(graphite, @@ -12735,12 +12734,7 @@ if test -n "$enable_mergelibs" -a "$enable_mergelibs" != "no"; then if test $_os != Linux -a $_os != WINNT; then add_warning "--enable-mergelibs is not tested for this platform" fi - if test "$enable_mergelibs" = "all"; then - MERGELIBS="ALL" - AC_DEFINE(STATIC_LINKING) - else - MERGELIBS="CORE" - fi + MERGELIBS="TRUE" AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk index 146c6afeeb2b..9c2e6450a2f9 100644 --- a/connectivity/CppunitTest_connectivity_commontools.mk +++ b/connectivity/CppunitTest_connectivity_commontools.mk @@ -32,7 +32,7 @@ endif # In mergedlibs mode we have multiply-defined symbols, which Visual Studio # does not like. There is no good solution, so just force it. ifeq ($(COM),MSC) -ifeq ($(MERGELIBS),CORE) +ifneq (,$(MERGELIBS)) $(eval $(call gb_CppunitTest_add_ldflags,connectivity_commontools,\ /FORCE:MULTIPLE \ )) diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers index 036339e44112..0362a5c04a06 100755 --- a/solenv/bin/install-gdb-printers +++ b/solenv/bin/install-gdb-printers @@ -123,7 +123,7 @@ if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then fi if [[ -n "${MERGELIBS}" ]]; then - make_autoload merged program libmergedlo."$DYLIB" merge svl tl basegfx `[[ ${MERGELIBS} == "ALL" ]] && echo sw` + make_autoload merged program libmergedlo."$DYLIB" merge svl tl basegfx make_autoload cppu program libuno_cppu."$DYLIB".3 make_autoload sal program libuno_sal."$DYLIB".3 make_autoload sw program libswlo."$DYLIB" diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index ed77c1f0d085..1ca047fc6f6c 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -9,101 +9,6 @@ # ifneq ($(MERGELIBS),) -# set of libraries to link even more stuff into one merged library -gb_EXTRAMERGEDLIBS := \ - $(if $(filter-out ANDROID IOS,$(OS)),abp) \ - $(if $(filter unx,$(GUIBASE)),basebmp) \ - $(call gb_Helper_optional,DBCONNECTIVITY,bib) \ - $(call gb_Helper_optional,DBCONNECTIVITY,calc) \ - chartcore \ - $(call gb_Helper_optional,DBCONNECTIVITY,dba) \ - $(call gb_Helper_optional,DBCONNECTIVITY,dbase) \ - $(call gb_Helper_optional,DBCONNECTIVITY,dbp) \ - $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \ - $(call gb_Helper_optional,DBCONNECTIVITY,dbu) \ - deploymentgui \ - $(call gb_Helper_optional,EXPORT,egi) \ - embobj \ - emboleobj \ - $(call gb_Helper_optional,EXPORT,eme) \ - $(call gb_Helper_optional,EXPORT,epb) \ - $(call gb_Helper_optional,EXPORT,epg) \ - $(call gb_Helper_optional,EXPORT,epp) \ - $(call gb_Helper_optional,EXPORT,eps) \ - $(call gb_Helper_optional,EXPORT,ept) \ - $(call gb_Helper_optional,EXPORT,era) \ - $(call gb_Helper_optional,EXPORT,eti) \ - $(call gb_Helper_optional,EXPORT,exp) \ - $(call gb_Helper_optional,DBCONNECTIVITY,file) \ - $(call gb_Helper_optional,DBCONNECTIVITY,flat) \ - flash \ - for \ - forui \ - fps_office \ - $(call gb_Helper_optional,DBCONNECTIVITY,frm) \ - fwl \ - fwm \ - graphicfilter \ - guesslang \ - $(if $(ENABLE_JAVA),hsqldb) \ - hyphen \ - icd \ - icg \ - idx \ - ime \ - ipb \ - ipd \ - ips \ - ipt \ - ipx \ - ira \ - itg \ - iti \ - $(if $(ENABLE_JAVA),jdbc) \ - $(if $(filter-out ANDROID IOS,$(OS)),ldapbe2) \ - lnth \ - $(if $(filter-out ANDROID IOS,$(OS)),log) \ - $(if $(ENABLE_LWP),lwpft) \ - $(call gb_Helper_optional,DESKTOP,migrationoo2) \ - $(call gb_Helper_optional,DESKTOP,migrationoo3) \ - $(if $(filter-out WNT,$(OS)),$(call gb_Helper_optional,DBCONNECTIVITY,mork)) \ - $(call gb_Helper_optional,DBCONNECTIVITY,mysql) \ - $(if $(filter-out ANDROID IOS,$(OS)),odbc) \ - odfflatxml \ - offacc \ - oox \ - $(call gb_Helper_optional,DBCONNECTIVITY,pcr) \ - pdffilter \ - placeware \ - res \ - $(call gb_Helper_optional,DBCONNECTIVITY,rpt) \ - $(call gb_Helper_optional,DBCONNECTIVITY,rptui) \ - $(call gb_Helper_optional,DBCONNECTIVITY,rptxml) \ - $(if $(filter-out ANDROID IOS,$(OS)),scn) \ - sd \ - $(call gb_Helper_optional,DBCONNECTIVITY,sdbc2) \ - spell \ - storagefd \ - svgfilter \ - swd \ - t602filter \ - test \ - textfd \ - $(call gb_Helper_optional,DESKTOP,unopkgapp) \ - unotest \ - $(call gb_Helper_optional,DESKTOP,updatefeed) \ - $(call gb_Helper_optional,SCRIPTING,vbahelper) \ - xmlfa \ - xmlfd \ - xmlsecurity \ - xsltfilter - -# FIXME: just retaining these for now - they currently crash & need thought. -#gb_EXTRAMERGEDLIBS := \ - comphelper \ - sc \ - sw \ - # we link all object files from these libraries into one, merged library gb_MERGEDLIBS := \ @@ -156,7 +61,6 @@ gb_MERGEDLIBS := \ xmlscript \ xo \ xstor \ - $(if $(filter ALL,$(MERGELIBS)),$(gb_EXTRAMERGEDLIBS)) endif |