Author: aconway
Date: Tue Apr 10 15:36:12 2007
New Revision: 527325
URL: http://svn.apache.org/viewvc?view=rev&rev=527325
Log:
* 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.
Added:
incubator/qpid/trunk/qpid/cpp/docs/api/developer.doxygen.in
- copied, changed from r527149,
incubator/qpid/trunk/qpid/cpp/docs/api/developer.doxygen
incubator/qpid/trunk/qpid/cpp/docs/api/doxygen_mk.sh (with props)
incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen.in
- copied, changed from r527149,
incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen
Removed:
incubator/qpid/trunk/qpid/cpp/docs/api/developer.doxygen
incubator/qpid/trunk/qpid/cpp/docs/api/doxygen.mk
incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen
Modified:
incubator/qpid/trunk/qpid/cpp/Makefile.am
incubator/qpid/trunk/qpid/cpp/configure.ac
incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am
incubator/qpid/trunk/qpid/cpp/rpm/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/tests/quick_topictest
Modified: incubator/qpid/trunk/qpid/cpp/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/Makefile.am?view=diff&rev=527325&r1=527324&r2=527325
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/Makefile.am Tue Apr 10 15:36:12 2007
@@ -16,11 +16,11 @@
# 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@/' $< > [EMAIL
PROTECTED]
mv [EMAIL PROTECTED] $@
MAINTAINERCLEANFILES = $(PACKAGE).spec
.PHONY: rpm srpm
-rpm srpm:
+rpm srpm: dist
cd rpm && $(MAKE) $(MAKEFLAGS_AM) $@
Modified: incubator/qpid/trunk/qpid/cpp/configure.ac
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/configure.ac?view=diff&rev=527325&r1=527324&r2=527325
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/configure.ac (original)
+++ incubator/qpid/trunk/qpid/cpp/configure.ac Tue Apr 10 15:36:12 2007
@@ -142,6 +142,8 @@
src/tests/Makefile
docs/man/Makefile
docs/api/Makefile
+ docs/api/user.doxygen
+ docs/api/developer.doxygen
rpm/Makefile
])
Modified: incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am?view=diff&rev=527325&r1=527324&r2=527325
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am Tue Apr 10 15:36:12 2007
@@ -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: \\" >> [EMAIL PROTECTED]
- find $(top_srcdir) -name "*.h" -exec echo " {} \\" \; >> [EMAIL
PROTECTED]
- echo >> [EMAIL PROTECTED]
- echo "html-dev: html\\" >> [EMAIL PROTECTED]
- find $(top_srcdir) -name "*.cpp" -exec echo " {} \\" \; >> [EMAIL
PROTECTED]
- echo >> [EMAIL PROTECTED]
- mv [EMAIL PROTECTED] $@
-
-force:
+html-dev: headers sources developer.doxygen
+ doxygen $(srcdir)/developer.doxygen
clean-local:
- rm -rf html html-dev *.deps
+ rm -rf html html-dev
Copied: incubator/qpid/trunk/qpid/cpp/docs/api/developer.doxygen.in (from
r527149, incubator/qpid/trunk/qpid/cpp/docs/api/developer.doxygen)
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/docs/api/developer.doxygen.in?view=diff&rev=527325&p1=incubator/qpid/trunk/qpid/cpp/docs/api/developer.doxygen&r1=527149&p2=incubator/qpid/trunk/qpid/cpp/docs/api/developer.doxygen.in&r2=527325
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/docs/api/developer.doxygen (original)
+++ incubator/qpid/trunk/qpid/cpp/docs/api/developer.doxygen.in Tue Apr 10
15:36:12 2007
@@ -464,7 +464,7 @@
# 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 @@
# 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
Added: incubator/qpid/trunk/qpid/cpp/docs/api/doxygen_mk.sh
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/docs/api/doxygen_mk.sh?view=auto&rev=527325
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/docs/api/doxygen_mk.sh (added)
+++ incubator/qpid/trunk/qpid/cpp/docs/api/doxygen_mk.sh Tue Apr 10 15:36:12
2007
@@ -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"
Propchange: incubator/qpid/trunk/qpid/cpp/docs/api/doxygen_mk.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/trunk/qpid/cpp/docs/api/doxygen_mk.sh
------------------------------------------------------------------------------
svn:executable = *
Copied: incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen.in (from r527149,
incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen)
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen.in?view=diff&rev=527325&p1=incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen&r1=527149&p2=incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen.in&r2=527325
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen (original)
+++ incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen.in Tue Apr 10 15:36:12
2007
@@ -467,7 +467,7 @@
# 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 @@
# 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
Modified: incubator/qpid/trunk/qpid/cpp/rpm/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/rpm/Makefile.am?view=diff&rev=527325&r1=527324&r2=527325
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/rpm/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/rpm/Makefile.am Tue Apr 10 15:36:12 2007
@@ -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)
+
+
Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?view=diff&rev=527325&r1=527324&r2=527325
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Tue Apr 10 15:36:12 2007
@@ -6,47 +6,47 @@
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 @@
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 @@
$(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
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am?view=diff&rev=527325&r1=527324&r2=527325
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am Tue Apr 10 15:36:12 2007
@@ -62,20 +62,19 @@
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 @@
# 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
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/quick_topictest
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/quick_topictest?view=diff&rev=527325&r1=527324&r2=527325
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/quick_topictest (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/quick_topictest Tue Apr 10 15:36:12
2007
@@ -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
