[Libreoffice-commits] .: solenv/gbuild

[Stephan Bergmann]

 solenv/gbuild/Library.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 577c7ea310fa0417d2f2ca273f5541605883d2fd
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 23 08:14:18 2011 +0100

    Clean up gb_Library_set_componentfile argument handling.
    
    It is only ever called with 2, never with 3 arguments.  And the
    gb_ComponentTarget_ComponentTarget it calls only takes 3, not 4 arguments.

diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 3e35228..7c55ec0 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -78,8 +78,8 @@ $(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_L
 endef
 
 define gb_Library_set_componentfile
-$(call gb_ComponentTarget_ComponentTarget,$(or $(strip $(3)),$(strip $(2))),$(call gb_Library__get_componentprefix,$(1)),\
-	$(call gb_Library_get_runtime_filename,$(if $(MERGELIBS),$(if $(filter $(gb_MERGED_LIBS),$(1)),merged,$(1)),$(1))),$(2))
+$(call gb_ComponentTarget_ComponentTarget,$(2),$(call gb_Library__get_componentprefix,$(1)),\
+	$(call gb_Library_get_runtime_filename,$(if $(MERGELIBS),$(if $(filter $(gb_MERGED_LIBS),$(1)),merged,$(1)),$(1))))
 $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))) : \
 	$(call gb_ComponentTarget_get_outdir_target,$(2))
 $(call gb_Library_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(or $(strip $(3)),$(strip $(2))))