diff options
| author | David Tardon <dtardon@redhat.com> | 2012-04-09 07:29:56 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-04-09 10:09:22 +0200 |
| commit | d445802b08e25ad14a11be5939566d5645b2ea51 (patch) | |
| tree | 7fe2e9ea0e51d5a9bdf00a6187087cf271f9b696 /solenv | |
| parent | a2a982508f3424c552fe63433bc39ffda0d63604 (diff) | |
add gb_SrsTarget_use_packages
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/AllLangResTarget.mk | 15 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 10eebdd47920..9e5a6ab817d5 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -232,6 +232,10 @@ $(call gb_Helper_abbreviate_dirs,\ endef endif +$(call gb_SrsTarget_get_external_headers_target,%) : + $(call gb_Helper_abbreviate_dirs,\ + mkdir -p $(dir $@) && touch $@) + $(call gb_SrsTarget_get_target,%) : $(call gb_SrsTarget__command_dep,$(call gb_SrsTarget_get_dep_target,$*),$*,$(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_dep_target,$(part)))) $(call gb_Output_announce,$*,$(true),SRS,1) @@ -284,6 +288,7 @@ $(call gb_SrsTarget_get_dep_target,$(1)) : $(call gb_SrsPartTarget_get_dep_targe endif $(call gb_SrsPartTarget_SrsPartTarget,$(2)) $(call gb_SrsTarget_get_target,$(1)) : $(call gb_SrsPartTarget_get_target,$(2)) +$(call gb_SrsPartTarget_get_target,$(2)) :| $(call gb_SrsTarget_get_external_headers_target,$(1)) $(call gb_SrsPartTarget_get_target,$(2)) :| $(call gb_SrsTemplateTarget_get_target,$(1)) $(call gb_SrsTarget_get_clean_target,$(1)) : PARTS += $(2) $(call gb_SrsTarget_get_target,$(1)) : PARTS += $(2) @@ -305,6 +310,16 @@ $(foreach template,$(2),$(call gb_SrsTarget_add_template,$(1),$(template))) endef +define gb_SrsTarget_use_package +$(call gb_SrsTarget_get_external_headers_target,$(1)) : $(call gb_Package_get_target,$(2)) + +endef + +define gb_SrsTarget_use_packages +$(foreach package,$(2),$(call gb_SrsTarget_use_package,$(1),$(package))) + +endef + # ResTarget diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 27d19988e209..51cf2a5ab2ac 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -122,6 +122,7 @@ gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res gb_SdiTarget_get_target = $(WORKDIR)/SdiTarget/$(1) gb_SrsPartMergeTarget_get_target = $(WORKDIR)/SrsPartMergeTarget/$(1) gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1) +gb_SrsTarget_get_external_headers_target = $(WORKDIR)/ExternalHeaders/SrsTarget/$(1) gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs gb_SrsTemplatePartTarget_get_target = $(WORKDIR)/inc/$(firstword $(subst /, ,$(1)))/$(subst _tmpl,,$(notdir $(1))) gb_SrsTemplateTarget_get_target = $(WORKDIR)/SrsTemplateTarget/$(1) |