diff options
| author | David Tardon <dtardon@redhat.com> | 2014-10-24 16:06:57 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-10-24 16:09:23 +0200 |
| commit | e5eb61954d3aff3952244f76cce2c8bfc44e232a (patch) | |
| tree | e5320df3a6b94c489296b5a6de686bd9c55d90dd /solenv | |
| parent | 5aebe7b67c02051cb4fe98219cfe056efaf975a1 (diff) | |
fix rebuild of component file for CppunitTest
Change-Id: Ic0de3e77d9f5c05e41e434d7ae2215ba4460f13f
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/ComponentTarget.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk index 225b198ed444..f56a980c3fcc 100644 --- a/solenv/gbuild/ComponentTarget.mk +++ b/solenv/gbuild/ComponentTarget.mk @@ -26,13 +26,13 @@ gb_ComponentTarget_get_source = $(SRCDIR)/$(1).component # is a mapping from library filenames to direct pointers to the # corresponding PREFIX_component_getFactory functions. define gb_ComponentTarget__command -$(call gb_Output_announce,$(3),$(true),CMP,1) +$(call gb_Output_announce,$(2),$(true),CMP,1) $(if $(LIBFILENAME),,$(call gb_Output_error,No LIBFILENAME set at component target: $(1))) mkdir -p $(dir $(1)) && \ $(call gb_ExternalExecutable_get_command,xsltproc) --nonet \ --stringparam uri '$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,$(subst \d,$$,$(COMPONENTPREFIX)))$(LIBFILENAME)' \ --stringparam cppu_env $(gb_CPPU_ENV) -o $(1) \ - $(gb_ComponentTarget_XSLTCOMMANDFILE) $(2) + $(gb_ComponentTarget_XSLTCOMMANDFILE) $(COMPONENTSOURCE) endef @@ -43,16 +43,18 @@ $(call gb_ComponentTarget_get_clean_target,%) : # when a library is renamed, the component file needs to be rebuilt to match. # hence simply depend on Repository{,Fixes}.mk since the command runs quickly. -$(call gb_ComponentTarget_get_target,%) $(call gb_ComponentTarget_get_target,CppunitTest/%) : \ - $(call gb_ComponentTarget_get_source,%) \ +$(call gb_ComponentTarget_get_target,%) : \ $(SRCDIR)/Repository.mk \ $(SRCDIR)/RepositoryFixes.mk \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) - $(call gb_ComponentTarget__command,$@,$<,$*) + $(call gb_ComponentTarget__command,$@,$*) define gb_ComponentTarget_ComponentTarget $(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2) $(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3) +$(call gb_ComponentTarget_get_target,$(1)) : COMPONENTSOURCE := $(call gb_ComponentTarget_get_source,$(patsubst CppunitTest/%,%,$(1))) + +$(call gb_ComponentTarget_get_target,$(1)) : $(call gb_ComponentTarget_get_source,$(patsubst CppunitTest/%,%,$(1))) endef |