* docs/api/*: Fixed API doc generation to work with VPATH builds.

* src/Makefile.am:
  - Added missing .h files in distribution.
* src & tests Makefile.am:
 - Made generated .mk fragments maintaner-clean, not distclean, otherwise
   distclean followed by a VPATH build fails.
* cpp/src/tests/quick_topictest: cat error log on failure.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@527325 13f79535-47bb-0310-9956-ffa450edef68

11 files changed, 282 insertions, 267 deletions

diff --git a/cpp/Makefile.am b/cpp/Makefile.am
index 2ae53a7181..1d6c142109 100644
--- a/cpp/Makefile.am
+++ b/cpp/Makefile.am
@@ -16,11 +16,11 @@ libtool: $(LIBTOOL_DEPS)
 # This cannot be done by AC_CONFIG_FILES, because automake's
 # make distcheck target does not like auto-generated files
 # being included in the distributed archive.
-qpidc.spec: %: %.in
+$(PACKAGE).spec: %: %.in
 	sed 's/@''PACKAGE@/@PACKAGE@/;s/@''VERSION@/@VERSION@/' $< > $@-tmp
 	mv $@-tmp $@
 MAINTAINERCLEANFILES = $(PACKAGE).spec
 
 .PHONY: rpm srpm
-rpm srpm:
+rpm srpm: dist
 	cd rpm && $(MAKE) $(MAKEFLAGS_AM) $@
diff --git a/cpp/configure.ac b/cpp/configure.ac
index 2a9eabac61..53989dcdbc 100644
--- a/cpp/configure.ac
+++ b/cpp/configure.ac
@@ -142,6 +142,8 @@ AC_CONFIG_FILES([
   src/tests/Makefile
   docs/man/Makefile
   docs/api/Makefile
+  docs/api/user.doxygen
+  docs/api/developer.doxygen
   rpm/Makefile
   ])
 
diff --git a/cpp/docs/api/Makefile.am b/cpp/docs/api/Makefile.am
index 2b05622d2d..cd54e20d60 100644
--- a/cpp/docs/api/Makefile.am
+++ b/cpp/docs/api/Makefile.am
@@ -3,28 +3,20 @@
 # Generate dependency files so its rebuilt only when needed. 
 #
 
-EXTRA_DIST = html user.doxygen
+EXTRA_DIST = html user.doxygen developer.doxygen
 
 dist-hook: html
 
-html: doxygen.mk
-	make -f doxygen.mk $@
+src=$(top_srcdir)/src
 
-html-dev: doxygen.mk
-	make -f doxygen.mk $@
+headers: $(src)/*.h $(src)/*/*.h $(src)/*/*/*.h
+sources: $(src)/*.cpp $(src)/*/*.cpp $(src)/*/*/*.cpp
 
-doxygen.mk: doxygen.deps
+html: headers user.doxygen
+	doxygen $(srcdir)/user.doxygen
 
-doxygen.deps: force
-	echo "html: \\" >> $@-t
-	find $(top_srcdir) -name "*.h" -exec echo "  {} \\" \; >> $@-t
-	echo >> $@-t
-	echo "html-dev: html\\" >> $@-t
-	find $(top_srcdir) -name "*.cpp" -exec echo "  {} \\" \; >> $@-t
-	echo >> $@-t
-	mv $@-t $@
-
-force:
+html-dev: headers sources developer.doxygen
+	doxygen $(srcdir)/developer.doxygen
 
 clean-local:
-	rm -rf html html-dev *.deps
+	rm -rf html html-dev 
diff --git a/cpp/docs/api/developer.doxygen b/cpp/docs/api/developer.doxygen.in
index 46661c14ca..b267b12b90 100644
--- a/cpp/docs/api/developer.doxygen
+++ b/cpp/docs/api/developer.doxygen.in
@@ -464,7 +464,7 @@ WARN_LOGFILE           = doxygen.log
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT      		= ../../lib ../../gen ../../src
+INPUT      		= @abs_top_srcdir@/src
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
@@ -484,7 +484,7 @@ RECURSIVE              = YES
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = 
+EXCLUDE                = test
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
 # directories that are symbolic links (a Unix filesystem feature) are excluded 
diff --git a/cpp/docs/api/doxygen.mk b/cpp/docs/api/doxygen.mk
deleted file mode 100644
index 8429eb42b7..0000000000
--- a/cpp/docs/api/doxygen.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-include doxygen.deps
-
-html: user.doxygen 
-	doxygen user.doxygen
-	touch $@
-
-html-dev: developer.doxygen
-	doxygen developer.doxygen
-	touch $@
diff --git a/cpp/docs/api/doxygen_mk.sh b/cpp/docs/api/doxygen_mk.sh
new file mode 100755
index 0000000000..ba65531e04
--- /dev/null
+++ b/cpp/docs/api/doxygen_mk.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# Generate makefile for doxygen with dependencies on source files.
+# 
+
+deps() {
+    find "$top_srcdir/src" -name "$2" -exec echo -ne '\\\n  {} ' \;
+    echo ; echo
+}
+
+cat <<EOF
+html: user.doxygen
+	doxygen $srcdir/user.doxygen
+html-dev: developer.doxygen
+	doxygen $srcdir/developer.doxygen
+EOF
+
+deps "html: " "*.h"
+deps "html-dev: html " "*.cpp"
diff --git a/cpp/docs/api/user.doxygen b/cpp/docs/api/user.doxygen.in
index 0d92dc283b..9084cbd679 100644
--- a/cpp/docs/api/user.doxygen
+++ b/cpp/docs/api/user.doxygen.in
@@ -467,7 +467,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT      		= ../../lib/common ../../lib/client ../../gen
+INPUT      		= @abs_top_srcdir@/src
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
@@ -487,7 +487,7 @@ RECURSIVE              = YES
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = 
+EXCLUDE                = test
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
 # directories that are symbolic links (a Unix filesystem feature) are excluded 
diff --git a/cpp/rpm/Makefile.am b/cpp/rpm/Makefile.am
index 363a444f4f..ddcbea868c 100644
--- a/cpp/rpm/Makefile.am
+++ b/cpp/rpm/Makefile.am
@@ -2,26 +2,25 @@
 # Build RPMs from the distribution tarball.
 #
 
-# TODO aconway 2006-12-21: use autoconf macros for version, base name etc.
-
 SPEC=${top_srcdir}/qpidc.spec
 RPMOPTS=--define "_sourcedir ${abs_top_srcdir}" --define "_topdir ${abs_builddir}"
+DIRS="BUILD  RPMS  SOURCES  SPECS  SRPMS"
 
 clean-local:
-	-rm -rf BUILD  RPMS  SOURCES  SPECS  SRPMS
+	-rm -rf $(DIRS)
 
-.PHONY: rpm srpm dist
+.PHONY: rpm srpm
 
 # Build source and binary RPMs.
-rpm: dist
+rpm: $(DIRS)
 	rpmbuild $(RPMOPTS) $(RPMEXTRAOPTS) -ba $(SPEC)
 	rpmlint RPMS/*/*.rpm	
 
 # Build source RPM only.
-srpm: dist
+srpm: $(DIRS)
 	rpmbuild $(RPMOPTS) -bs $(SPEC)
 
-# Build source distribution and create required subdirs.
-dist:
-	cd .. && $(MAKE) $(AM_MAKEFLAGS) dist
-	mkdir -p BUILD  RPMS  SOURCES  SPECS  SRPMS
+$(DIRS):
+	mkdir -p $(DIRS)
+
+
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index 50f271697d..275af89ce9 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -6,47 +6,47 @@ SUBDIRS = . tests
 
 AM_CXXFLAGS = $(WARNING_CFLAGS)
 
-INCLUDES =				\
-  -I$(srcdir)/gen			\
+INCLUDES = \
+  -I$(srcdir)/gen \
   $(APR_CXXFLAGS)
 
-qpidd_LDADD =                         \
-  libqpidbroker.la        \
+qpidd_LDADD = \
+  libqpidbroker.la \
   libqpidcommon.la
 
 sbin_PROGRAMS = qpidd
 qpidd_SOURCES = qpidd.cpp
 
 apr = sys/apr
-apr_src =			\
-  $(apr)/APRAcceptor.cpp	\
-  $(apr)/APRBase.cpp		\
-  $(apr)/APRPool.cpp		\
-  $(apr)/APRSocket.cpp		\
-  $(apr)/LFProcessor.cpp	\
-  $(apr)/LFSessionContext.cpp	\
-  $(apr)/Socket.cpp		\
+apr_src = \
+  $(apr)/APRAcceptor.cpp \
+  $(apr)/APRBase.cpp \
+  $(apr)/APRPool.cpp \
+  $(apr)/APRSocket.cpp \
+  $(apr)/LFProcessor.cpp \
+  $(apr)/LFSessionContext.cpp \
+  $(apr)/Socket.cpp \
   $(apr)/Thread.cpp
 
-apr_hdr =			\
-  $(apr)/APRBase.h		\
-  $(apr)/APRPool.h		\
-  $(apr)/APRSocket.h		\
-  $(apr)/LFProcessor.h		\
+apr_hdr = \
+  $(apr)/APRBase.h \
+  $(apr)/APRPool.h \
+  $(apr)/APRSocket.h \
+  $(apr)/LFProcessor.h \
   $(apr)/LFSessionContext.h	
 
 posix = sys/posix
-posix_src =				\
-  $(posix)/PosixAcceptor.cpp		\
-  $(posix)/Socket.cpp			\
-  $(posix)/Thread.cpp			\
-  $(posix)/check.cpp			\
-  $(posix)/EventChannel.cpp		\
+posix_src = \
+  $(posix)/PosixAcceptor.cpp \
+  $(posix)/Socket.cpp \
+  $(posix)/Thread.cpp \
+  $(posix)/check.cpp \
+  $(posix)/EventChannel.cpp \
   $(posix)/EventChannelThreads.cpp
 
-posix_hdr = 				\
-  $(posix)/check.h			\
-  $(posix)/EventChannel.h		\
+posix_hdr = \
+  $(posix)/check.h \
+  $(posix)/EventChannel.h \
   $(posix)/EventChannelThreads.h
 
 EXTRA_DIST=$(posix_src) $(posix_hdr)
@@ -60,137 +60,87 @@ client = client
 
 lib_LTLIBRARIES = libqpidcommon.la libqpidbroker.la libqpidclient.la
 
-libqpidcommon_la_LIBADD =		\
-  $(APR_LIBS)			\
-  $(LIB_DLOPEN)			\
+libqpidcommon_la_LIBADD = \
+  $(APR_LIBS) \
+  $(LIB_DLOPEN) \
   $(LIB_CLOCK_GETTIME)
 
-libqpidcommon_la_LDFLAGS =		\
-  -version-info			\
+libqpidcommon_la_LDFLAGS = \
+  -version-info \
   $(LIBTOOL_VERSION_INFO_ARG)
 
-libqpidcommon_la_SOURCES =			\
-  $(platform_src)				\
-  $(framing)/AMQBody.cpp			\
-  $(framing)/AMQRequestBody.cpp			\
-  $(framing)/AMQResponseBody.cpp		\
-  $(framing)/AMQContentBody.cpp			\
-  $(framing)/AMQFrame.cpp			\
-  $(framing)/AMQHeaderBody.cpp			\
-  $(framing)/AMQHeartbeatBody.cpp		\
-  $(framing)/AMQMethodBody.cpp			\
-  $(framing)/MethodContext.cpp			\
-  $(framing)/BasicHeaderProperties.cpp		\
-  $(framing)/BodyHandler.cpp			\
-  $(framing)/ChannelAdapter.cpp			\
-  $(framing)/Buffer.cpp				\
-  $(framing)/FieldTable.cpp			\
-  $(framing)/FramingContent.cpp			\
-  $(framing)/InitiationHandler.cpp		\
-  $(framing)/ProtocolInitiation.cpp		\
-  $(framing)/ProtocolVersion.cpp		\
-  $(framing)/ProtocolVersionException.cpp	\
-  $(framing)/Requester.cpp			\
-  $(framing)/Responder.cpp			\
-  $(framing)/Correlator.cpp			\
-  $(framing)/Value.cpp				\
-  $(framing)/Proxy.cpp				\
-  $(gen)/AMQP_ClientProxy.cpp			\
-  $(gen)/AMQP_HighestVersion.h			\
-  $(gen)/AMQP_MethodVersionMap.cpp		\
-  $(gen)/AMQP_ServerProxy.cpp			\
-  Exception.cpp					\
-  ExceptionHolder.cpp				\
-  QpidError.cpp					\
-  sys/Runnable.cpp				\
-  sys/Time.cpp					\
+libqpidcommon_la_SOURCES = \
+  $(platform_src) \
+  $(framing)/AMQBody.cpp \
+  $(framing)/AMQRequestBody.cpp \
+  $(framing)/AMQResponseBody.cpp \
+  $(framing)/AMQContentBody.cpp \
+  $(framing)/AMQFrame.cpp \
+  $(framing)/AMQHeaderBody.cpp \
+  $(framing)/AMQHeartbeatBody.cpp \
+  $(framing)/AMQMethodBody.cpp \
+  $(framing)/MethodContext.cpp \
+  $(framing)/BasicHeaderProperties.cpp \
+  $(framing)/BodyHandler.cpp \
+  $(framing)/ChannelAdapter.cpp \
+  $(framing)/Buffer.cpp \
+  $(framing)/FieldTable.cpp \
+  $(framing)/FramingContent.cpp \
+  $(framing)/InitiationHandler.cpp \
+  $(framing)/ProtocolInitiation.cpp \
+  $(framing)/ProtocolVersion.cpp \
+  $(framing)/ProtocolVersionException.cpp \
+  $(framing)/Requester.cpp \
+  $(framing)/Responder.cpp \
+  $(framing)/Correlator.cpp \
+  $(framing)/Value.cpp \
+  $(framing)/Proxy.cpp \
+  $(gen)/AMQP_ClientProxy.cpp \
+  $(gen)/AMQP_HighestVersion.h \
+  $(gen)/AMQP_MethodVersionMap.cpp \
+  $(gen)/AMQP_ServerProxy.cpp \
+  Exception.cpp \
+  ExceptionHolder.cpp \
+  QpidError.cpp \
+  sys/Runnable.cpp \
+  sys/Time.cpp \
   sys/ProducerConsumer.cpp
 
 libqpidbroker_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG)
-libqpidbroker_la_SOURCES =			\
-  $(broker)/AccumulatedAck.cpp				\
-  $(broker)/AccumulatedAck.h				\
-  $(broker)/AutoDelete.cpp				\
-  $(broker)/AutoDelete.h					\
-  $(broker)/Binding.h					\
-  $(broker)/Broker.cpp					\
-  $(broker)/Broker.h					\
-  $(broker)/BrokerAdapter.cpp				\
-  $(broker)/BrokerAdapter.h				\
-  $(broker)/BrokerSingleton.cpp				\
-  $(broker)/BrokerSingleton.h				\
-  $(broker)/BrokerChannel.cpp				\
-  $(broker)/BrokerChannel.h				\
-  $(broker)/BrokerExchange.h				\
-  $(broker)/BrokerMessage.cpp				\
-  $(broker)/BrokerMessage.h				\
-  $(broker)/BrokerMessageMessage.cpp				\
-  $(broker)/BrokerMessageMessage.h				\
-  $(broker)/BrokerQueue.cpp				\
-  $(broker)/BrokerQueue.h					\
-  $(broker)/Configuration.cpp				\
-  $(broker)/Configuration.h				\
-  $(broker)/Connection.cpp				\
-  $(broker)/Connection.h					\
-  $(broker)/ConnectionFactory.cpp				\
-  $(broker)/ConnectionFactory.h				\
-  $(broker)/ConnectionToken.h				\
-  $(broker)/Consumer.h					\
-  $(broker)/Content.h					\
-  $(broker)/Deliverable.h					\
-  $(broker)/DeliverableMessage.cpp			\
-  $(broker)/DeliverableMessage.h				\
-  $(broker)/DeliveryRecord.cpp				\
-  $(broker)/DeliveryRecord.h				\
-  $(broker)/DirectExchange.cpp				\
-  $(broker)/DirectExchange.h				\
-  $(broker)/ExchangeRegistry.cpp				\
-  $(broker)/ExchangeRegistry.h				\
-  $(broker)/FanOutExchange.cpp				\
-  $(broker)/FanOutExchange.h				\
-  $(broker)/HeadersExchange.cpp				\
-  $(broker)/HeadersExchange.h				\
-  $(broker)/InMemoryContent.cpp				\
-  $(broker)/InMemoryContent.h				\
-  $(broker)/LazyLoadedContent.cpp				\
-  $(broker)/LazyLoadedContent.h				\
-  $(broker)/MessageBuilder.cpp				\
-  $(broker)/MessageBuilder.h				\
-  $(broker)/MessageHandlerImpl.cpp			\
-  $(broker)/MessageHandlerImpl.h				\
-  $(broker)/MessageStore.h				\
-  $(broker)/MessageStoreModule.cpp			\
-  $(broker)/MessageStoreModule.h				\
-  $(broker)/NameGenerator.cpp				\
-  $(broker)/NameGenerator.h				\
-  $(broker)/NullMessageStore.cpp				\
-  $(broker)/NullMessageStore.h				\
-  $(broker)/Persistable.h					\
-  $(broker)/PersistableExchange.h				\
-  $(broker)/PersistableMessage.h				\
-  $(broker)/PersistableQueue.h				\
-  $(broker)/Prefetch.h					\
-  $(broker)/QueuePolicy.cpp				\
-  $(broker)/QueuePolicy.h					\
-  $(broker)/QueueRegistry.cpp				\
-  $(broker)/QueueRegistry.h				\
-  $(broker)/RecoverableMessage.h                          \
-  $(broker)/RecoverableQueue.h                            \
-  $(broker)/RecoveryManager.h				\
-  $(broker)/RecoveryManagerImpl.cpp			\
-  $(broker)/RecoveryManagerImpl.h				\
-  $(broker)/Reference.cpp					\
-  $(broker)/Reference.h					\
-  $(broker)/TopicExchange.cpp				\
-  $(broker)/TopicExchange.h				\
-  $(broker)/TransactionalStore.h				\
-  $(broker)/TxAck.cpp					\
-  $(broker)/TxAck.h					\
-  $(broker)/TxBuffer.cpp					\
-  $(broker)/TxBuffer.h					\
-  $(broker)/TxOp.h					\
-  $(broker)/TxPublish.cpp					\
-  $(broker)/TxPublish.h
+libqpidbroker_la_SOURCES = \
+  $(broker)/AccumulatedAck.cpp \
+  $(broker)/AutoDelete.cpp \
+  $(broker)/Broker.cpp \
+  $(broker)/BrokerAdapter.cpp \
+  $(broker)/BrokerSingleton.cpp \
+  $(broker)/BrokerChannel.cpp \
+  $(broker)/BrokerMessage.cpp \
+  $(broker)/BrokerMessageMessage.cpp \
+  $(broker)/BrokerQueue.cpp \
+  $(broker)/Configuration.cpp \
+  $(broker)/Connection.cpp \
+  $(broker)/ConnectionFactory.cpp \
+  $(broker)/DeliverableMessage.cpp \
+  $(broker)/DeliveryRecord.cpp \
+  $(broker)/DirectExchange.cpp \
+  $(broker)/ExchangeRegistry.cpp \
+  $(broker)/FanOutExchange.cpp \
+  $(broker)/HeadersExchange.cpp \
+  $(broker)/InMemoryContent.cpp \
+  $(broker)/LazyLoadedContent.cpp \
+  $(broker)/MessageBuilder.cpp \
+  $(broker)/MessageHandlerImpl.cpp \
+  $(broker)/MessageStoreModule.cpp \
+  $(broker)/NameGenerator.cpp \
+  $(broker)/NullMessageStore.cpp \
+  $(broker)/QueuePolicy.cpp \
+  $(broker)/QueueRegistry.cpp \
+  $(broker)/RecoveryManagerImpl.cpp \
+  $(broker)/Reference.cpp \
+  $(broker)/TopicExchange.cpp \
+  $(broker)/TxAck.cpp \
+  $(broker)/TxBuffer.cpp \
+  $(broker)/TxPublish.cpp
 
 libqpidclient_la_LIBADD = libqpidcommon.la
 libqpidclient_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG)
@@ -206,78 +156,139 @@ libqpidclient_la_SOURCES =			\
   $(client)/MessageListener.cpp				\
   $(client)/ResponseHandler.cpp				\
   $(client)/ReturnedMessageHandler.cpp
-  
-nobase_pkginclude_HEADERS =			\
-  $(gen)/AMQP_HighestVersion.h			\
-  $(platform_hdr)				\
-  $(framing)/AMQBody.h				\
-  $(framing)/AMQContentBody.h			\
-  $(framing)/AMQDataBlock.h			\
-  $(framing)/AMQFrame.h				\
-  $(framing)/AMQHeaderBody.h			\
-  $(framing)/AMQHeartbeatBody.h			\
-  $(framing)/AMQMethodBody.h			\
-  $(framing)/MethodContext.h			\
-  $(framing)/BasicHeaderProperties.h		\
-  $(framing)/BodyHandler.h			\
-  $(framing)/ChannelAdapter.h			\
-  $(framing)/Buffer.h				\
-  $(framing)/FieldTable.h			\
-  $(framing)/FramingContent.h			\
-  $(framing)/HeaderProperties.h			\
-  $(framing)/InitiationHandler.h		\
-  $(framing)/InputHandler.h			\
-  $(framing)/OutputHandler.h			\
-  $(framing)/ProtocolInitiation.h		\
-  $(framing)/ProtocolVersion.h			\
-  $(framing)/ProtocolVersionException.h		\
-  $(framing)/Value.h				\
-  $(framing)/amqp_framing.h			\
-  $(framing)/amqp_types.h			\
-  $(framing)/Proxy.h				\
-  $(client)/AckMode.h					\
-  $(client)/ClientChannel.h				\
-  $(client)/ClientExchange.h				\
-  $(client)/ClientMessage.h				\
-  $(client)/ClientQueue.h					\
-  $(client)/Connection.h					\
-  $(client)/Connector.h					\
-  $(client)/IncomingMessage.h				\
-  $(client)/MessageChannel.h				\
-  $(client)/BasicMessageChannel.h				\
-  $(client)/MessageMessageChannel.h		\
-  $(client)/MessageListener.h			\
-  $(client)/MethodBodyInstances.h		\
-  $(client)/ResponseHandler.h			\
-  $(client)/ReturnedMessageHandler.h		\
-  shared_ptr.h					\
-  Exception.h					\
-  ExceptionHolder.h				\
-  QpidError.h					\
-  SharedObject.h				\
-  sys/Acceptor.h				\
-  sys/AtomicCount.h				\
-  sys/Module.h					\
-  sys/Monitor.h					\
-  sys/Mutex.h					\
-  sys/Runnable.h				\
-  sys/ConnectionOutputHandler.h			\
-  sys/ConnectionInputHandler.h			\
-  sys/ConnectionInputHandlerFactory.h		\
-  sys/ShutdownHandler.h				\
-  sys/Socket.h					\
-  sys/Thread.h					\
-  sys/Time.h					\
-  sys/TimeoutHandler.h				\
-  sys/ProducerConsumer.h
 
-# This is gmake specific
-nobase_pkginclude_HEADERS += $(generated_headers)
+nobase_pkginclude_HEADERS = \
+  $(generated_headers) \
+  $(platform_hdr) \
+  $(broker)/AccumulatedAck.h \
+  $(broker)/AutoDelete.h \
+  $(broker)/BrokerChannel.h \
+  $(broker)/BrokerExchange.h \
+  $(broker)/BrokerMessage.h \
+  $(broker)/BrokerMessageBase.h \
+  $(broker)/BrokerQueue.h \
+  $(broker)/CompletionHandler.h \
+  $(broker)/Configuration.h \
+  $(broker)/Consumer.h \
+  $(broker)/Deliverable.h \
+  $(broker)/DeliverableMessage.h \
+  $(broker)/DirectExchange.h \
+  $(broker)/ExchangeRegistry.h \
+  $(broker)/FanOutExchange.h \
+  $(broker)/HandlerImpl.h \
+  $(broker)/InMemoryContent.h \
+  $(broker)/MessageBuilder.h \
+  $(broker)/MessageHandlerImpl.h \
+  $(broker)/MessageStoreModule.h \
+  $(broker)/NameGenerator.h \
+  $(broker)/NullMessageStore.h \
+  $(broker)/Persistable.h \
+  $(broker)/Prefetch.h \
+  $(broker)/QueueRegistry.h \
+  $(broker)/RecoverableMessage.h \
+  $(broker)/RecoverableQueue.h \
+  $(broker)/RecoveryManager.h \
+  $(broker)/Reference.h \
+  $(broker)/TxBuffer.h \
+  $(broker)/TxOp.h \
+  $(broker)/TxPublish.h \
+  $(broker)/Broker.h \
+  $(broker)/BrokerAdapter.h \
+  $(broker)/BrokerMessageMessage.h \
+  $(broker)/BrokerSingleton.h \
+  $(broker)/Connection.h \
+  $(broker)/ConnectionFactory.h \
+  $(broker)/ConnectionToken.h \
+  $(broker)/Content.h \
+  $(broker)/DeliveryRecord.h \
+  $(broker)/HeadersExchange.h \
+  $(broker)/LazyLoadedContent.h \
+  $(broker)/MessageStore.h \
+  $(broker)/PersistableExchange.h \
+  $(broker)/PersistableMessage.h \
+  $(broker)/PersistableQueue.h \
+  $(broker)/QueuePolicy.h \
+  $(broker)/RecoveryManagerImpl.h \
+  $(broker)/TopicExchange.h \
+  $(broker)/TransactionalStore.h \
+  $(broker)/TxAck.h \
+  $(client)/AckMode.h \
+  $(client)/BasicMessageChannel.h \
+  $(client)/ClientAdapter.h \
+  $(client)/ClientChannel.h \
+  $(client)/ClientExchange.h \
+  $(client)/ClientMessage.h \
+  $(client)/ClientQueue.h \
+  $(client)/Connection.h \
+  $(client)/Connector.h \
+  $(client)/IncomingMessage.h \
+  $(client)/MessageChannel.h \
+  $(client)/MessageListener.h \
+  $(client)/MessageMessageChannel.h \
+  $(client)/MethodBodyInstances.h \
+  $(client)/ResponseHandler.h \
+  $(client)/ReturnedMessageHandler.h \
+  $(framing)/AMQBody.h \
+  $(framing)/AMQContentBody.h \
+  $(framing)/AMQDataBlock.h \
+  $(framing)/AMQFrame.h \
+  $(framing)/AMQHeaderBody.h \
+  $(framing)/AMQHeartbeatBody.h \
+  $(framing)/AMQMethodBody.h \
+  $(framing)/AMQRequestBody.h \
+  $(framing)/AMQResponseBody.h \
+  $(framing)/BasicHeaderProperties.h \
+  $(framing)/BodyHandler.h \
+  $(framing)/Buffer.h \
+  $(framing)/ChannelAdapter.h \
+  $(framing)/Correlator.h \
+  $(framing)/FieldTable.h \
+  $(framing)/FramingContent.h \
+  $(framing)/HeaderProperties.h \
+  $(framing)/InitiationHandler.h \
+  $(framing)/InputHandler.h \
+  $(framing)/MethodContext.h \
+  $(framing)/OutputHandler.h \
+  $(framing)/ProtocolInitiation.h \
+  $(framing)/ProtocolVersion.h \
+  $(framing)/ProtocolVersionException.h \
+  $(framing)/Proxy.h \
+  $(framing)/Requester.h \
+  $(framing)/Responder.h \
+  $(framing)/Value.h \
+  $(framing)/amqp_framing.h \
+  $(framing)/amqp_types.h \
+  $(framing)/amqp_types_full.h \
+  sys/Acceptor.h \
+  sys/AtomicCount.h \
+  sys/Condition.h \
+  sys/ConnectionInputHandler.h \
+  sys/ConnectionInputHandlerFactory.h \
+  sys/ConnectionOutputHandler.h \
+  sys/Module.h \
+  sys/Monitor.h \
+  sys/Mutex.h \
+  sys/ProducerConsumer.h \
+  sys/Runnable.h \
+  sys/ScopedIncrement.h \
+  sys/ShutdownHandler.h \
+  sys/Socket.h \
+  sys/Thread.h \
+  sys/ThreadSafeQueue.h \
+  sys/Time.h \
+  sys/TimeoutHandler.h \
+  Exception.h \
+  ExceptionHolder.h \
+  QpidError.h \
+  SharedObject.h \
+  doxygen_mainpage.h \
+  shared_ptr.h 
 
 # Distribute the generated sources, at least for now, since
 # the generator code is in java.
 EXTRA_DIST += $(BUILT_SOURCES)
-DISTCLEANFILES = $(BUILT_SOURCES) $(gen)/timestamp $(gen)/gen-src.mk
+maintainer-clean-local:
+	rm -rf $(gen)
 
 # Don't attempt to run the code generator unless configure has set
 # CAN_GENERATE_CODE, indicating that the amqp.xml and tools needed
diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am
index a5d1fdbab5..0c5e43c5ca 100644
--- a/cpp/src/tests/Makefile.am
+++ b/cpp/src/tests/Makefile.am
@@ -62,20 +62,19 @@ CLIENT_TESTS = client_test quick_topictest
 TESTS = run-unit-tests start_broker $(CLIENT_TESTS) python_tests kill_broker
 
 EXTRA_DIST =		\
-  $(TESTS) 		\
-  .vg-supp		\
-  .valgrindrc.default   \
+  run-unit-tests start_broker python_tests kill_broker \
+  .valgrind.supp	\
+  .valgrindrc-default   \
   InProcessBroker.h	\
   MockChannel.h		\
   MockConnectionInputHandler.h \
   qpid_test_plugin.h	\
   test_env		\
-  topicall		\
   topictest		\
   APRBaseTest.cpp
 
 CLEANFILES=qpidd.log
-DISTCLEANFILES=gen.mk
+MAINTAINERCLEANFILES=gen.mk
 
 include gen.mk
 
@@ -115,5 +114,5 @@ check-unit:
 
 # Create a copy so user can modify without risk of checking in their mods.
 .valgrindrc: .valgrindrc-default
-	cp .valgrindrc-default .valgrindrc
+	cp $(srcdir)/.valgrindrc-default .valgrindrc
 
diff --git a/cpp/src/tests/quick_topictest b/cpp/src/tests/quick_topictest
index 9df5b5c84c..b1e63b9350 100755
--- a/cpp/src/tests/quick_topictest
+++ b/cpp/src/tests/quick_topictest
@@ -1,7 +1,9 @@
 #!/bin/sh
 # Quick and quiet topic test for make check.
-./topictest -s2 -m2 -b1 > topictest.log 2>&1 || {
-    echo See topictest.log.
+test -z "$srcdir" && srcdir=.
+$srcdir/topictest -s2 -m2 -b1 > topictest.log 2>&1 || {
+    echo $0 FAILED:
+    cat topictest.log
     exit 1
 }
 rm topictest.log