Improve gpgmepp -> libassuan/libgpg-error lib dependencies
...so that other executables than svidl would benefit, too
Change-Id: I208ebbc04189c2f25eace19ef0875349cf63d3f0
Reviewed-on: https://gerrit.libreoffice.org/50963
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0fa3524..aecbd71 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3927,17 +3927,6 @@ $(call gb_Executable_add_runtime_dependencies,saxparser,\
)
endef
# Executable_svidl links against Library_tl, which links against Library_comphelper, which links
# against libraries from ExternalProject_gpgmepp, which links against libraries from
# ExternalProject_libassuan and ExternalProject_libgpg-error:
define gb_Executable__register_svidl
$(call gb_Executable_add_runtime_dependencies,svidl, \
$(call gb_Helper_optional,GPGMEPP, \
$(call gb_Helper_optional,LIBASSUAN,$(call gb_Package_get_target_for_build,libassuan)) \
$(call gb_Helper_optional,LIBGPGERROR,$(call gb_Package_get_target_for_build,libgpg-error))) \
)
endef
# NOTE: the dependencies on ure/services.rdb and udkapi.rdb are implicitly
# required due to the settings for URE_SERVICES and URE_TYPES in
# cppuhelper/source/unorc
diff --git a/external/gpgmepp/ExternalPackage_gpgmepp.mk b/external/gpgmepp/ExternalPackage_gpgmepp.mk
index 3e841b5..67c3dc6 100644
--- a/external/gpgmepp/ExternalPackage_gpgmepp.mk
+++ b/external/gpgmepp/ExternalPackage_gpgmepp.mk
@@ -29,6 +29,12 @@ $(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/gpgme-w32sp
endif
# If a tool executed during the build (like svidl) requires these gpgmepp libraries, it will also
# require those libassuan and libgpg-error libraries that these gpgmepp libraries link against:
$(call gb_Package_get_target_for_build,gpgmepp): \
$(call gb_Helper_optional,LIBASSUAN,$(call gb_Package_get_target_for_build,libassuan)) \
$(call gb_Helper_optional,LIBGPGERROR,$(call gb_Package_get_target_for_build,libgpg-error))
endif # $(DISABLE_DYNLOADING)
# vim: set noet sw=4 ts=4:
