From 66d0fa1973e5e1a1bff619de8b595673d1b76cc5 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Mon, 3 Nov 2008 17:24:09 +0000 Subject: 008-11-03 Marcus Brinkmann * configure.ac: Replace gpgme paths with src. * gpgme: Move to ... * src: ... this new directory. assuan/ 2008-11-03 Marcus Brinkmann * Makefile.am (INCLUDES): Replace gpgme path with src. tests/ 2008-11-03 Marcus Brinkmann * gpgsm/Makefile.am (INCLUDES, LDADD): Replace gpgme path with src. * gpg/Makefile.am (INCLUDES, LDADD, t_thread1_LDADD): Likewise. * Makefile.am (LDADD): Likewise. --- tests/ChangeLog | 6 ++++++ tests/Makefile.am | 2 +- tests/gpg/Makefile.am | 6 +++--- tests/gpgsm/Makefile.am | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/ChangeLog b/tests/ChangeLog index 060c12ff..088d5ba3 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,9 @@ +2008-11-03 Marcus Brinkmann + + * gpgsm/Makefile.am (INCLUDES, LDADD): Replace gpgme path with src. + * gpg/Makefile.am (INCLUDES, LDADD, t_thread1_LDADD): Likewise. + * Makefile.am (LDADD): Likewise. + 2008-06-19 Werner Koch * gpg/t-gpgconf.c (dump_arg): Add new types. Print strings in diff --git a/tests/Makefile.am b/tests/Makefile.am index ceabc999..068f8865 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -29,7 +29,7 @@ EXTRA_DIST = t-data-1.txt t-data-2.txt INCLUDES = -I$(top_srcdir)/gpgme AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ -LDADD = ../gpgme/libgpgme.la @GPG_ERROR_LIBS@ +LDADD = ../src/libgpgme.la @GPG_ERROR_LIBS@ noinst_PROGRAMS = $(TESTS) diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am index a0c3520c..f295fe6e 100644 --- a/tests/gpg/Makefile.am +++ b/tests/gpg/Makefile.am @@ -43,11 +43,11 @@ DISTCLEANFILES = pubring.gpg~ pubring.kbx~ random_seed gpg.conf gpg-agent.conf EXTRA_DIST = mkdemodirs pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \ geheim.txt pubkey-1.asc seckey-1.asc pinentry -INCLUDES = -I$(top_srcdir)/gpgme +INCLUDES = -I$(top_srcdir)/src AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ -LDADD = ../../gpgme/libgpgme.la -t_thread1_LDADD = ../../gpgme/libgpgme-pthread.la +LDADD = ../../src/libgpgme.la +t_thread1_LDADD = ../../src/libgpgme-pthread.la # We don't run t-genkey in the test suite, because it takes too long noinst_PROGRAMS = $(TESTS) t-genkey diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am index 74b9fbad..91a8cf73 100644 --- a/tests/gpgsm/Makefile.am +++ b/tests/gpgsm/Makefile.am @@ -29,10 +29,10 @@ TESTS = t-import t-keylist t-encrypt t-verify t-decrypt t-sign t-export EXTRA_DIST = cert_dfn_pca01.der cert_dfn_pca15.der cert_g10code_test1.der \ $(key_id) -INCLUDES = -I$(top_srcdir)/gpgme +INCLUDES = -I$(top_srcdir)/src AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ -LDADD = ../../gpgme/libgpgme.la +LDADD = ../../src/libgpgme.la # We don't run t-genkey in the test suite, because it takes too long # and needs a working pinentry. -- cgit v1.2.3