summaryrefslogtreecommitdiff
path: root/cpp/src/Makefile.am
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2007-06-07 14:29:24 +0000
committerAlan Conway <aconway@apache.org>2007-06-07 14:29:24 +0000
commit50cd0cd44deb7b5c90e71eed1c9f3cf1666a70fe (patch)
tree640da8126854a4e07c11ca73216b932c84e9d445 /cpp/src/Makefile.am
parentfca1397c9ee37e92b57fd419186182cbec567435 (diff)
downloadqpid-python-50cd0cd44deb7b5c90e71eed1c9f3cf1666a70fe.tar.gz
Build support for clustering, initial CPG wrapper & tests.
- src/qpid/cluster/Cpg.cpp: C++ wrapper for the openais CPG library. - src/tests/unit/Cpg.cpp: verify CPG functions in make check. - makefiles etc.: build cluster stuff only if openais is installed. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@545190 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/Makefile.am')
-rw-r--r--cpp/src/Makefile.am24
1 files changed, 14 insertions, 10 deletions
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index abc081a6a5..02044be01b 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -103,6 +103,10 @@ endif
lib_LTLIBRARIES = libqpidcommon.la libqpidbroker.la libqpidclient.la
+if CLUSTER
+include cluster.mk
+endif
+
# The logger library uses boost::date_time to format time.
# We have to disable the unused parameters warning to get around
# unused parameters in boost::date_time headers. So we build it
@@ -209,16 +213,16 @@ libqpidbroker_la_SOURCES = \
libqpidclient_la_LIBADD = libqpidcommon.la
libqpidclient_la_SOURCES = \
- qpid/client/ClientConnection.cpp \
- qpid/client/ClientChannel.cpp \
- qpid/client/ClientExchange.cpp \
- qpid/client/ClientQueue.cpp \
- qpid/client/BasicMessageChannel.cpp \
- qpid/client/MessageMessageChannel.cpp \
- qpid/client/Connector.cpp \
- qpid/client/IncomingMessage.cpp \
- qpid/client/MessageListener.cpp \
- qpid/client/ResponseHandler.cpp \
+ qpid/client/ClientConnection.cpp \
+ qpid/client/ClientChannel.cpp \
+ qpid/client/ClientExchange.cpp \
+ qpid/client/ClientQueue.cpp \
+ qpid/client/BasicMessageChannel.cpp \
+ qpid/client/MessageMessageChannel.cpp \
+ qpid/client/Connector.cpp \
+ qpid/client/IncomingMessage.cpp \
+ qpid/client/MessageListener.cpp \
+ qpid/client/ResponseHandler.cpp \
qpid/client/ReturnedMessageHandler.cpp
nobase_include_HEADERS = \