Fixups to get "make dist" to work -- mostly involving regression test files.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1099 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/Makefile.am b/Makefile.am
index 66da88a..ba40fd7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 
-SUBDIRS = 	core . docs \
+SUBDIRS = 	core . docs tests include \
 		addrcheck \
 		memcheck \
 		cachegrind \
diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
index f7f1738..cd429fd 100644
--- a/cachegrind/Makefile.am
+++ b/cachegrind/Makefile.am
@@ -15,7 +15,8 @@
 	cg_sim_I1.c \
 	cg_sim_D1.c \
 	cg_sim_L2.c \
-	cg_sim_gen.c
+	cg_sim_gen.c \
+	tests
 
 val_PROGRAMS = vgskin_cachegrind.so
 
diff --git a/cachegrind/tests/Makefile.am b/cachegrind/tests/Makefile.am
index f4e0f44..566cd39 100644
--- a/cachegrind/tests/Makefile.am
+++ b/cachegrind/tests/Makefile.am
@@ -4,6 +4,15 @@
 ## Cachegrind ones.
 ##---------------------------------------------------------------------------
 
+noinst_SCRIPTS = filter_stderr
+
+EXTRA_DIST = 
+	$(noinst_SCRIPTS) \
+	dlclose.vgtest dlclose.stderr.exp dlclose.stderr.exp.hd \
+	dlclose.stdout.exp \
+	fpu-28-108.vgtest fpu-28-108.stderr.exp fpu-28-108.stderr.exp.hd \
+	fpu-28-108.stdout.exp
+
 noinst_PROGRAMS = \
 	dlclose fpu-28-108 myprint.so
 
diff --git a/configure.in b/configure.in
index 0c1b751..d06fa85 100644
--- a/configure.in
+++ b/configure.in
@@ -293,11 +293,13 @@
 AC_OUTPUT(
    Makefile 
    valgrind.spec
+   docs/Makefile 
+   tests/Makefile 
+   include/Makefile 
    core/Makefile 
    core/demangle/Makefile 
    core/docs/Makefile
    core/valgrind
-   docs/Makefile 
    addrcheck/Makefile
    memcheck/Makefile
    memcheck/tests/Makefile
diff --git a/corecheck/tests/Makefile.am b/corecheck/tests/Makefile.am
index 26e906e..c79d1a3 100644
--- a/corecheck/tests/Makefile.am
+++ b/corecheck/tests/Makefile.am
@@ -6,6 +6,26 @@
 ## blocking syscalls, etc.
 ##---------------------------------------------------------------------------
 
+noinst_SCRIPTS = filter_stderr
+
+EXTRA_DIST = \
+	$(noinst_SCRIPTS) \
+	erringfds.stderr.exp erringfds.stderr.exp.hd erringfds.stdout.exp \
+	erringfds.vgtest \
+	malloc3.stderr.exp malloc3.stderr.exp.hd malloc3.stdout.exp \
+	malloc3.vgtest \
+	pth_atfork1.stderr.exp pth_atfork1.stderr.exp.hd \
+	pth_atfork1.stdout.exp pth_atfork1.vgtest \
+	pth_cancel2.stderr.exp pth_cancel2.stderr.exp.hd pth_cancel2.vgtest \
+	pth_cvsimple.stderr.exp pth_cvsimple.stderr.exp.hd \
+	pth_cvsimple.stdout.exp pth_cvsimple.vgtest \
+	pth_empty.stderr.exp pth_empty.stderr.exp.hd pth_empty.vgtest \
+	pth_mutexspeed.stderr.exp pth_mutexspeed.stderr.exp.hd \
+	pth_mutexspeed.stdout.exp pth_mutexspeed.vgtest \
+	pth_once.stderr.exp pth_once.stderr.exp.hd pth_once.stdout.exp \
+	pth_once.vgtest \
+	sigkill.stderr.exp sigkill.stderr.exp.hd sigkill.vgtest
+
 noinst_PROGRAMS = \
 	erringfds malloc3 sigkill \
 	pth_atfork1 pth_cancel2 pth_cvsimple pth_empty \
diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am
index 521ca3b..01d0ceb 100644
--- a/memcheck/Makefile.am
+++ b/memcheck/Makefile.am
@@ -23,7 +23,7 @@
 	mc_include.h	\
 	memcheck.h
 
-MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS) 
+MANUAL_DEPS = $(noinst_HEADERS)
 
 ##vgskin_memcheck.so$(EXEEXT): $(vgskin_memcheck_so_OBJECTS)
 ##	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_memcheck.so \
diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index a36047c..7cf25e7 100644
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -9,6 +9,49 @@
 ##     strict EIP updating
 ##---------------------------------------------------------------------------
 
+noinst_SCRIPTS = filter_leak_check_size filter_stderr
+
+EXTRA_DIST = \
+	$(noinst_SCRIPTS) \
+	badaddrvalue.stderr.exp badaddrvalue.stderr.exp.hd \
+	badaddrvalue.stdout.exp badaddrvalue.vgtest \
+	badfree-2trace.stderr.exp badfree-2trace.vgtest \
+	badfree.stderr.exp badfree.vgtest \
+	badjump.stderr.exp badjump.vgtest \
+	badloop.stderr.exp badloop.vgtest \
+	buflen_check.stderr.exp buflen_check.stderr.exp.hd buflen_check.vgtest \
+	doublefree.stderr.exp doublefree.vgtest \
+	errs1.stderr.exp errs1.vgtest \
+	exitprog.stderr.exp exitprog.vgtest \
+	fprw.stderr.exp fprw.vgtest \
+	fwrite.stderr.exp fwrite.stdout.exp fwrite.vgtest \
+	inits.stderr.exp inits.vgtest \
+	inline.stderr.exp inline.stdout.exp inline.vgtest \
+	malloc1.stderr.exp malloc1.vgtest \
+	malloc2.stderr.exp malloc2.vgtest \
+	manuel1.stderr.exp manuel1.stdout.exp manuel1.vgtest \
+	manuel2.stderr.exp manuel2.stdout.exp manuel2.vgtest \
+	manuel3.stderr.exp manuel3.vgtest \
+	memalign_test.stderr.exp memalign_test.vgtest \
+	memcmptest.stderr.exp memcmptest.stdout.exp memcmptest.vgtest \
+	mismatches.stderr.exp mismatches.vgtest \
+	mmaptest.stderr.exp mmaptest.vgtest \
+	nanoleak.stderr.exp nanoleak.vgtest \
+	new_override.stderr.exp new_override.vgtest \
+	pushfpopf.stderr.exp pushfpopf.stdout.exp pushfpopf.vgtest \
+	realloc1.stderr.exp realloc1.vgtest \
+	realloc2.stderr.exp realloc2.vgtest \
+	sigaltstack.stderr.exp sigaltstack.vgtest \
+	signal2.stderr.exp signal2.stderr.exp.hd \
+	signal2.stdout.exp signal2.vgtest \
+	supp1.stderr.exp supp1.vgtest \
+	supp2.stderr.exp supp2.vgtest \
+	supp.supp \
+	suppfree.stderr.exp suppfree.vgtest \
+	trivialleak.stderr.exp trivialleak.vgtest \
+	tronical.stderr.exp tronical.vgtest \
+	weirdioctl.stderr.exp weirdioctl.stdout.exp weirdioctl.vgtest
+
 noinst_PROGRAMS = \
 	badaddrvalue badfree badjump badloop buflen_check \
 	doublefree errs1 exitprog fprw fwrite inits inline \
diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index 32c5a1b..4b33d07 100644
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -4,6 +4,38 @@
 ## These ones all work fine without producing errors in any skin.
 ##---------------------------------------------------------------------------
 
+noinst_SCRIPTS = filter_stderr
+
+EXTRA_DIST = \
+	$(noinst_SCRIPTS) \
+	bitfield1.stderr.exp bitfield1.stderr.exp.hd bitfield1.vgtest \
+	bt_everything.stderr.exp bt_everything.stderr.exp.hd \
+	bt_everything.stdout.exp bt_everything.vgtest \
+	bt_literal.stderr.exp bt_literal.stderr.exp.hd bt_literal.stdout.exp \
+	bt_literal.vgtest \
+	coolo_sigaction.stderr.exp coolo_sigaction.stderr.exp.hd \
+	coolo_sigaction.stdout.exp coolo_sigaction.vgtest \
+	coolo_strlen.stderr.exp coolo_strlen.stderr.exp.hd coolo_strlen.vgtest \
+	cpuid.stderr.exp cpuid.stderr.exp.hd cpuid.stdout.exp cpuid.vgtest \
+	dastest.stderr.exp dastest.stderr.exp.hd dastest.stdout.exp \
+	dastest.vgtest \
+	floored.stderr.exp floored.stderr.exp.hd floored.stdout.exp \
+	floored.vgtest \
+	fork.stderr.exp fork.stderr.exp.hd fork.stdout.exp fork.vgtest \
+	fucomip.stderr.exp fucomip.stderr.exp.hd fucomip.vgtest \
+	gxx304.stderr.exp gxx304.stderr.exp.hd gxx304.vgtest \
+	munmap_exe.stderr.exp munmap_exe.stderr.exp.hd munmap_exe.vgtest \
+	pth_blockedsig.stderr.exp pth_blockedsig.stderr.exp.hd \
+	pth_blockedsig.stdout.exp pth_blockedsig.vgtest \
+	rcl_assert.stderr.exp rcl_assert.stderr.exp.hd rcl_assert.vgtest \
+	rcrl.stderr.exp rcrl.stderr.exp.hd rcrl.stdout.exp rcrl.vgtest \
+	readline1.stderr.exp readline1.stderr.exp.hd readline1.stdout.exp \
+	readline1.vgtest \
+	sha1_test.stderr.exp sha1_test.stderr.exp.hd sha1_test.vgtest \
+	shortpush.stderr.exp shortpush.stderr.exp.hd shortpush.vgtest \
+	shorts.stderr.exp shorts.stderr.exp.hd shorts.vgtest \
+	smc1.stderr.exp smc1.stderr.exp.hd smc1.stdout.exp smc1.vgtest
+
 noinst_PROGRAMS = \
 	bitfield1 bt_everything bt_literal coolo_strlen \
 	cpuid dastest floored fork fucomip munmap_exe rcl_assert \