[Libreoffice-commits] core.git: Branch 'private/thb/gpg4libre-win32' - external/gpgmepp RepositoryExternal.mk

[Thorsten Behrens]

Rebased ref, commits from common ancestor:
commit 96ec95a358442aeb5130dd68d785d8884fe65404
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Wed Nov 22 12:13:13 2017 +0100

    remove remaining gpgme mentions, fix library_gpgmepp deps
    
    Change-Id: I12f07d50c70f8a56ac519570b127ab45ddde485c

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 58bdfaadc450..995a490214ec 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3514,8 +3514,8 @@ endef
 
 define gb_LinkTarget__use_gpgmepp
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src \
-	-I$(call gb_UnpackedTarball_get_dir,gpgme)/src \
+	-I$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src \
+	-I$(call gb_UnpackedTarball_get_dir,gpgmepp)/src \
 	$$(GPG_ERROR_CFLAGS) \
 	$$(INCLUDE) \
 )
@@ -3542,16 +3542,16 @@ define gb_LinkTarget__use_gpgmepp
 $(call gb_LinkTarget_use_package,$(1),gpgmepp)
 
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src \
-	-I$(call gb_UnpackedTarball_get_dir,gpgme)/src \
+	-I$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src \
+	-I$(call gb_UnpackedTarball_get_dir,gpgmepp)/src \
 	$$(GPG_ERROR_CFLAGS) \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src/.libs/ -lgpgmepp \
+	-L$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src/.libs/ -lgpgmepp \
 )
 
-endif
+endef
 
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 	gpgmepp \
@@ -3561,6 +3561,8 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 
 endif
 
+endif
+
 define gb_LinkTarget__use_dconf
 $(call gb_LinkTarget_add_defs,$(1),$(DCONF_CFLAGS))
 $(call gb_LinkTarget_add_libs,$(1),$(DCONF_LIBS))
diff --git a/external/gpgmepp/Library_gpgmepp.mk b/external/gpgmepp/Library_gpgmepp.mk
index 08f1ec003be6..eca519743b57 100644
--- a/external/gpgmepp/Library_gpgmepp.mk
+++ b/external/gpgmepp/Library_gpgmepp.mk
@@ -14,10 +14,9 @@ $(eval $(call gb_Library_use_unpacked,gpgmepp,gpgmepp))
 $(eval $(call gb_Library_use_externals,gpgmepp,\
 	libgpg-error \
 	libassuan \
+	gpgmepp \
 ))
 
-$(eval $(call gb_Library_use_external_project,gpgmepp,gpgmepp))
-
 $(eval $(call gb_Library_set_warnings_not_errors,gpgmepp))
 
 $(eval $(call gb_Library_set_include,gpgmepp,\