diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-04-23 15:15:43 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-04-23 15:15:43 +0200 |
| commit | 50e9e793bbd88504c32f95590e71a365456d8d10 (patch) | |
| tree | e3ce15ddaf03460a70f0bef5b7c0746837fa4b0c | |
| parent | 4b767128b06257d8273f621f8738a517e3d8fd65 (diff) | |
CWS gnumake2: added cnvenience methods for adding package and sdi headers
| -rw-r--r-- | solenv/inc/gbuild.mk | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/solenv/inc/gbuild.mk b/solenv/inc/gbuild.mk index 1701f110381b..21363c5d8eac 100644 --- a/solenv/inc/gbuild.mk +++ b/solenv/inc/gbuild.mk @@ -517,6 +517,22 @@ define gb_LinkTarget_set_auxtargets $(call gb_LinkTarget_get_clean_target,$(1)) : AUXTARGETS := $(2) endef +define gb_LinkTarget__add_internal_headers +$(call gb_LinkTarget_get_headers_target,$(1)) : $(2) +$(2) :| $(call gb_LinkTarget_get_external_headers_target,$(1)) + +endef + +define gb_LinkTarget_add_package_headers +$(call gb_LinkTarget__add_internal_headers,$(1),$(foreach package,$(2),$(call gb_Package_get_target,$(package)))) +$(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach package,$(2),$(call gb_Package_get_clean_target,$(package))) + +endef + +define gb_LinkTarget_add_sdi_headers +$(call gb_LinkTarget__add_internal_headers,$(1),$(foreach sdi,$(2),$(call gb_SdiTarget_get_target,$(sdi)))) +$(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach sdi,$(2),$(call gb_SdiTarget_get_clean_target,$(sdi))) +endef # Library class @@ -569,6 +585,8 @@ $(eval $(foreach method,\ set_library_path_flags \ add_linked_libs \ add_linked_static_libs \ + add_package_headers \ + add_sdi_headers \ ,\ $(call gb_Library_forward_to_Linktarget,$(method))\ )) @@ -624,6 +642,8 @@ $(eval $(foreach method,\ set_library_path_flags \ add_linked_libs \ add_linked_static_libs \ + add_package_headers \ + add_sdi_headers \ ,\ $(call gb_StaticLibrary_forward_to_Linktarget,$(method))\ )) @@ -673,6 +693,8 @@ $(eval $(foreach method,\ set_library_path_flags \ add_linked_libs \ add_linked_static_libs \ + add_package_headers \ + add_sdi_headers \ ,\ $(call gb_Executable_forward_to_Linktarget,$(method))\ )) |