Get "make dist" closer to working again.

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

diff --git a/Makefile.am b/Makefile.am
index f8285beb8b6a7794a1d847938f4a47a0aad11eed..fc9c92facfda86b9058cc422d073ed45baa2d066 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,9 @@ TOOLS =               memcheck \
 ##             addrcheck \
 
 # Temporary: we want to compile Helgrind, but not regtest it.
-SUBDIRS =      include coregrind . docs tests auxprogs $(TOOLS) helgrind
+# 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
 
 SUPP_FILES = \

diff --git a/coregrind/m_aspacemgr/Makefile.am b/coregrind/m_aspacemgr/Makefile.am
index 30d62d2910b31005865a4193018e54c9b950f998..c9ea0cc8050e6c915818e4df9f38043552d84ba9 100644 (file)
--- a/coregrind/m_aspacemgr/Makefile.am
+++ b/coregrind/m_aspacemgr/Makefile.am
@@ -1,9 +1,6 @@
 include $(top_srcdir)/Makefile.all.am
 include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
 
-EXTRA_DIST = \
-       README_ASPACEMGR.txt
-
 noinst_LIBRARIES = libaspacemgr.a
 
 libaspacemgr_a_SOURCES = \

diff --git a/coregrind/m_sigframe/Makefile.am b/coregrind/m_sigframe/Makefile.am
index a7b1017baac730e2a0004130fb5121a6b13d1387..67ef249fbc6fe18c57e736bb1733c6861b332054 100644 (file)
--- a/coregrind/m_sigframe/Makefile.am
+++ b/coregrind/m_sigframe/Makefile.am
@@ -1,9 +1,6 @@
 include $(top_srcdir)/Makefile.all.am
 include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
 
-EXTRA_DIST = \
-       README_SIGFRAME.txt
-
 noinst_LIBRARIES = libsigframe.a
 
 libsigframe_a_SOURCES = \

diff --git a/memcheck/docs/mc-manual.xml b/memcheck/docs/mc-manual.xml
index 8c963d0f4968f127b3ab22e90c38ce9de9d7107d..3e9c310cf32dd1c73ce7b905a26fbf29f6e7773c 100644 (file)
--- a/memcheck/docs/mc-manual.xml
+++ b/memcheck/docs/mc-manual.xml
@@ -396,7 +396,7 @@ pointer-to-member to the destructor of the array's content just
 before the pointer actually returned.  This implies a
 variable-sized overhead in what's returned by
 <computeroutput>new</computeroutput> or
-<computeroutput>new[]</computeroutput>.
+<computeroutput>new[]</computeroutput>.</para>
 </sect2>
 
 

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index ac95d106ad97e3c4287c6e6824129bdc0dcf107a..fcf4f2e38c2838cc07a8c19dcc14e8b87e9d613f 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -58,7 +58,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        new_override.stderr.exp new_override.stdout.exp new_override.vgtest \
        null_socket.stderr.exp null_socket.vgtest \
        overlap.stderr.exp overlap.stdout.exp overlap.vgtest \
-       pointer-trace.vgtest pointer-trace.stdout.exp \
+       pointer-trace.vgtest \
        pointer-trace.stderr.exp pointer-trace.stderr.exp64 \
        post-syscall.stderr.exp post-syscall.stdout.exp post-syscall.vgtest \
        realloc1.stderr.exp realloc1.vgtest \
@@ -76,7 +76,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        toobig-allocs.stderr.exp toobig-allocs.vgtest \
        trivialleak.stderr.exp trivialleak.vgtest \
        weirdioctl.stderr.exp weirdioctl.stdout.exp weirdioctl.vgtest \
-       metadata.stderr.exp metadata.stdout.exp metadata.vgtest \
+       metadata.stderr.exp metadata.stdout.exp metadata.vgtest-HIDING \
        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 \