aboutsummaryrefslogtreecommitdiffstats
path: root/tests/gpg
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2015-01-30 09:45:20 +0000
committerWerner Koch <[email protected]>2015-01-30 09:45:20 +0000
commit428ea7696585bc24d127b903840554ca659069b6 (patch)
tree9bdb09629b1a310e6074a96a37c05b7010960a49 /tests/gpg
parentdoc: Update gpl.texi to match version from gnupg (diff)
downloadgpgme-428ea7696585bc24d127b903840554ca659069b6.tar.gz
gpgme-428ea7696585bc24d127b903840554ca659069b6.zip
Switch to automake 1.14 and update build-aux files.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
-rw-r--r--tests/gpg/Makefile.am4
-rw-r--r--tests/gpgsm/Makefile.am4
2 files changed, 2 insertions, 6 deletions
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index 5c1266ec..5f40dfe2 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -57,9 +57,7 @@ EXTRA_DIST = start-stop-agent initial.test final.test \
pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
geheim.txt pubkey-1.asc seckey-1.asc pinentry $(private_keys)
-INCLUDES = -I$(top_builddir)/src
-
-AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
+AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
LDADD = ../../src/libgpgme.la
t_thread1_LDADD = ../../src/libgpgme-pthread.la -lpthread
diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
index ecc53a61..bf616d32 100644
--- a/tests/gpgsm/Makefile.am
+++ b/tests/gpgsm/Makefile.am
@@ -29,9 +29,7 @@ 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_builddir)/src
-
-AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
+AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
LDADD = ../../src/libgpgme.la
# We don't run t-genkey in the test suite, because it takes too long