diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-10-21 16:45:15 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-10-21 21:28:48 +0200 |
| commit | 191ae70bb04d15a3d349dfb22c3ddd098b7cc418 (patch) | |
| tree | aa889f7c36e35fa4c3f5ff0d0860d3570b31bd0b /solenv | |
| parent | ea44e5464a487519de84e30a5f299387127c78ea (diff) | |
kill multi repo support: AllLangResTarget
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/AllLangResTarget.mk | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index c7604267c9b1..3506a6334d5c 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -52,7 +52,6 @@ gb_SrsPartMergeTarget_TRANSEXTARGET := $(call gb_Executable_get_target_for_build gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_SrsPartMergeTarget_TRANSEXPRECOMMAND) $(gb_SrsPartMergeTarget_TRANSEXTARGET) gb_SrsPartMergeTarget_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/ -gb_SrsPartMergeTarget_REPOS := $(gb_REPOS) define gb_SrsPartMergeTarget__command $(call gb_Output_announce,$(3),$(true),srs,1) @@ -67,17 +66,12 @@ $(call gb_Helper_abbreviate_dirs_native,\ endef -define gb_SrsPartMergeTarget__rules -$$(call gb_SrsPartMergeTarget_get_target,%) : $(1)/% $$(gb_Helper_MISCDUMMY) | $$(gb_SrsPartMergeTarget_TRANSEXTARGET) - $$(if $$(SDF),$$(call gb_SrsPartMergeTarget__command,$$@,$$*,$$<),mkdir -p $$(dir $$@) && cp $$< $$@) +$(call gb_SrsPartMergeTarget_get_target,%) : $(SOLARSRC)/% $(gb_Helper_MISCDUMMY) | $(gb_SrsPartMergeTarget_TRANSEXTARGET) + $(if $(SDF),$(call gb_SrsPartMergeTarget__command,$@,$*,$<),mkdir -p $(dir $@) && cp $< $@) -endef - -$(foreach repo,$(gb_SrsPartMergeTarget_REPOS),$(eval $(call gb_SrsPartMergeTarget__rules,$(repo)))) # SrsPartTarget class -gb_SrsPartTarget_REPOS := $(gb_REPOS) # defined by platform # gb_SrsPartTarget_RSCTARGET # gb_SrsPartTarget_RSCCOMMAND @@ -98,23 +92,16 @@ $(call gb_Helper_abbreviate_dirs_native,\ endef -define gb_SrsPartTarget__rules -$$(call gb_SrsPartTarget_get_target,%) : $(1)/% $$(gb_Helper_MISCDUMMY) | $$(gb_SrsPartTarget_RSCTARGET) - $$(call gb_SrsPartTarget__command_dep,$$*,$$<) - $$(call gb_SrsPartTarget__command,$$@,$$*,$$<) +$(call gb_SrsPartTarget_get_target,%) : $(SOLARSRC)/% $(gb_Helper_MISCDUMMY) | $(gb_SrsPartTarget_RSCTARGET) + $(call gb_SrsPartTarget__command_dep,$*,$<) + $(call gb_SrsPartTarget__command,$@,$*,$<) ifeq ($(gb_FULLDEPS),$(true)) -$$(call gb_SrsPartTarget_get_dep_target,%) : $(1)/% $$(gb_Helper_MISCDUMMY) - $$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $$(dir $$@) && \ - echo '$$(call gb_SrsPartTarget_get_target,$$*) : $$(gb_Helper_PHONY)' > $$@) -endif - -endef - -$(foreach repo,$(gb_SrsPartTarget_REPOS),$(eval $(call gb_SrsPartTarget__rules,$(repo)))) +$(call gb_SrsPartTarget_get_dep_target,%) : $(SOLARSRC)/% $(gb_Helper_MISCDUMMY) + $(call gb_Helper_abbreviate_dirs,\ + mkdir -p $(dir $@) && \ + echo '$(call gb_SrsPartTarget_get_target,$*) : $(gb_Helper_PHONY)' > $@) -ifeq ($(gb_FULLDEPS),$(true)) $(call gb_SrsPartTarget_get_dep_target,%) : $(eval $(call gb_Output_error,Unable to find resource definition file $* in repositories: $(gb_SrsPartTarget_REPOS))) endif |