"make dist" fixes from Ralf Wildenhues.

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

diff --git a/Makefile.am b/Makefile.am
index fc9c92facfda86b9058cc422d073ed45baa2d066..7b583d3eb5acdc6a0511988c1fbf4f567c366cae 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,10 +14,11 @@ TOOLS =             memcheck \
 ##             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 349e44b4e8b258a78bdca53f0441e96c25e6b219..617887cb4f1b4c893ea5aa5439eac646594eff07 100644 (file)
--- a/corecheck/tests/Makefile.am
+++ b/corecheck/tests/Makefile.am
@@ -54,7 +54,7 @@ check_PROGRAMS = \
        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 8a1b9c4b0fb644e83808d4c4073ad0e94f8e31a8..262a5c76cc9aa6f0c650cac75f2a57aba10e45ec 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -65,6 +65,7 @@ noinst_HEADERS = \
        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 535255df278da692b8de3925df9202c3595f2281..0504bd5769142e17f524f1226d8d50e63b3f882e 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -6,6 +6,7 @@ incinc_HEADERS = \
        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 @@ incinc_HEADERS = \
        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                     \