"make dist" fixes from Ralf Wildenhues.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4010 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/Makefile.am b/Makefile.am
index fc9c92f..7b583d3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,10 +14,11 @@
## addrcheck \
# Temporary: we want to compile Helgrind, but not regtest it.
+# And we want to include Addrcheck in the distro, but not compile/test it.
# Put docs last because building the HTML is slow and we want to get
# everything else working before we try it.
SUBDIRS = include coregrind . tests auxprogs $(TOOLS) helgrind docs
-##DIST_SUBDIRS = $(SUBDIRS) helgrind
+DIST_SUBDIRS = $(SUBDIRS) addrcheck
SUPP_FILES = \
glibc-2.1.supp glibc-2.2.supp glibc-2.3.supp \
diff --git a/corecheck/tests/Makefile.am b/corecheck/tests/Makefile.am
index 349e44b..617887c 100644
--- a/corecheck/tests/Makefile.am
+++ b/corecheck/tests/Makefile.am
@@ -54,7 +54,7 @@
stack_changes vgprintf
AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g -O0
-AM_CPPFLAGS = -I$(top_builddir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CXXFLAGS = $(AM_CFLAGS)
vgprintf_SOURCES = vgprintf.c
diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index 8a1b9c4..262a5c7 100644
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -65,6 +65,7 @@
pub_core_skiplist.h \
pub_core_stacks.h \
pub_core_stacktrace.h \
+ pub_core_syscall.h \
pub_core_syswrap.h \
pub_core_threadmodel.h \
pub_core_threadstate.h \
diff --git a/include/Makefile.am b/include/Makefile.am
index 535255d..0504bd5 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -6,6 +6,7 @@
pub_tool_basics_asm.h \
pub_tool_aspacemgr.h \
pub_tool_cpuid.h \
+ pub_tool_debuginfo.h \
pub_tool_errormgr.h \
pub_tool_execontext.h \
pub_tool_hashtable.h \
@@ -22,8 +23,10 @@
pub_tool_profile.h \
pub_tool_redir.h \
pub_tool_replacemalloc.h \
+ pub_tool_signals.h \
pub_tool_skiplist.h \
pub_tool_stacktrace.h \
+ pub_tool_threadstate.h \
pub_tool_tooliface.h \
valgrind.h \
vki-linux.h \