diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-09 19:27:37 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-09 19:29:13 +0200 |
| commit | 0586be91e6f5099b46025b0d2e645669d2271c77 (patch) | |
| tree | 24e9f2b67d0e4d471f92a7dab996eb7c93352789 /solenv | |
| parent | 203cb5d967816d0a626a56556de67e2bef049121 (diff) | |
move dep on solenv_inc to platform
Change-Id: I86db3c7290e22491f41d198dfb53e01f6bbdc50c
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/WinResTarget.mk | 7 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_GCC.mk | 2 | ||||
| -rwxr-xr-x | solenv/gbuild/platform/com_MSC_class.mk | 5 |
3 files changed, 13 insertions, 1 deletions
diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk index 48d5b72f41f1..d88375e65397 100644 --- a/solenv/gbuild/WinResTarget.mk +++ b/solenv/gbuild/WinResTarget.mk @@ -2,6 +2,9 @@ # WinResTarget class +# defined by platform: +# gb_WinResTarget_WinResTarget_platform + gb_WinResTarget_DEFAULTDEFS := $(gb_RCDEFS) define gb_WinResTarget_WinResTarget @@ -17,6 +20,8 @@ $(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(subst -isystem,-I,$(SOLAR $(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE := $(call gb_WinResTarget_get_target,$(1)) : RCFILE := +$(call gb_WinResTarget_WinResTarget_platform,$(1)) + ifeq ($(gb_FULLDEPS),$(true)) $(call gb_WinResTarget_get_dep_target,$(1)) : DEFS := $$(gb_WinResTarget_DEFAULTDEFS) $(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_WinResTarget_INCLUDE) -I$(SRCDIR)/config_$(gb_Side) @@ -33,7 +38,7 @@ $(call gb_WinResTarget_get_dep_target,%) : $(gb_WinResTarget__command_target) endif -$(call gb_WinResTarget_get_target,%) : $(call gb_Package_get_target,solenv_inc) +$(call gb_WinResTarget_get_target,%) : $(call gb_WinResTarget__command,$@,$*,$<) $(call gb_WinResTarget_get_clean_target,%) : diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index ecb829e923ac..35297415a6bf 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -349,6 +349,8 @@ $(call gb_Helper_abbreviate_dirs,\ $(RCFILE) ) endef +gb_WinResTarget_WinResTarget_platform := + $(eval $(call gb_Helper_make_dep_targets,\ WinResTarget \ )) diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 55aff01da19c..e3f121e0a6e7 100755 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -505,6 +505,11 @@ $(call gb_Helper_abbreviate_dirs,\ $(RCFILE) ) endef +define gb_WinResTarget_WinResTarget_platform +$(call gb_WinResTarget_get_target,$(1)) : $(call gb_Package_get_target,solenv_inc) + +endef + $(eval $(call gb_Helper_make_dep_targets,\ WinResTarget \ )) |