diff options
| -rw-r--r-- | desktop/Pagein_common.mk | 9 | ||||
| -rw-r--r-- | solenv/gbuild/Pagein.mk | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/desktop/Pagein_common.mk b/desktop/Pagein_common.mk index 9a82a1c36ac3..450db2640564 100644 --- a/desktop/Pagein_common.mk +++ b/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 \ )) diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk index 7f69ccc11673..fab6180c4fec 100644 --- a/solenv/gbuild/Pagein.mk +++ b/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 |