Kaydet (Commit) 577c7ea3 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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.
üst c35bd5f3
...@@ -78,8 +78,8 @@ $(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_L ...@@ -78,8 +78,8 @@ $(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_L
endef endef
define gb_Library_set_componentfile define gb_Library_set_componentfile
$(call gb_ComponentTarget_ComponentTarget,$(or $(strip $(3)),$(strip $(2))),$(call gb_Library__get_componentprefix,$(1)),\ $(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))),$(2)) $(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_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))) : \
$(call gb_ComponentTarget_get_outdir_target,$(2)) $(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)))) $(call gb_Library_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(or $(strip $(3)),$(strip $(2))))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment