diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2024-01-25 00:29:35 +0600 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2024-01-25 02:39:35 +0100 |
commit | 566bb271b8fe5882f24fef230e06c2af4ea12b33 (patch) | |
tree | 26156475b394457d52044ca3cac79b7fcd1c1bdc /solenv/gbuild/extensions | |
parent | 37f148c58974210707e069f21da2cc2b9ae086dd (diff) |
add static libraries to gbuildtojson
... and to vs-ide-integration solution.
Change-Id: I5085e6a61df4bc03cfe595a1e6b99196f6f73643
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162524
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'solenv/gbuild/extensions')
-rw-r--r-- | solenv/gbuild/extensions/post_GbuildToJson.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk b/solenv/gbuild/extensions/post_GbuildToJson.mk index 080a12837ab7..0aa23a70e0a7 100644 --- a/solenv/gbuild/extensions/post_GbuildToJson.mk +++ b/solenv/gbuild/extensions/post_GbuildToJson.mk @@ -92,6 +92,13 @@ $(call gb_LinkTarget_get_target,$(2)): $(gb_Helper_MISCDUMMY) $(gb_GbuildToJson_ $(call gb_LinkTarget_get_target,$(2)): T_MAKEFILE := $(lastword $(MAKEFILE_LIST)) endef +define gb_StaticLibrary_register_target +gbuildtojson : $(call gb_LinkTarget_get_target,$(2)) + +$(call gb_LinkTarget_get_target,$(2)): $(gb_Helper_MISCDUMMY) $(gb_GbuildToJson_PHONY) +$(call gb_LinkTarget_get_target,$(2)): T_MAKEFILE := $(lastword $(MAKEFILE_LIST)) +endef + gb_LinkTarget_use_static_libraries = gb_UnoApiHeadersTarget_get_target = $(gb_Helper_MISCDUMMY) gb_UnpackedTarball_get_final_target = $(gb_Helper_MISCDUMMY) @@ -175,7 +182,7 @@ $(call gb_Module_get_check_target,$(1)) : $(3) endef define gb_Module_add_target -$(if $(filter Library_% Executable_%,$(2)),$(call gb_Module__add_target_impl,$(1),$(2),$$(gb_Module_CURRENTTARGET))) +$(if $(filter Library_% Executable_% StaticLibrary_%,$(2)),$(call gb_Module__add_target_impl,$(1),$(2),$$(gb_Module_CURRENTTARGET))) endef define gb_Module_add_check_target |