diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-17 18:28:26 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-17 18:28:26 +0100 |
| commit | e8af2326d3a5e193d31aaae11b6e707c2d0e2459 (patch) | |
| tree | 42d2598666741c166a580aff9b46a5247511fb58 /solenv/gbuild/ComponentTarget.mk | |
| parent | df8b5d55998d8276057fd21bd59920e9c81f3c9a (diff) | |
gnumake3: make componentfiles layer-aware (thanks sb for the initial implementation)
Diffstat (limited to 'solenv/gbuild/ComponentTarget.mk')
| -rw-r--r-- | solenv/gbuild/ComponentTarget.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk index 15d162ee29c3..4072f13ae030 100644 --- a/solenv/gbuild/ComponentTarget.mk +++ b/solenv/gbuild/ComponentTarget.mk @@ -37,14 +37,12 @@ endif gb_ComponentTarget_XSLTCOMMANDFILE := $(SOLARENV)/bin/createcomponent.xslt gb_ComponentTarget_get_source = $(1)/$(2).component -# gb_ComponentTarget_PREFIXBASISNATIVE is set by the platform - define gb_ComponentTarget__command $(call gb_Output_announce,$(3),$(true),CMP,1) $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) && \ $(gb_ComponentTarget_XSLTPROCCOMMAND) --nonet --stringparam uri \ - '$(gb_ComponentTarget_PREFIXBASISNATIVE)$(LIBFILENAME)' -o $(1) \ + '$(subst \d,$$,$(COMPONENTPREFIX))$(LIBFILENAME)' -o $(1) \ $(gb_ComponentTarget_XSLTCOMMANDFILE) $(2)) endef @@ -68,7 +66,8 @@ $(call gb_ComponentTarget_get_external_target,%) : $(call gb_Deliver_deliver,$<,$@) define gb_ComponentTarget_ComponentTarget -$(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(or $(3),$(2)) +$(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(or $(4),$(3)) +$(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2) $(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(1)) $(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1))) |