From: Julian Seward <jseward@acm.org>
Date: Tue, 5 Jun 2012 11:10:19 +0000 (+0000)
Subject: Fixes for 'make dist'.
X-Git-Tag: svn/VALGRIND_3_8_0~254
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15d92f37996f053f04709699628da7a7380232ba;p=thirdparty%2Fvalgrind.git

Fixes for 'make dist'.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12614
---

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 530e1f2c87..68f801c2f4 100644
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -10,14 +10,12 @@ endif
 if VGCONF_ARCHS_INCLUDE_AMD64
 SUBDIRS += amd64
 endif
-
 if VGCONF_ARCHS_INCLUDE_PPC32
 SUBDIRS += ppc32
 endif
 if VGCONF_ARCHS_INCLUDE_PPC64
 SUBDIRS += ppc64
 endif
-
 if VGCONF_ARCHS_INCLUDE_S390X
 SUBDIRS += s390x
 endif
@@ -38,7 +36,7 @@ if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX
 SUBDIRS += amd64-linux
 endif
 
-DIST_SUBDIRS = x86 amd64 ppc32 ppc64 linux darwin x86-linux amd64-linux .
+DIST_SUBDIRS = x86 amd64 ppc32 ppc64 s390x linux darwin x86-linux amd64-linux .
 
 dist_noinst_SCRIPTS = \
 	filter_addressable \
diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index 7d0b201ec8..2f16f5b6fc 100644
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -46,7 +46,8 @@ dist_noinst_SCRIPTS = \
 	filter_none_discards \
 	filter_shell_output \
 	filter_stderr \
-	filter_timestamp
+	filter_timestamp \
+	allexec_prepare_prereq
 
 noinst_HEADERS = fdleak.h
 
diff --git a/none/tests/amd64/Makefile.am b/none/tests/amd64/Makefile.am
index d92dae9f2f..ef53fc4c14 100644
--- a/none/tests/amd64/Makefile.am
+++ b/none/tests/amd64/Makefile.am
@@ -15,9 +15,6 @@ endif
 if BUILD_PCLMULQDQ_TESTS
  INSN_TESTS += insn_pclmulqdq
 endif
-if BUILD_AVX_TESTS
- INSN_TESTS += avx-1
-endif
 
 # Explicitly include insn_sse3 even if ! BUILD_SSE3_TESTS, 
 # to avoid packaging screwups if 'make dist' is run on a machine