diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-03-31 00:52:25 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-03-31 22:49:28 +0200 |
| commit | c6bf4fd4af60d7a24d77a90e021555d18faa563c (patch) | |
| tree | 943a44970a64a6d245f64000c4a5b446e43e66e6 /solenv | |
| parent | 0a5c0806ee447e61171100c4432bb7931d8757b0 (diff) | |
gbuild: add gb_LinkTarget_add_custom_headers
to be used for generated headers which are not delivered to solver.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Executable.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/Library.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 11 | ||||
| -rw-r--r-- | solenv/gbuild/StaticLibrary.mk | 1 |
4 files changed, 14 insertions, 0 deletions
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 90d1f09923a3..8a7fc2601f83 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -109,6 +109,7 @@ $(eval $(foreach method,\ add_linked_static_libs \ use_external \ use_externals \ + add_custom_headers \ add_package_headers \ add_sdi_headers \ add_nativeres \ diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index b7df1f497eae..2200add533ad 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -185,6 +185,7 @@ $(eval $(foreach method,\ add_linked_static_libs \ use_external \ use_externals \ + add_custom_headers \ add_external_headers \ add_package_headers \ add_sdi_headers \ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index ccd098b72ab2..11eeb02490ff 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -900,6 +900,17 @@ $(2) :| $(call gb_LinkTarget_get_external_headers_target,$(1)) endef +define gb_LinkTarget_add_custom_headers +$(call gb_LinkTarget_get_headers_target,$(1)) \ +$(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call gb_CustomTarget_get_workdir,$(2)) +ifeq ($(gb_FULLDEPS),$(true)) +$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += -I$(call gb_CustomTarget_get_workdir,$(2)) +endif +$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_CustomTarget_get_target,$(2))) +$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_CustomTarget_get_clean_target,$(2)) + +endef + define gb_LinkTarget_add_package_headers $(foreach package,$(2),$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_Package_get_target,$(package)))) $(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach package,$(2),$(call gb_Package_get_clean_target,$(package))) diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index 888918c27646..20588396e76f 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -111,6 +111,7 @@ $(eval $(foreach method,\ add_linked_static_libs \ use_external \ use_externals \ + add_custom_headers \ add_package_headers \ add_sdi_headers \ set_warnings_not_errors \ |