From 2fdd2cc2ade41e213ae35818532574bbf40f4a00 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Thu, 25 Aug 2011 20:41:28 +0000
Subject: QPID-3384: Enable DTX transactions in a cluster.

- Replicate DTX state to new members joining.
- Use cluster timer for DTX timeouts.
- Incidental: quote nulls in qpid::Msg messages (XIDs often have null characters)

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1161742 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'cpp/src/Makefile.am')

diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index 4f9d7ab28a..e502000758 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -89,7 +89,7 @@ rgen_cmd=ruby -I $(rgen_dir) $(rgen_dir)/generate . ../include $(specs) all
 
 $(rgen_srcs) $(srcdir)/rubygen.mk: rgen.timestamp
 rgen.timestamp: $(rgen_generator) $(specs)
-	$(rgen_cmd) $(srcdir)/rubygen.mk; touch $@
+	$(rgen_cmd) $(srcdir)/rubygen.mk && touch $@
 $(rgen_generator):
 
 # The CMake version is needed for dist
@@ -435,6 +435,7 @@ libqpidcommon_la_SOURCES +=			\
   qpid/log/OstreamOutput.h			\
   qpid/log/Selector.cpp				\
   qpid/log/Statement.cpp			\
+  qpid/Msg.cpp					\
   qpid/management/Buffer.cpp			\
   qpid/management/ConnectionSettings.cpp	\
   qpid/management/Manageable.cpp		\
-- 
cgit v1.2.1