solenv/gbuild/Library.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit e4621e2dbef28b1307ec0b571c0838823a21ff62 Author: Michael Stahl <[email protected]> Date: Mon Aug 6 13:45:32 2012 +0200 gbuild: don't complain about duplicate components for libmerged It seems that it is possible to have multiple components per library nowadays, however i think it's confusing to actually do this except when necessary, i.e. when using --enable-mergelibs. Change-Id: I4d6260974f83ea8c42d02578f45c6d9aa2ace330 diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index b9ea45e..0cb0fdb 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -109,7 +109,7 @@ endef # gb_Library__get_final_target has been invented for that purpose... define gb_Library_set_componentfile $(call gb_Library_get_target,$(gb_Library__get_name)) : \ - COMPONENT := $$(if $$(COMPONENT),\ + COMPONENT := $$(if $$(and $$(COMPONENT),$(filter-out $(gb_MERGEDLIBS),$(1))),\ $$(call gb_Output_error,$(1) already has a component file $$(COMPONENT)))$(2) $(call gb_ComponentTarget_ComponentTarget,$(2),\ $(call gb_Library__get_componentprefix,$(gb_Library__get_name)),\ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
