Imported Upstream version 1.8.0

[platform/upstream/gpgme.git] / tests / gpg / Makefile.in

diff --git a/tests/gpg/Makefile.in b/tests/gpg/Makefile.in
index e1e943e..ed75d8a 100644 (file)
--- a/tests/gpg/Makefile.in
+++ b/tests/gpg/Makefile.in
@@ -132,13 +132,14 @@ am__EXEEXT_2 = t-encrypt$(EXEEXT) t-encrypt-sym$(EXEEXT) \
        t-trustlist$(EXEEXT) t-edit$(EXEEXT) t-keylist$(EXEEXT) \
        t-keylist-sig$(EXEEXT) t-wait$(EXEEXT) \
        t-encrypt-large$(EXEEXT) t-file-name$(EXEEXT) \
-       t-gpgconf$(EXEEXT) t-encrypt-mixed$(EXEEXT) $(am__EXEEXT_1)
+       t-gpgconf$(EXEEXT) t-encrypt-mixed$(EXEEXT) $(am__EXEEXT_1) \
+       t-thread-keylist$(EXEEXT) t-thread-keylist-verify$(EXEEXT)
 @HAVE_W32_SYSTEM_FALSE@am__EXEEXT_3 = t-cancel$(EXEEXT)
 am__EXEEXT_4 = t-genkey$(EXEEXT) $(am__EXEEXT_3)
 PROGRAMS = $(noinst_PROGRAMS)
 t_cancel_SOURCES = t-cancel.c
 t_cancel_OBJECTS = t-cancel.$(OBJEXT)
-t_cancel_DEPENDENCIES = ../../src/libgpgme-pthread.la
+t_cancel_DEPENDENCIES = ../../src/libgpgme.la
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -219,9 +220,15 @@ t_signers_SOURCES = t-signers.c
 t_signers_OBJECTS = t-signers.$(OBJEXT)
 t_signers_LDADD = $(LDADD)
 t_signers_DEPENDENCIES = ../../src/libgpgme.la
+t_thread_keylist_SOURCES = t-thread-keylist.c
+t_thread_keylist_OBJECTS = t-thread-keylist.$(OBJEXT)
+t_thread_keylist_DEPENDENCIES = ../../src/libgpgme.la
+t_thread_keylist_verify_SOURCES = t-thread-keylist-verify.c
+t_thread_keylist_verify_OBJECTS = t-thread-keylist-verify.$(OBJEXT)
+t_thread_keylist_verify_DEPENDENCIES = ../../src/libgpgme.la
 t_thread1_SOURCES = t-thread1.c
 t_thread1_OBJECTS = t-thread1.$(OBJEXT)
-t_thread1_DEPENDENCIES = ../../src/libgpgme-pthread.la
+t_thread1_DEPENDENCIES = ../../src/libgpgme.la
 t_trustlist_SOURCES = t-trustlist.c
 t_trustlist_OBJECTS = t-trustlist.$(OBJEXT)
 t_trustlist_LDADD = $(LDADD)
@@ -273,13 +280,15 @@ SOURCES = t-cancel.c t-decrypt.c t-decrypt-verify.c t-edit.c \
        t-encrypt-sign.c t-encrypt-sym.c t-eventloop.c t-export.c \
        t-file-name.c t-genkey.c t-gpgconf.c t-import.c t-keylist.c \
        t-keylist-sig.c t-sig-notation.c t-sign.c t-signers.c \
-       t-thread1.c t-trustlist.c t-verify.c t-wait.c
+       t-thread-keylist.c t-thread-keylist-verify.c t-thread1.c \
+       t-trustlist.c t-verify.c t-wait.c
 DIST_SOURCES = t-cancel.c t-decrypt.c t-decrypt-verify.c t-edit.c \
        t-encrypt.c t-encrypt-large.c t-encrypt-mixed.c \
        t-encrypt-sign.c t-encrypt-sym.c t-eventloop.c t-export.c \
        t-file-name.c t-genkey.c t-gpgconf.c t-import.c t-keylist.c \
        t-keylist-sig.c t-sig-notation.c t-sign.c t-signers.c \
-       t-thread1.c t-trustlist.c t-verify.c t-wait.c
+       t-thread-keylist.c t-thread-keylist-verify.c t-thread1.c \
+       t-trustlist.c t-verify.c t-wait.c
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -459,6 +468,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@
@@ -534,7 +546,8 @@ c_tests = \
         t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers                \
        t-decrypt t-verify t-decrypt-verify t-sig-notation t-export     \
        t-import t-trustlist t-edit t-keylist t-keylist-sig t-wait      \
-       t-encrypt-large t-file-name t-gpgconf t-encrypt-mixed $(tests_unix)
+       t-encrypt-large t-file-name t-gpgconf t-encrypt-mixed $(tests_unix) \
+       t-thread-keylist t-thread-keylist-verify
 
 CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
        gpg-agent.conf pubring.kbx~ S.gpg-agent gpg.conf pubring.gpg~ \
@@ -554,8 +567,10 @@ EXTRA_DIST = initial.test final.test \
 AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
 AM_LDFLAGS = -no-install
 LDADD = ../../src/libgpgme.la
-t_thread1_LDADD = ../../src/libgpgme-pthread.la -lpthread
-t_cancel_LDADD = ../../src/libgpgme-pthread.la -lpthread
+t_thread1_LDADD = ../../src/libgpgme.la -lpthread
+t_thread_keylist_LDADD = ../../src/libgpgme.la -lpthread
+t_thread_keylist_verify_LDADD = ../../src/libgpgme.la -lpthread
+t_cancel_LDADD = ../../src/libgpgme.la -lpthread
 
 # We don't run t-genkey and t-cancel in the test suite, because it
 # takes too long
@@ -684,6 +699,14 @@ t-signers$(EXEEXT): $(t_signers_OBJECTS) $(t_signers_DEPENDENCIES) $(EXTRA_t_sig
        @rm -f t-signers$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(t_signers_OBJECTS) $(t_signers_LDADD) $(LIBS)
 
+t-thread-keylist$(EXEEXT): $(t_thread_keylist_OBJECTS) $(t_thread_keylist_DEPENDENCIES) $(EXTRA_t_thread_keylist_DEPENDENCIES) 
+       @rm -f t-thread-keylist$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(t_thread_keylist_OBJECTS) $(t_thread_keylist_LDADD) $(LIBS)
+
+t-thread-keylist-verify$(EXEEXT): $(t_thread_keylist_verify_OBJECTS) $(t_thread_keylist_verify_DEPENDENCIES) $(EXTRA_t_thread_keylist_verify_DEPENDENCIES) 
+       @rm -f t-thread-keylist-verify$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(t_thread_keylist_verify_OBJECTS) $(t_thread_keylist_verify_LDADD) $(LIBS)
+
 t-thread1$(EXEEXT): $(t_thread1_OBJECTS) $(t_thread1_DEPENDENCIES) $(EXTRA_t_thread1_DEPENDENCIES) 
        @rm -f t-thread1$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(t_thread1_OBJECTS) $(t_thread1_LDADD) $(LIBS)
@@ -726,6 +749,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-sig-notation.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-sign.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-signers.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-thread-keylist-verify.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-thread-keylist.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-thread1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-trustlist.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-verify.Po@am__quote@
@@ -1073,7 +1098,7 @@ export GNUPGHOME := $(abs_builddir)
 export GPG_AGENT_INFO :=
 
 ./private-keys-v1.d/gpg-sample.stamp: $(srcdir)/$(private_keys)
-       test -d ./private-keys-v1.d || mkdir ./private-keys-v1.d
+       $(MKDIR_P) ./private-keys-v1.d
        for k in $(private_keys); do \
           cp $(srcdir)/$$k private-keys-v1.d/$$k.key; \
         done