Imported Upstream version 1.8.0upstream/1.8.0

1 files changed, 44 insertions, 34 deletions

diff --git a/lang/cpp/src/Makefile.in b/lang/cpp/src/Makefile.in
index 6be45d1..45f6219 100644
--- a/lang/cpp/src/Makefile.in
+++ b/lang/cpp/src/Makefile.in
@@ -102,6 +102,7 @@ host_triplet = @host@
 subdir = lang/cpp/src
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/build-aux/mkinstalldirs \
+	$(srcdir)/GpgmeppConfig-w32.cmake.in.in \
 	$(srcdir)/GpgmeppConfig.cmake.in.in \
 	$(srcdir)/GpgmeppConfigVersion.cmake.in \
 	$(srcdir)/gpgmepp_version.h.in $(top_srcdir)/build-aux/depcomp \
@@ -122,8 +123,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = GpgmeppConfig.cmake.in GpgmeppConfigVersion.cmake \
-	gpgmepp_version.h
+CONFIG_CLEAN_FILES = GpgmeppConfig-w32.cmake.in GpgmeppConfig.cmake.in \
+	GpgmeppConfigVersion.cmake gpgmepp_version.h
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -154,7 +155,8 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(libdir)" \
 	"$(DESTDIR)$(gpgmeppincludedir)" \
-	"$(DESTDIR)$(gpgmeppincludedir)" "$(DESTDIR)$(includedir)"
+	"$(DESTDIR)$(gpgmeppincludedir)" \
+	"$(DESTDIR)$(gpgmeppincludedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libgpgmepp_la_DEPENDENCIES = ../../../src/libgpgme.la
 am__objects_1 = exception.lo context.lo key.lo trustitem.lo data.lo \
@@ -167,7 +169,7 @@ am__objects_1 = exception.lo context.lo key.lo trustitem.lo data.lo \
 	gpgadduserideditinteractor.lo defaultassuantransaction.lo \
 	scdgetinfoassuantransaction.lo \
 	gpgagentgetinfoassuantransaction.lo vfsmountresult.lo \
-	configuration.lo tofuinfo.lo
+	configuration.lo tofuinfo.lo swdbresult.lo
 am__objects_2 =
 am_libgpgmepp_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
 	context_vanilla.lo $(am__objects_2) $(am__objects_2)
@@ -240,7 +242,7 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 HEADERS = $(gpgmeppinclude_HEADERS) $(nobase_gpgmeppinclude_HEADERS) \
-	$(nodist_include_HEADERS)
+	$(nodist_gpgmeppinclude_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -392,6 +394,9 @@ SWIG = @SWIG@
 SWIG_LIB = @SWIG_LIB@
 SYSROOT = @SYSROOT@
 VERSION = @VERSION@
+VERSION_MAJOR = @VERSION_MAJOR@
+VERSION_MICRO = @VERSION_MICRO@
+VERSION_MINOR = @VERSION_MINOR@
 VERSION_NUMBER = @VERSION_NUMBER@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -454,7 +459,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 EXTRA_DIST = GpgmeppConfig.cmake.in.in GpgmeppConfigVersion.cmake.in \
-             gpgmepp_version.h.in
+             gpgmepp_version.h.in GpgmeppConfig-w32.cmake.in.in
 
 lib_LTLIBRARIES = libgpgmepp.la
 main_sources = \
@@ -467,7 +472,7 @@ main_sources = \
     gpgsetownertrusteditinteractor.cpp gpgsignkeyeditinteractor.cpp \
     gpgadduserideditinteractor.cpp defaultassuantransaction.cpp \
     scdgetinfoassuantransaction.cpp gpgagentgetinfoassuantransaction.cpp \
-    vfsmountresult.cpp configuration.cpp tofuinfo.cpp
+    vfsmountresult.cpp configuration.cpp tofuinfo.cpp swdbresult.cpp
 
 gpgmepp_headers = \
     configuration.h context.h data.h decryptionresult.h \
@@ -479,7 +484,7 @@ gpgmepp_headers = \
     importresult.h keygenerationresult.h key.h keylistresult.h \
     notation.h result.h scdgetinfoassuantransaction.h signingresult.h \
     trustitem.h verificationresult.h vfsmountresult.h gpgmepp_export.h \
-    tofuinfo.h
+    tofuinfo.h swdbresult.h
 
 private_gpgmepp_headers = \
     result_p.h context_p.h util.h callbacks.h data_p.h
@@ -491,7 +496,7 @@ interface_headers = \
 gpgmeppincludedir = $(includedir)/gpgme++
 gpgmeppinclude_HEADERS = $(gpgmepp_headers)
 nobase_gpgmeppinclude_HEADERS = $(interface_headers)
-nodist_include_HEADERS = gpgmepp_version.h
+nodist_gpgmeppinclude_HEADERS = gpgmepp_version.h
 libgpgmepp_la_SOURCES = $(main_sources) $(gpgmepp_headers) context_vanilla.cpp \
                         $(interface_headers) $(private_gpgmepp_headers)
 
@@ -499,12 +504,12 @@ AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \
               -DBUILDING_GPGMEPP
 
 libgpgmepp_la_LIBADD = ../../../src/libgpgme.la @LIBASSUAN_LIBS@
-libgpgmepp_la_LDFLAGS = -version-info \
+libgpgmepp_la_LDFLAGS = -no-undefined -version-info \
     @LIBGPGMEPP_LT_CURRENT@:@LIBGPGMEPP_LT_REVISION@:@LIBGPGMEPP_LT_AGE@
 
-@HAVE_W32_SYSTEM_FALSE@libsuffix = .so
-@HAVE_W32_SYSTEM_TRUE@libsuffix = .dll.a
-CLEANFILES = GpgmeppConfig.cmake
+CLEANFILES = GpgmeppConfig.cmake GpgmeppConfigVersion.cmake \
+             gpgmepp_version.h GpgmeppConfig.cmake.in
+
 all: all-am
 
 .SUFFIXES:
@@ -539,6 +544,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+GpgmeppConfig-w32.cmake.in: $(top_builddir)/config.status $(srcdir)/GpgmeppConfig-w32.cmake.in.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 GpgmeppConfig.cmake.in: $(top_builddir)/config.status $(srcdir)/GpgmeppConfig.cmake.in.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 GpgmeppConfigVersion.cmake: $(top_builddir)/config.status $(srcdir)/GpgmeppConfigVersion.cmake.in
@@ -613,6 +620,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keylistresult.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scdgetinfoassuantransaction.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signingresult.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swdbresult.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tofuinfo.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trustitem.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/verificationresult.Plo@am__quote@
@@ -689,27 +697,27 @@ uninstall-nobase_gpgmeppincludeHEADERS:
 	@list='$(nobase_gpgmeppinclude_HEADERS)'; test -n "$(gpgmeppincludedir)" || list=; \
 	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
 	dir='$(DESTDIR)$(gpgmeppincludedir)'; $(am__uninstall_files_from_dir)
-install-nodist_includeHEADERS: $(nodist_include_HEADERS)
+install-nodist_gpgmeppincludeHEADERS: $(nodist_gpgmeppinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	@list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
+	@list='$(nodist_gpgmeppinclude_HEADERS)'; test -n "$(gpgmeppincludedir)" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(gpgmeppincludedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(gpgmeppincludedir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(gpgmeppincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(gpgmeppincludedir)" || exit $$?; \
 	done
 
-uninstall-nodist_includeHEADERS:
+uninstall-nodist_gpgmeppincludeHEADERS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
+	@list='$(nodist_gpgmeppinclude_HEADERS)'; test -n "$(gpgmeppincludedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
+	dir='$(DESTDIR)$(gpgmeppincludedir)'; $(am__uninstall_files_from_dir)
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
@@ -797,7 +805,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gpgmeppincludedir)" "$(DESTDIR)$(gpgmeppincludedir)" "$(DESTDIR)$(includedir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gpgmeppincludedir)" "$(DESTDIR)$(gpgmeppincludedir)" "$(DESTDIR)$(gpgmeppincludedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -856,7 +864,7 @@ info-am:
 
 install-data-am: install-data-local install-gpgmeppincludeHEADERS \
 	install-nobase_gpgmeppincludeHEADERS \
-	install-nodist_includeHEADERS
+	install-nodist_gpgmeppincludeHEADERS
 
 install-dvi: install-dvi-am
 
@@ -904,7 +912,7 @@ ps-am:
 
 uninstall-am: uninstall-gpgmeppincludeHEADERS uninstall-libLTLIBRARIES \
 	uninstall-local uninstall-nobase_gpgmeppincludeHEADERS \
-	uninstall-nodist_includeHEADERS
+	uninstall-nodist_gpgmeppincludeHEADERS
 
 .MAKE: install-am install-strip
 
@@ -918,22 +926,24 @@ uninstall-am: uninstall-gpgmeppincludeHEADERS uninstall-libLTLIBRARIES \
 	install-html install-html-am install-info install-info-am \
 	install-libLTLIBRARIES install-man \
 	install-nobase_gpgmeppincludeHEADERS \
-	install-nodist_includeHEADERS install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	install-nodist_gpgmeppincludeHEADERS install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am \
 	uninstall-gpgmeppincludeHEADERS uninstall-libLTLIBRARIES \
 	uninstall-local uninstall-nobase_gpgmeppincludeHEADERS \
-	uninstall-nodist_includeHEADERS
-
+	uninstall-nodist_gpgmeppincludeHEADERS
 
-GpgmeppConfig.cmake: GpgmeppConfig.cmake.in
-	sed -e 's|[@]resolved_libdir@|$(libdir)|g' < "$<" | \
-	sed -e 's|[@]libsuffix@|$(libsuffix)|g' | \
-	sed -e 's|[@]resolved_includedir@|$(includedir)|g' > $@
 
+@HAVE_W32_SYSTEM_TRUE@GpgmeppConfig.cmake: GpgmeppConfig-w32.cmake.in
+@HAVE_W32_SYSTEM_TRUE@	sed -e 's|[@]resolved_bindir@|$(bindir)|g' < "$<" | \
+@HAVE_W32_SYSTEM_TRUE@	sed -e 's|[@]resolved_libdir@|$(libdir)|g' | \
+@HAVE_W32_SYSTEM_TRUE@	sed -e 's|[@]resolved_includedir@|$(includedir)|g' > $@
+@HAVE_W32_SYSTEM_FALSE@GpgmeppConfig.cmake: GpgmeppConfig.cmake.in
+@HAVE_W32_SYSTEM_FALSE@	sed -e 's|[@]resolved_libdir@|$(libdir)|g' < "$<" | \
+@HAVE_W32_SYSTEM_FALSE@	sed -e 's|[@]resolved_includedir@|$(includedir)|g' > $@
 install-cmake-files: GpgmeppConfig.cmake GpgmeppConfigVersion.cmake
 	-$(INSTALL) -d $(DESTDIR)$(libdir)/cmake/Gpgmepp
 	$(INSTALL) -m 644 GpgmeppConfig.cmake \