Improve the speedo make script.
[gnupg.git] / Makefile.am
index 6207d7b..08b5d32 100644 (file)
@@ -19,7 +19,6 @@
 ## Process this file with automake to produce Makefile.in
 
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4
-AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
 DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto --enable-gpgtar
 
 GITLOG_TO_CHANGELOG=gitlog-to-changelog
@@ -27,7 +26,8 @@ GITLOG_TO_CHANGELOG=gitlog-to-changelog
 EXTRA_DIST = scripts/config.rpath scripts/potomo autogen.sh README.GIT \
             ChangeLog-2011 po/ChangeLog-2011 scripts/ChangeLog-2011 \
             scripts/gitlog-to-changelog \
-            scripts/git-log-fix scripts/git-log-footer
+            scripts/git-log-fix scripts/git-log-footer \
+            scripts/speedo.mk
 DISTCLEANFILES = g10defs.h
 
 if BUILD_GPGSM
@@ -82,10 +82,10 @@ else
 doc =
 endif
 
-if HAVE_W32_SYSTEM
-tests =
-else
+if RUN_TESTS
 tests = tests
+else
+tests =
 endif
 
 SUBDIRS = m4 gl include common ${kbx} \