pagein: learn to respect --enable-mergelibs case

Add libmerged to pagein-common and remove merged libraries from there.
Also fixes few misspelled library names.
This should make pagein usefull also for libmerged and speed up
cold start by pre-loading it.

Change-Id: I80ffb263ed5f399dc639e0d054f782ecb85001d6

desktop/Pagein_common.mk

@@ -29,6 +29,7 @@ $(eval $(call gb_Pagein_Pagein,common))
 
 # sorted in approx. reverse load order (ld.so.1)
 $(eval $(call gb_Pagein_add_objects,common,\
+    $(if $(MERGELIBS),merged) \
     i18npool \
     $(if $(findstring YES,$(SYSTEM_ICU)),,\
         icui18n \
@@ -81,11 +82,11 @@ $(eval $(call gb_Pagein_add_objects,common,\
     avmedia \
     helplinker \
     sax \
-    gconfbe \
+    gconfbe1 \
     fsstorage \
-    desktopbe \
-    localebe \
-    ucpexpand \
+    desktopbe1 \
+    localebe1 \
+    ucpexpand1 \
     sfx \
     sofficeapp \
 ))

solenv/gbuild/Pagein.mk

@@ -66,7 +66,7 @@ $(call gb_Pagein_get_outdir_target,$(1)) : $(call gb_Pagein_get_target,$(1))
 endef
 
 define gb_Pagein_add_object
-$(call gb_Pagein_get_target,$(1)) : OBJECTS += $(2)
+$(call gb_Pagein_get_target,$(1)) : OBJECTS += $(filter-out $(gb_MERGEDLIBS),$(2))
 
 endef