diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-08 18:20:40 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-08 18:52:08 +0100 |
| commit | 7217ad84a3dc3984ec943409d09a35d545f93632 (patch) | |
| tree | d410e2e9739a24c364a96ceaa47f4013144c5762 /solenv | |
| parent | 967391dca2fd8f30e38598433b2d2153020988d5 (diff) | |
gbuild: HelpTarget: avoid spurious rebuilds on missing translation
... if the darn files are allowed to be missing, use wildcard to avoid
dependencies on them.
Change-Id: I36a83413f8fb65b081681a8f351ec6afcf15fe6d
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/HelpTarget.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk index d3ae728d5813..748eb88fa9d0 100644 --- a/solenv/gbuild/HelpTarget.mk +++ b/solenv/gbuild/HelpTarget.mk @@ -81,11 +81,10 @@ $(call gb_HelpTranslatePartTarget_get_clean_target,%) : # gb_HelpTranslatePartTarget_HelpTranslatePartTarget target lang dir define gb_HelpTranslatePartTarget_HelpTranslatePartTarget $(call gb_HelpTranslatePartTarget_get_target,$(1)) : HELP_LANG := $(2) -$(call gb_HelpTranslatePartTarget_get_target,$(1)) : POFILES := $(gb_POLOCATION)/$(2)/$(3).po +$(call gb_HelpTranslatePartTarget_get_target,$(1)) : POFILES := $(3) $(call gb_HelpTranslatePartTarget_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE) -$(call gb_HelpTranslatePartTarget_get_target,$(1)) : $(gb_POLOCATION)/$(2)/$(3).po -$(gb_POLOCATION)/$(2)/$(3).po : +$(call gb_HelpTranslatePartTarget_get_target,$(1)) : $(3) $(call gb_HelpTranslatePartTarget_get_target,$(1)) :| $(dir $(call gb_HelpTranslatePartTarget_get_target,$(1))).dir $(call gb_HelpTranslatePartTarget_get_target,$(1)) :| $(call gb_HelpTranslatePartTarget_get_workdir,$(1))/.dir @@ -137,9 +136,10 @@ $(call gb_HelpTranslateTarget_get_target,$(1)) :| $(dir $(call gb_HelpTranslateT endef +# use wildcard to avoid spurious rebuilds if translation is missing # gb_HelpTranslateTarget__make_part module part lang dir define gb_HelpTranslateTarget__make_part -$(call gb_HelpTranslatePartTarget_HelpTranslatePartTarget,$(2),$(3),$(patsubst %/,%,$(4))) +$(call gb_HelpTranslatePartTarget_HelpTranslatePartTarget,$(2),$(3),$(wildcard $(gb_POLOCATION)/$(3)/$(patsubst %/,%,$(4)).po)) $(call gb_HelpTranslateTarget_get_target,$(1)) : $(call gb_HelpTranslatePartTarget_get_target,$(2)) $(call gb_HelpTranslateTarget_get_clean_target,$(1)) : $(call gb_HelpTranslatePartTarget_get_clean_target,$(2)) @@ -244,13 +244,13 @@ endef define gb_HelpTreeTarget__set_pofiles $(call gb_HelpTreeTarget_get_target,$(1)) : POFILES := $(2) $(call gb_HelpTreeTarget_get_target,$(1)) : $(2) -$(2) : endef +# use wildcard to avoid spurious rebuilds if translation is missing # gb_HelpTreeTarget_set_treefile target treefile define gb_HelpTreeTarget_set_treefile -$(call gb_HelpTreeTarget__set_pofiles,$(1),$(gb_POLOCATION)/$(lastword $(subst /, ,$(1)))/$(patsubst %/,%,$(dir $(2))).po) +$(call gb_HelpTreeTarget__set_pofiles,$(1),$(wildcard $(gb_POLOCATION)/$(lastword $(subst /, ,$(1)))/$(patsubst %/,%,$(dir $(2))).po)) $(call gb_HelpTreeTarget_get_target,$(1)) : HELP_TREE := $(SRCDIR)/$(2).tree $(call gb_HelpTreeTarget_get_target,$(1)) : $(SRCDIR)/$(2).tree |