diff options
Diffstat (limited to 'cpp/src/Makefile.am')
| -rw-r--r-- | cpp/src/Makefile.am | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index 8a8e4b1928..a65230b091 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -85,7 +85,7 @@ if GENERATE # AMQP_FINAL_XML is defined in ../configure.ac amqp_0_10_xml=@AMQP_FINAL_XML@ -specs=$(amqp_0_10_xml) $(top_srcdir)/xml/cluster.xml +specs=$(amqp_0_10_xml) # Ruby generator. rgen_dir=$(top_srcdir)/rubygen @@ -104,7 +104,6 @@ $(srcdir)/rubygen.cmake: $(rgen_generator) $(specs) mgen_dir=$(top_srcdir)/managementgen 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 -l -o qmf \ @@ -217,7 +216,6 @@ cmoduleexecdir=$(libdir)/qpid/client dmoduleexec_LTLIBRARIES = cmoduleexec_LTLIBRARIES = -include cluster.mk include ha.mk include acl.mk include qmf.mk @@ -225,7 +223,6 @@ include qmfc.mk if HAVE_XML include xml.mk endif -include replication.mk if RDMA @@ -292,7 +289,6 @@ endif EXTRA_DIST +=\ CMakeLists.txt \ - cluster.cmake \ config.h.cmake \ rdma.cmake \ ssl.cmake \ @@ -337,6 +333,7 @@ libqpidcommon_la_LIBADD = \ -lboost_program_options \ -lboost_filesystem \ -luuid \ + -lpthread \ $(LIB_DLOPEN) \ $(LIB_CLOCK_GETTIME) @@ -559,7 +556,6 @@ libqpidbroker_la_SOURCES = \ qpid/broker/Deliverable.h \ qpid/broker/DeliverableMessage.cpp \ qpid/broker/DeliverableMessage.h \ - qpid/broker/DeliveryAdapter.h \ qpid/broker/DeliveryId.h \ qpid/broker/DeliveryRecord.cpp \ qpid/broker/DeliveryRecord.h \ @@ -590,12 +586,14 @@ libqpidbroker_la_SOURCES = \ qpid/broker/HeadersExchange.cpp \ qpid/broker/HeadersExchange.h \ qpid/broker/AsyncCompletion.h \ - qpid/broker/LegacyLVQ.h \ - qpid/broker/LegacyLVQ.cpp \ + qpid/broker/IndexedDeque.h \ qpid/broker/Link.cpp \ qpid/broker/Link.h \ qpid/broker/LinkRegistry.cpp \ qpid/broker/LinkRegistry.h \ + qpid/broker/Lvq.h \ + qpid/broker/Lvq.cpp \ + qpid/broker/MapHandler.h \ qpid/broker/Message.cpp \ qpid/broker/Message.h \ qpid/broker/MessageAdapter.cpp \ @@ -630,19 +628,25 @@ libqpidbroker_la_SOURCES = \ qpid/broker/QueueBindings.h \ qpid/broker/QueueCleaner.cpp \ qpid/broker/QueueCleaner.h \ - qpid/broker/QueueEvents.cpp \ - qpid/broker/QueueEvents.h \ + qpid/broker/QueueCursor.h \ + qpid/broker/QueueCursor.cpp \ + qpid/broker/QueueDepth.h \ + qpid/broker/QueueDepth.cpp \ + qpid/broker/QueueFactory.h \ + qpid/broker/QueueFactory.cpp \ + qpid/broker/QueueSettings.h \ + qpid/broker/QueueSettings.cpp \ qpid/broker/QueueListeners.cpp \ qpid/broker/QueueListeners.h \ qpid/broker/QueueObserver.h \ - qpid/broker/QueuePolicy.cpp \ - 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/LossyQueue.h \ + qpid/broker/LossyQueue.cpp \ qpid/broker/RecoverableConfig.h \ qpid/broker/RecoverableExchange.h \ qpid/broker/RecoverableMessage.h \ @@ -693,9 +697,6 @@ libqpidbroker_la_SOURCES = \ qpid/broker/TxBuffer.cpp \ qpid/broker/TxBuffer.h \ qpid/broker/TxOp.h \ - qpid/broker/TxOpVisitor.h \ - qpid/broker/TxPublish.cpp \ - qpid/broker/TxPublish.h \ qpid/broker/Vhost.cpp \ qpid/broker/Vhost.h \ qpid/broker/MessageDistributor.h \ @@ -703,6 +704,8 @@ libqpidbroker_la_SOURCES = \ qpid/broker/FifoDistributor.cpp \ qpid/broker/MessageGroupManager.cpp \ qpid/broker/MessageGroupManager.h \ + qpid/broker/amqp_0_10/MessageTransfer.h \ + qpid/broker/amqp_0_10/MessageTransfer.cpp \ qpid/management/ManagementAgent.cpp \ qpid/management/ManagementAgent.h \ qpid/management/ManagementDirectExchange.cpp \ |