From 1fd57585c8ea536630d69de3fc16ce0c6f81c82b Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 11 Apr 2007 19:53:32 +0000 Subject: * cpp/qpidc.spec.in: Added qpidd-devel sub-package. * cpp/configure.ac: Use a more reliable srcdir test file. * cpp/docs/api/Makefile.am: Fix bug in VPATH builds. * cpp/gentools/*, src/**.h,**.cpp: Fix #includes of files in gen/ * cpp/rpm/Makefile.am: Removed. RPM targets defined in top level Makefile.am. * cpp/Makefile.am: Add RPM targets, fix VPATH bug with RPM targets * cpp/rpm/README.qpidd-devel: placeholder for qpidd-devel documentation. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@527639 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/broker/BrokerAdapter.h | 2 +- cpp/src/broker/BrokerChannel.h | 2 +- cpp/src/broker/BrokerMessage.cpp | 4 ++-- cpp/src/broker/BrokerMessageMessage.cpp | 8 ++++---- cpp/src/broker/BrokerMessageMessage.h | 2 +- cpp/src/broker/Connection.cpp | 2 +- cpp/src/broker/Connection.h | 4 ++-- cpp/src/broker/HandlerImpl.h | 2 +- cpp/src/broker/MessageBuilder.h | 2 +- cpp/src/broker/MessageHandlerImpl.cpp | 4 ++-- cpp/src/broker/MessageHandlerImpl.h | 4 ++-- cpp/src/broker/Reference.cpp | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) (limited to 'cpp/src/broker') diff --git a/cpp/src/broker/BrokerAdapter.h b/cpp/src/broker/BrokerAdapter.h index 4af45162f0..0323cbad20 100644 --- a/cpp/src/broker/BrokerAdapter.h +++ b/cpp/src/broker/BrokerAdapter.h @@ -18,7 +18,7 @@ * limitations under the License. * */ -#include "AMQP_ServerOperations.h" +#include "../gen/AMQP_ServerOperations.h" #include "HandlerImpl.h" #include "MessageHandlerImpl.h" #include "../Exception.h" diff --git a/cpp/src/broker/BrokerChannel.h b/cpp/src/broker/BrokerChannel.h index e2a96aa467..fb090196c2 100644 --- a/cpp/src/broker/BrokerChannel.h +++ b/cpp/src/broker/BrokerChannel.h @@ -36,7 +36,7 @@ #include "Prefetch.h" #include "TxBuffer.h" #include "../framing/ChannelAdapter.h" -#include "ChannelOpenBody.h" +#include "../gen/ChannelOpenBody.h" #include "CompletionHandler.h" namespace qpid { diff --git a/cpp/src/broker/BrokerMessage.cpp b/cpp/src/broker/BrokerMessage.cpp index 06765bcaa9..96a90ef608 100644 --- a/cpp/src/broker/BrokerMessage.cpp +++ b/cpp/src/broker/BrokerMessage.cpp @@ -26,8 +26,8 @@ #include "InMemoryContent.h" #include "LazyLoadedContent.h" #include "MessageStore.h" -#include "BasicDeliverBody.h" -#include "BasicGetOkBody.h" +#include "../gen/BasicDeliverBody.h" +#include "../gen/BasicGetOkBody.h" #include "../framing/AMQContentBody.h" #include "../framing/AMQHeaderBody.h" #include "../framing/AMQMethodBody.h" diff --git a/cpp/src/broker/BrokerMessageMessage.cpp b/cpp/src/broker/BrokerMessageMessage.cpp index e34cd61f6c..7a2fa31343 100644 --- a/cpp/src/broker/BrokerMessageMessage.cpp +++ b/cpp/src/broker/BrokerMessageMessage.cpp @@ -21,10 +21,10 @@ #include "../QpidError.h" #include "BrokerMessageMessage.h" #include "../framing/ChannelAdapter.h" -#include "MessageTransferBody.h" -#include "MessageOpenBody.h" -#include "MessageCloseBody.h" -#include "MessageAppendBody.h" +#include "../gen/MessageTransferBody.h" +#include "../gen/MessageOpenBody.h" +#include "../gen/MessageCloseBody.h" +#include "../gen/MessageAppendBody.h" #include "Reference.h" #include "../framing/AMQFrame.h" #include "../framing/FieldTable.h" diff --git a/cpp/src/broker/BrokerMessageMessage.h b/cpp/src/broker/BrokerMessageMessage.h index 976b882c7e..ae9fc9c2c0 100644 --- a/cpp/src/broker/BrokerMessageMessage.h +++ b/cpp/src/broker/BrokerMessageMessage.h @@ -22,7 +22,7 @@ * */ #include "BrokerMessageBase.h" -#include "MessageTransferBody.h" +#include "../gen/MessageTransferBody.h" #include "../framing/amqp_types.h" #include #include diff --git a/cpp/src/broker/Connection.cpp b/cpp/src/broker/Connection.cpp index dbc8149cb5..ab1c2ac128 100644 --- a/cpp/src/broker/Connection.cpp +++ b/cpp/src/broker/Connection.cpp @@ -23,7 +23,7 @@ #include "Connection.h" #include "BrokerChannel.h" -#include "AMQP_ClientProxy.h" +#include "../gen/AMQP_ClientProxy.h" #include "BrokerAdapter.h" using namespace boost; diff --git a/cpp/src/broker/Connection.h b/cpp/src/broker/Connection.h index a36f1aa6ee..ffda0425cc 100644 --- a/cpp/src/broker/Connection.h +++ b/cpp/src/broker/Connection.h @@ -27,8 +27,8 @@ #include #include "../framing/AMQFrame.h" -#include "AMQP_ServerOperations.h" -#include "AMQP_ClientProxy.h" +#include "../gen/AMQP_ServerOperations.h" +#include "../gen/AMQP_ClientProxy.h" #include "../sys/ConnectionOutputHandler.h" #include "../sys/ConnectionInputHandler.h" #include "../sys/TimeoutHandler.h" diff --git a/cpp/src/broker/HandlerImpl.h b/cpp/src/broker/HandlerImpl.h index c55a36da45..51175f868a 100644 --- a/cpp/src/broker/HandlerImpl.h +++ b/cpp/src/broker/HandlerImpl.h @@ -20,7 +20,7 @@ */ #include "BrokerChannel.h" -#include "AMQP_ClientProxy.h" +#include "../gen/AMQP_ClientProxy.h" namespace qpid { diff --git a/cpp/src/broker/MessageBuilder.h b/cpp/src/broker/MessageBuilder.h index ffac707f3b..85de2e47bc 100644 --- a/cpp/src/broker/MessageBuilder.h +++ b/cpp/src/broker/MessageBuilder.h @@ -28,7 +28,7 @@ #include "MessageStore.h" #include "../framing/AMQContentBody.h" #include "../framing/AMQHeaderBody.h" -#include "BasicPublishBody.h" +#include "../gen/BasicPublishBody.h" #include "CompletionHandler.h" namespace qpid { diff --git a/cpp/src/broker/MessageHandlerImpl.cpp b/cpp/src/broker/MessageHandlerImpl.cpp index 2378047054..e5e5581ac4 100644 --- a/cpp/src/broker/MessageHandlerImpl.cpp +++ b/cpp/src/broker/MessageHandlerImpl.cpp @@ -23,8 +23,8 @@ #include "Connection.h" #include "Broker.h" #include "BrokerMessageMessage.h" -#include "MessageAppendBody.h" -#include "MessageTransferBody.h" +#include "../gen/MessageAppendBody.h" +#include "../gen/MessageTransferBody.h" #include "BrokerAdapter.h" namespace qpid { diff --git a/cpp/src/broker/MessageHandlerImpl.h b/cpp/src/broker/MessageHandlerImpl.h index 872d429d5c..a5647200d3 100644 --- a/cpp/src/broker/MessageHandlerImpl.h +++ b/cpp/src/broker/MessageHandlerImpl.h @@ -21,8 +21,8 @@ #include -#include "AMQP_ServerOperations.h" -#include "AMQP_ClientProxy.h" +#include "../gen/AMQP_ServerOperations.h" +#include "../gen/AMQP_ClientProxy.h" #include "Reference.h" #include "HandlerImpl.h" diff --git a/cpp/src/broker/Reference.cpp b/cpp/src/broker/Reference.cpp index 1ef2eb44d0..b0b2d8a3c1 100644 --- a/cpp/src/broker/Reference.cpp +++ b/cpp/src/broker/Reference.cpp @@ -20,7 +20,7 @@ #include "Reference.h" #include "BrokerMessageMessage.h" #include "../QpidError.h" -#include "MessageAppendBody.h" +#include "../gen/MessageAppendBody.h" #include "CompletionHandler.h" namespace qpid { -- cgit v1.2.1