diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-05-27 15:50:15 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-10-02 22:07:18 +0200 |
| commit | 58163b4cabea155ee58e163eb64a87d98222098a (patch) | |
| tree | 52943a268502e4e04337c017295165700b39c5ec /solenv | |
| parent | 386a382e6263e573a483482a70184d61bdf6b02c (diff) | |
gbuild: kill gb_XcuLangpackTarget_get_outdir_target
Change-Id: I91444ed4fb98b094ba45bfc2a789abc83eb67212
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Configuration.mk | 23 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 1 |
2 files changed, 6 insertions, 18 deletions
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index 4b6701549288..e0652e6ea45e 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -177,8 +177,6 @@ $(call gb_XcuModuleTarget_get_clean_target,%) : gb_XcuLangpackTarget__get_name_with_lang = $(basename $(1))-$(2)$(suffix $(1)) -gb_XcuLangpackTarget__get_outdir_target_with_lang = \ - $(call gb_XcuLangpackTarget_get_outdir_target,$(call gb_XcuLangpackTarget__get_name_with_lang,$(1),$(2))) gb_XcuLangpackTarget__get_target_with_lang = \ $(call gb_XcuLangpackTarget_get_target,$(call gb_XcuLangpackTarget__get_name_with_lang,$(1),$(2))) @@ -200,8 +198,7 @@ $(call gb_XcuLangpackTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),XCL,1) $(call gb_Helper_abbreviate_dirs,\ rm -f $(foreach lang,$(gb_Configuration_LANGS),\ - $(call gb_XcuLangpackTarget__get_target_with_lang,$*,$(lang)) \ - $(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(XCUFILE),$(lang)))) + $(call gb_XcuLangpackTarget__get_target_with_lang,$*,$(lang)))) # XcuMergeTarget class @@ -412,21 +409,11 @@ endef define gb_Configuration__add_langpack $(if $(gb_Configuration_NODELIVER_$(1)),\ $(error TODO not needed yet: cannot add langpack if nodeliver)) -$(call gb_Configuration_get_clean_target,$(1)) : \ - $(call gb_XcuLangpackTarget_get_clean_target,$(2)/$(3)) $(call gb_Configuration_get_target,$(1)) : \ - $(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(3),$(4)) -$(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4)) : \ + $(call gb_XcuLangpackTarget__get_target_with_lang,$(3),$(4)) +$(call gb_XcuLangpackTarget__get_target_with_lang,$(3),$(4)) : \ $(SRCDIR)/$(2)/$(3).tmpl -$(call gb_XcuLangpackTarget_get_clean_target,$(2)/$(3)) : XCUFILE := $(3) -$(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4)) : LANG := $(4) -$(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(3),$(4)) : \ - $(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4)) \ - | $(dir $(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(3),$(4))).dir -$(call gb_Deliver_add_deliverable,\ - $(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(3),$(4)),\ - $(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4)),\ - $(call gb_XcuLangpackTarget__get_name_with_lang,$(2)/$(3),$(4))) +$(call gb_XcuLangpackTarget__get_target_with_lang,$(3),$(4)) : LANG := $(4) endef @@ -434,6 +421,8 @@ endef define gb_Configuration_add_spool_langpack $(foreach lang,$(gb_Configuration_LANGS),$(eval \ $(call gb_Configuration__add_langpack,$(1),$(2),$(strip $(3)),$(lang)))) +$(call gb_Configuration_get_clean_target,$(1)) : \ + $(call gb_XcuLangpackTarget_get_clean_target,$(strip $(3))) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 2ac7cde6ce4e..741706b21b34 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -42,7 +42,6 @@ gb_Configuration_registry = $(OUTDIR)/xml/registry gb_XcsTarget_get_outdir_target = \ $(gb_Configuration_registry)/schema$(if $(1),/)$(1) gb_XcuDataTarget_get_outdir_target = $(gb_Configuration_registry)/data/$(1) -gb_XcuLangpackTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1) gb_XcuModuleTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1) gb_Executable_get_target = $(gb_Executable__get_linktarget_target) |