From: Nicholas Nethercote <njn@valgrind.org>
Date: Sun, 19 Jun 2005 05:43:21 +0000 (+0000)
Subject: Get "make dist" closer to working again.
X-Git-Tag: svn/VALGRIND_3_0_0~372
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b2f4f4cba059da7d42b2574b45f0224aa523ef89;p=thirdparty%2Fvalgrind.git

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 f8285beb8b..fc9c92facf 100644
--- 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 30d62d2910..c9ea0cc805 100644
--- 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 a7b1017baa..67ef249fbc 100644
--- 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 8c963d0f49..3e9c310cf3 100644
--- 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 ac95d106ad..fcf4f2e38c 100644
--- 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 \