diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-11-09 18:47:26 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-11-09 18:47:26 +0100 |
| commit | d6e8907cc4d0043504caed69ef8e8d6129f5d51e (patch) | |
| tree | 8c4f7bbe326d28edd638f5e6ee13292d0c5db693 /solenv/gbuild/ComponentTarget.mk | |
| parent | 69c004ea3a734e830a9eb0e359d84915949d792f (diff) | |
gnumake2: explicit delivering of ResTargets
Diffstat (limited to 'solenv/gbuild/ComponentTarget.mk')
| -rwxr-xr-x | solenv/gbuild/ComponentTarget.mk | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk index cdefe4fdf443..5bc85bf2e974 100755 --- a/solenv/gbuild/ComponentTarget.mk +++ b/solenv/gbuild/ComponentTarget.mk @@ -27,8 +27,8 @@ gb_ComponentTarget_REPOS := $(gb_REPOS) -gb_ComponentTarget_XLSTCOMMAND := xsltproc -gb_ComponentTarget_XLSTCOMMANDFILE := $(SOLARENV)/bin/createcomponent.xslt +gb_ComponentTarget_XSLTCOMMAND := xsltproc +gb_ComponentTarget_XSLTCOMMANDFILE := $(SOLARENV)/bin/createcomponent.xslt gb_ComponentTarget_get_source = $(1)/$(2).component # gb_ComponentTarget_PREFIXBASISNATIVE is set by the platform @@ -37,9 +37,9 @@ define gb_ComponentTarget__command $(call gb_Helper_announce,Processing $(2) ...) $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) && \ - $(gb_ComponentTarget_XLSTCOMMAND) --nonet --stringparam uri \ + $(gb_ComponentTarget_XSLTCOMMAND) --nonet --stringparam uri \ '$(gb_ComponentTarget_PREFIXBASISNATIVE)$(LIBFILENAME)' -o $(1) \ - $(gb_ComponentTarget_XLSTCOMMANDFILE) $(2)) + $(gb_ComponentTarget_XSLTCOMMANDFILE) $(2)) endef @@ -49,7 +49,7 @@ $$(call gb_ComponentTarget_get_target,%) : $$(call gb_ComponentTarget_get_source $$(call gb_ComponentTarget_get_clean_target,%) : $$(call gb_Helper_announce,Cleaning component file $$*) - rm -f $$(call gb_ComponentTarget_get_target,$$*) + rm -f $$(call gb_ComponentTarget_get_outdir_target,$$*) $$(call gb_ComponentTarget_get_target,$$*) endef @@ -58,8 +58,12 @@ $(foreach repo,$(gb_ComponentTarget_REPOS),$(eval $(call gb_ComponentTarget__rul $(call gb_ComponentTarget_get_target,%) : $(error unable to find component file $(call gb_ComponentTarget_get_source,,$*) in the repositories: $(gb_ComponentTarget_REPOS)) +$(call gb_ComponentTarget_get_external_target,%) : + $(call gb_Shadow_deliver,$@,$<) + define gb_ComponentTarget_ComponentTarget $(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(2) +$(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(1)) endef |