diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-02-08 21:57:19 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-02-08 21:57:19 +0100 |
| commit | aa11b4c86e4b41be542623b7d98a3fb8e5d30745 (patch) | |
| tree | abcd6eec1cd047ad5186c4f0ef1907bb4a50e1da /solenv | |
| parent | 23151ab53574e0e893f4507313ff15388638746a (diff) | |
Properly rebuild files generated by l10ntools programs
(Changing the corresponding build-order-only dependencies to proper ones should
be safe here, as all mentions of $^ are within $(filter) calls.)
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/AllLangResTarget.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Configuration.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Extension.mk | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 21570c7bc305..635778dbe5de 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -65,7 +65,7 @@ $(call gb_Helper_abbreviate_dirs_native,\ endef -$(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) | $(gb_SrsPartMergeTarget_TRANSEXTARGET) +$(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) $(gb_SrsPartMergeTarget_TRANSEXTARGET) $(if $(SDF),$(call gb_SrsPartMergeTarget__command,$@,$*,$<),mkdir -p $(dir $@) && cp $< $@) diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index 0674837c1311..1743be4f32fd 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -238,7 +238,7 @@ $(call gb_Helper_abbreviate_dirs_native,\ -l all) endef -$(call gb_XcuMergeTarget_get_target,%) : | $(gb_XcuMergeTarget_CFGEXTARGET) +$(call gb_XcuMergeTarget_get_target,%) : $(gb_XcuMergeTarget_CFGEXTARGET) $(if $(SDF),$(call gb_XcuMergeTarget__command,$@,$*,$(filter %.xcu,$^)),mkdir -p $(dir $@) && cp $(filter %.xcu,$^) $@) $(call gb_XcuMergeTarget_get_clean_target,%) : diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 5ee8a97450af..fc7708eea76b 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -61,8 +61,7 @@ $(call gb_Extension_get_workdir,%)/description.xml : mkdir -p $(call gb_Extension_get_workdir,$*) && \ cp -f $(LOCATION)/description.xml $@) else -$(call gb_Extension_get_workdir,%)/description.xml : | \ - $(gb_Extension_XRMEXTARGET) +$(call gb_Extension_get_workdir,%)/description.xml : $(gb_Extension_XRMEXTARGET) $(call gb_Output_announce,$*/description.xml,$(true),XRM,3) ifeq ($(OS_FOR_BUILD),WNT) $(call gb_Helper_abbreviate_dirs_native,\ @@ -168,7 +167,7 @@ endef define gb_Extension_localize_help_onelang $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_workdir,$(1))/$(2) -$(call gb_Extension_get_workdir,$(1))/$(2) : $(3) +$(call gb_Extension_get_workdir,$(1))/$(2) : $(3) gb_Extension_HELPEXTARGET $(call gb_Output_announce,$(2),$(true),XHP,3) mkdir -p $$(dir $$@) ifeq ($(OS_FOR_BUILD),WNT) |