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

[Thorsten Behrens]

 RepositoryExternal.mk               |   43 ++++++++++++++++++++----------------
 external/gpgmepp/Library_gpgmepp.mk |    3 --
 2 files changed, 26 insertions(+), 20 deletions(-)

New commits:
commit 8bab24efd3caa1805e192a7864ac3da6f46d87b9
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..e95ba84e638f 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,13 +3542,13 @@ 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
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,\
commit 2e531eb9fde78fab2ccf9986d0d7c1f0b886d219
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Wed Nov 22 12:06:20 2017 +0100

    fixup external deps
    
    Change-Id: I191435f005017c50e5ee6670edbd9deebf5f7280

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 78cff638ebaf..58bdfaadc450 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3512,8 +3512,6 @@ $(call gb_LinkTarget_add_libs,$(1),\
 
 endef
 
-endif
-
 define gb_LinkTarget__use_gpgmepp
 $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src \
@@ -3521,37 +3519,46 @@ $(call gb_LinkTarget_set_include,$(1),\
 	$$(GPG_ERROR_CFLAGS) \
 	$$(INCLUDE) \
 )
-$(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src/.libs/ -lgpgmepp \
+$(call gb_LinkTarget_use_libraries,$(1),\
+	gpgmepp \
 )
-$(call gb_LinkTarget_use_package,$(1),gpgme)
 
 endef
 
-ifneq ($(filter MACOSX LINUX,$(OS)),)
-
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
-	gpgmepp \
 	libassuan \
 	libgpg-error \
 ))
 
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
+	gpgmepp \
+))
+
 endif
 
-ifneq ($(filter WNT,$(OS)),)
+ifneq ($(filter MACOSX LINUX,$(OS)),)
+
+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 \
+	$$(GPG_ERROR_CFLAGS) \
+	$$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),\
+	-L$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src/.libs/ -lgpgmepp \
+)
+
+endif
 
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
+	gpgmepp \
 	libassuan \
 	libgpg-error \
 ))
 
-$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
-	gpgme \
-	gpgmepp \
-))
-
-endif
-
 endif
 
 define gb_LinkTarget__use_dconf