diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2017-02-21 12:05:52 +0100 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2017-02-21 13:31:23 +0000 |
| commit | cd497ebda3d63042c41e70a9ff8941a0fcf65572 (patch) | |
| tree | fec941813944d97a55fdc412221919825635e6e4 /external | |
| parent | 1b4ce7cd8e4c1e1732ee6434cadd29cb23583a54 (diff) | |
gpg4libre: Make internally built libgpgmepp available in instdir
Change-Id: I1193c0d350e6b0d3498117ef7719e7a009173f09
Reviewed-on: https://gerrit.libreoffice.org/34514
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'external')
| -rw-r--r-- | external/gpgme/ExternalPackage_gpgme.mk | 20 | ||||
| -rw-r--r-- | external/gpgme/Module_gpgme.mk | 1 |
2 files changed, 21 insertions, 0 deletions
diff --git a/external/gpgme/ExternalPackage_gpgme.mk b/external/gpgme/ExternalPackage_gpgme.mk new file mode 100644 index 000000000000..03ab389a33b1 --- /dev/null +++ b/external/gpgme/ExternalPackage_gpgme.mk @@ -0,0 +1,20 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,gpgme,gpgme)) + +$(eval $(call gb_ExternalPackage_use_external_project,gpgme,gpgme)) + +ifneq ($(DISABLE_DYNLOADING),TRUE) + +$(eval $(call gb_ExternalPackage_add_file,gpgme,$(LIBO_LIB_FOLDER)/libgpgmepp.so.6,lang/cpp/src/.libs/libgpgmepp.so.6.3.0)) + +endif # $(DISABLE_DYNLOADING) + +# vim: set noet sw=4 ts=4: diff --git a/external/gpgme/Module_gpgme.mk b/external/gpgme/Module_gpgme.mk index 8c318a2f6e69..97da18dfaabd 100644 --- a/external/gpgme/Module_gpgme.mk +++ b/external/gpgme/Module_gpgme.mk @@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,gpgme)) $(eval $(call gb_Module_add_targets,gpgme,\ ExternalProject_gpgme \ + ExternalPackage_gpgme \ UnpackedTarball_gpgme \ )) |