From 063fb8c69653d24c958dcb961312b921a308b9ad Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Tue, 13 Mar 2007 21:55:02 +0000
Subject: Merged revisions 499049 via svnmerge from
 https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid

........
  r499049 | gsim | 2007-01-23 10:12:27 -0500 (Tue, 23 Jan 2007) | 34 lines

  Patch from Jim Meyering (jim@meyering.net) submitted on dev list.

  Instrument all tests so that they are run via valgrind:
  check for both errors and leaks.

  * configure.ac: Add new configure options: --enable-valgrind
  and --disable-valgrind.  For now, the latter is the default.
  * README-dev: Document (and recommend) --enable-valgrind.
  * tests/.vg-supp: Add many more, from Gordon Sim for FC5.

  * configure.ac: Check for valgrind.
  * tests/Makefile.am (TESTS_ENVIRONMENT): Export VALGRIND.
  * tests/setup: New file.
  * tests/run-unit-tests: Use new "setup" file.
  Invoke DllPlugInTester via $vg (aka valgrind).
  Refer to the source directory using $pwd, since we're now running
  from a temporary subdirectory.
  * tests/run-python-tests: Remove traps. That is now done by "setup".
  [VERBOSE]: Print qpidd --version.
  Invoke qpidd via $vg and its absolute name.
  Add a kludgey "sleep 3", because it can take a while for libtool
  to start valgrind to start qpidd, in the background.
  Ideally, the python script would simply sleep-0.3-and-retry for
  a couple seconds, upon failure of the initial connection attempt.
  * tests/.vg-supp: New file, exempting known leaks on Debian/unstable.
  Some of these leaks appear to be legitimate.
  * tests/Makefile.am (EXTRA_DIST): Add .vg-supp and setup.

  * qpid-autotools-install (usage): Add a missing backslash.

  Fix "make distcheck" failure.
  * docs/api/Makefile.am (EXTRA_DIST): Add user.doxygen
........


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@517892 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/docs/api/Makefile.am | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'cpp/docs/api')

diff --git a/cpp/docs/api/Makefile.am b/cpp/docs/api/Makefile.am
index ed7a00b20c..a02e7dd084 100644
--- a/cpp/docs/api/Makefile.am
+++ b/cpp/docs/api/Makefile.am
@@ -1,22 +1,21 @@
-
 html: doxygen.tstamp
 
 dist-hook: html
 
-EXTRA_DIST=html
+EXTRA_DIST = \
+  html \
+  user.doxygen
 
 SOURCES = \
   $(wildcard $(top_srcdir)/gen/*.h) \
   $(wildcard $(top_srcdir)/lib/common/*.h) \
   $(wildcard $(top_srcdir)/lib/common/sys/*.h) \
   $(wildcard $(top_srcdir)/lib/common/framing/*.h) \
-  $(wildcard $(top_srcdir)/lib/client/*.h) 
+  $(wildcard $(top_srcdir)/lib/client/*.h)
 
 doxygen.tstamp: user.doxygen $(SOURCES)
-	doxygen user.doxygen
+	doxygen $(srcdir)/user.doxygen
 	touch $@
 
 clean-local:
 	rm -rf docs.tstamp html man latex doxygen.tstamp xml
-
-
-- 
cgit v1.2.1