1 files changed, 15 insertions, 27 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 64906988..b3679179 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -19,40 +19,28 @@
 
 ## Process this file with automake to produce Makefile.in
 
-
 TESTS_ENVIRONMENT = GNUPGHOME=.
 
-TESTS = t-version t-data t-encrypt t-sign t-signers t-decrypt t-verify	\
-	t-decrypt-verify t-keylist t-export t-import t-trustlist
-
+TESTS = t-version t-data
 
-EXTRA_DIST = mkdemodirs pubdemo.asc secdemo.asc cipher-1.asc geheim.txt \
-	     pubkey-1.asc seckey-1.asc
+EXTRA_DIST = t-data-1.txt t-data-2.txt
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
+INCLUDES = -I$(top_srcdir)/gpgme
 
 LDADD = ../gpgme/libgpgme.la
 
-# We don't run t-genkey in the test suite, because it taes too long
-noinst_PROGRAMS = $(TESTS) t-genkey
-
-distclean-local:
-	$(srcdir)/mkdemodirs --clean
-
-all-local: ./pubring.gpg ./secring.gpg
-
-./pubring.gpg: $(srcdir)/pubdemo.asc
-	-gpg --homedir . --import $(srcdir)/pubdemo.asc
-
-./secring.gpg: ./Alpha/Secret.gpg 
-	-gpg --homedir . --allow-secret-key-import --import Alpha/Secret.gpg Zulu/Secret.gpg
-
-./Alpha/Secret.gpg: secdemo.asc 
-	srcdir=$(srcdir) $(srcdir)/mkdemodirs 
-
-
-
-
+noinst_PROGRAMS = $(TESTS)
 
+if RUN_GPG_TESTS
+gpgtests = gpg
+else
+gpgtests = 
+endif
 
+if RUN_GPGSM_TESTS
+gpgsmtests = gpgsm
+else
+gpgsmtests = 
+endif
 
+SUBDIRS = ${gpgtests} ${gpgsmtests}