Fixed 'make dist'. In particular, all the arch/platform-specific files
get included in the distro now, not just the ones for the arch/platform
that the distro tarball is built on.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4085 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/auxprogs/Makefile.am b/auxprogs/Makefile.am
index 4b7bc1c..fd59d06 100644
--- a/auxprogs/Makefile.am
+++ b/auxprogs/Makefile.am
@@ -5,5 +5,7 @@
noinst_SCRIPTS = gen-mdg DotToScc.hs
+EXTRA_DIST = $(noinst_SCRIPTS)
+
valgrind_listener_SOURCES = valgrind-listener.c
diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
index e981aaf..7cbebe0 100644
--- a/cachegrind/Makefile.am
+++ b/cachegrind/Makefile.am
@@ -2,7 +2,10 @@
bin_SCRIPTS = cg_annotate
-EXTRA_DIST = cg_sim.c
+# Remember to include all the arch-specific files in the distribution.
+EXTRA_DIST = \
+ cg_sim.c \
+ $(addsuffix .c,$(addprefix cg-,$(VG_ARCH_ALL)))
noinst_HEADERS = cg_arch.h
diff --git a/coregrind/m_dispatch/Makefile.am b/coregrind/m_dispatch/Makefile.am
index 79abd35..3af6290 100644
--- a/coregrind/m_dispatch/Makefile.am
+++ b/coregrind/m_dispatch/Makefile.am
@@ -3,7 +3,9 @@
noinst_LIBRARIES = libdispatch.a
-## XXX: this won't work with "make dist" -- only one dispatch-XXX.S file
-## will be put in the tarball. Problem exists in various other Makefiles.
+# Remember to include all the arch-specific files in the distribution.
+EXTRA_DIST = \
+ $(addsuffix .S,$(addprefix dispatch-,$(VG_ARCH_ALL)))
+
libdispatch_a_SOURCES = \
dispatch-@VG_ARCH@.S
diff --git a/coregrind/m_sigframe/Makefile.am b/coregrind/m_sigframe/Makefile.am
index 67ef249..fe886de 100644
--- a/coregrind/m_sigframe/Makefile.am
+++ b/coregrind/m_sigframe/Makefile.am
@@ -1,6 +1,10 @@
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
+# Remember to include all the platform-specific files in the distribution.
+EXTRA_DIST = \
+ $(addsuffix .c,$(addprefix sigframe-,$(VG_PLATFORM_ALL)))
+
noinst_LIBRARIES = libsigframe.a
libsigframe_a_SOURCES = \
diff --git a/coregrind/m_syswrap/Makefile.am b/coregrind/m_syswrap/Makefile.am
index 20b36f4..d380e93 100644
--- a/coregrind/m_syswrap/Makefile.am
+++ b/coregrind/m_syswrap/Makefile.am
@@ -1,8 +1,12 @@
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
+# Remember to include all the OS/platform-specific files in the distribution.
EXTRA_DIST = \
- README_SYSWRAP.txt
+ README_SYSWRAP.txt \
+ $(addsuffix .S,$(addprefix syscall-,$(VG_PLATFORM_ALL))) \
+ $(addsuffix .c,$(addprefix syswrap-,$(VG_OS_ALL))) \
+ $(addsuffix .c,$(addprefix syswrap-,$(VG_PLATFORM_ALL)))
noinst_HEADERS = \
priv_types_n_macros.h \
diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 85d2eed..9c2f63a 100644
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -83,7 +83,8 @@
vgtest_ume.stderr.exp vgtest_ume.vgtest \
writev.stderr.exp writev.stderr.exp2 writev.stderr.exp3 writev.vgtest \
xml1.stderr.exp xml1.stderr.exp64 xml1.stdout.exp xml1.vgtest \
- zeropage.stderr.exp zeropage.stderr.exp2 zeropage.vgtest
+ zeropage.stderr.exp zeropage.stderr.exp2 zeropage.stdout.exp \
+ zeropage.vgtest
check_PROGRAMS = \
addressable \
diff --git a/memcheck/tests/zeropage.c b/memcheck/tests/zeropage.c
index 5a52def..a4ba95f 100644
--- a/memcheck/tests/zeropage.c
+++ b/memcheck/tests/zeropage.c
@@ -6,8 +6,8 @@
/* The quick sanity check of Memcheck (and other tools with shadow memory)
relies on the first 64KB of memory never being used. So our mmap()
- refuses to touch this area. This program tests for that. */
-
+ refuses to touch this area. This program tests for that.
+ [actually, no longer true, these all now succeed.] */
int main(void)
{
/* mmap(0x0, ... FIXED) should fail */
diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index 2b86ae7..e7c6ea3 100644
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = ${VG_ARCH} .
DIST_SUBDIRS = ${VG_ARCH_ALL} .
-noinst_SCRIPTS =
+noinst_SCRIPTS = \
filter_as_mmap filter_fdleak filter_none_discards filter_stderr
EXTRA_DIST = $(noinst_SCRIPTS) \
@@ -29,7 +29,7 @@
execve.vgtest execve.stdout.exp execve.stderr.exp \
faultstatus.vgtest faultstatus.stderr.exp \
fcntl_setown.vgtest fcntl_setown.stdout.exp fcntl_setown.stderr.exp \
- fdleak_cmsg.stderr.exp fdleak_cmsg.stderr.exp2 fdleak_cmsg.exp3 \
+ fdleak_cmsg.stderr.exp fdleak_cmsg.stderr.exp2 fdleak_cmsg.stderr.exp3 \
fdleak_cmsg.vgtest \
fdleak_creat.stderr.exp fdleak_creat.stderr.exp2 \
fdleak_creat.stderr.exp3 fdleak_creat.vgtest \