2 files changed, 1 insertions, 97 deletions
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