From 633c33f224f3196f3f9bd80bd2e418d8143fea06 Mon Sep 17 00:00:00 2001
From: Kim van der Riet <kpvdr@apache.org>
Date: Fri, 4 May 2012 15:39:19 +0000
Subject: QPID-3858: Updated branch - merged from trunk r.1333987

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1334037 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/Makefile.am | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

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

diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index 7162245c53..43e491a229 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -102,15 +102,16 @@ $(srcdir)/rubygen.cmake: $(rgen_generator) $(specs)
 
 # Management generator.
 mgen_dir=$(top_srcdir)/managementgen
-mgen_cmd=$(mgen_dir)/qmf-gen -m $(srcdir)/managementgen.mk \
-	-c $(srcdir)/managementgen.cmake -q -b -o qmf \
-	$(top_srcdir)/../specs/management-schema.xml \
+mgen_xml=$(top_srcdir)/../specs/management-schema.xml \
 	$(srcdir)/qpid/acl/management-schema.xml \
 	$(srcdir)/qpid/cluster/management-schema.xml \
 	$(srcdir)/qpid/ha/management-schema.xml
+mgen_cmd=$(mgen_dir)/qmf-gen -m $(srcdir)/managementgen.mk \
+	-c $(srcdir)/managementgen.cmake -q -b -o qmf \
+	$(mgen_xml)
 
 $(srcdir)/managementgen.mk $(mgen_broker_cpp) $(dist_qpid_management_HEADERS): mgen.timestamp
-mgen.timestamp: $(mgen_generator)
+mgen.timestamp: $(mgen_generator) $(mgen_xml)
 	$(mgen_cmd); touch $@
 $(mgen_generator):
 
@@ -139,7 +140,7 @@ tmoduleexec_LTLIBRARIES=
 AM_CXXFLAGS += -DBOOST_FILESYSTEM_VERSION=2
 
 ## Automake macros to build libraries and executables.
-qpidd_CXXFLAGS = $(AM_CXXFLAGS) -DQPIDD_MODULE_DIR=\"$(dmoduleexecdir)\" -DQPIDD_CONF_FILE=\"$(sysconfdir)/qpidd.conf\"
+qpidd_CXXFLAGS = $(AM_CXXFLAGS) -DQPIDD_MODULE_DIR=\"$(dmoduleexecdir)\" -DQPIDD_CONF_FILE=\"$(sysconfdir)/qpidd.conf\" -DQPIDC_CONF_FILE=\"$(confdir)/qpidc.conf\"
 libqpidclient_la_CXXFLAGS = $(AM_CXXFLAGS) -DQPIDC_MODULE_DIR=\"$(cmoduleexecdir)\" -DQPIDC_CONF_FILE=\"$(confdir)/qpidc.conf\"
 
 qpidd_LDADD =					\
@@ -183,11 +184,15 @@ nobase_include_HEADERS +=			\
   ../include/qpid/sys/posix/Time.h		\
   ../include/qpid/sys/posix/check.h
 
-if HAVE_EPOLL
+if USE_EPOLL
   poller = qpid/sys/epoll/EpollPoller.cpp
 endif
 
-if HAVE_ECF
+if USE_POLL
+  poller = qpid/sys/posix/PosixPoller.cpp
+endif
+
+if USE_ECF
   poller = qpid/sys/solaris/ECFPoller.cpp
 endif
 
@@ -393,8 +398,6 @@ libqpidcommon_la_SOURCES +=			\
   qpid/framing/AccumulatedAck.h			\
   qpid/framing/Array.cpp			\
   qpid/framing/BodyFactory.h			\
-  qpid/framing/BodyHandler.cpp			\
-  qpid/framing/BodyHandler.h			\
   qpid/framing/Buffer.cpp			\
   qpid/framing/ResizableBuffer.h		\
   qpid/framing/ChannelHandler.h			\
@@ -481,12 +484,14 @@ libqpidcommon_la_SOURCES +=			\
   qpid/sys/Fork.h				\
   qpid/sys/LockFile.h				\
   qpid/sys/LockPtr.h				\
+  qpid/sys/MemStat.h				\
   qpid/sys/OutputControl.h			\
   qpid/sys/OutputTask.h				\
   qpid/sys/PipeHandle.h				\
   qpid/sys/PollableCondition.h			\
   qpid/sys/PollableQueue.h			\
   qpid/sys/Poller.h				\
+  qpid/sys/Probes.h				\
   qpid/sys/ProtocolFactory.h			\
   qpid/sys/Runnable.cpp				\
   qpid/sys/ScopedIncrement.h			\
@@ -632,10 +637,10 @@ libqpidbroker_la_SOURCES = \
   qpid/broker/QueuePolicy.h \
   qpid/broker/QueueRegistry.cpp \
   qpid/broker/QueueRegistry.h \
+  qpid/broker/QueuedMessage.cpp \
   qpid/broker/QueuedMessage.h \
   qpid/broker/QueueFlowLimit.h \
   qpid/broker/QueueFlowLimit.cpp \
-  qpid/broker/RateFlowcontrol.h \
   qpid/broker/RecoverableConfig.h \
   qpid/broker/RecoverableExchange.h \
   qpid/broker/RecoverableMessage.h \
-- 
cgit v1.2.1