[Libreoffice-commits] core.git: solenv/gbuild

[David Tardon]

 solenv/gbuild/ComponentTarget.mk |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit e5eb61954d3aff3952244f76cce2c8bfc44e232a
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Oct 24 16:06:57 2014 +0200

    fix rebuild of component file for CppunitTest
    
    Change-Id: Ic0de3e77d9f5c05e41e434d7ae2215ba4460f13f

diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 225b198..f56a980 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