* 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

32 files changed, 59 insertions, 61 deletions

diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index c18eb4f719..32c2e1a00d 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS = . tests
 AM_CXXFLAGS = $(WARNING_CFLAGS) $(APR_CXXFLAGS)
 
 # -I top_builddir for config.h
-INCLUDES = -I$(top_builddir)  -I$(srcdir)/gen 
+INCLUDES = -I$(top_builddir)  -I$(srcdir)
 
 qpidd_LDADD = \
   libqpidbroker.la \
@@ -156,7 +156,9 @@ libqpidclient_la_SOURCES =			\
   $(client)/ResponseHandler.cpp				\
   $(client)/ReturnedMessageHandler.cpp
 
-nobase_pkginclude_HEADERS = \
+# Install into include/qpid rather than include/qpidc.
+qpidincludedir=$(includedir)/qpid
+nobase_qpidinclude_HEADERS = \
   $(generated_headers) \
   $(platform_hdr) \
   $(broker)/AccumulatedAck.h \
@@ -280,14 +282,11 @@ nobase_pkginclude_HEADERS = \
   ExceptionHolder.h \
   QpidError.h \
   SharedObject.h \
-  doxygen_mainpage.h \
   shared_ptr.h 
 
 # Distribute the generated sources, at least for now, since
 # the generator code is in java.
 EXTRA_DIST += $(BUILT_SOURCES)
-maintainer-clean-local:
-	rm -rf $(gen)
 
 # Don't attempt to run the code generator unless configure has set
 # CAN_GENERATE_CODE, indicating that the amqp.xml and tools needed
@@ -297,12 +296,7 @@ if CAN_GENERATE_CODE
 
 gentools_dir = $(srcdir)/../gentools
 spec_dir = $(srcdir)/../../specs
-
-# FIXME aconway 2007-01-04: Enabling Basic class until
-# new messaging class is ready to replace it.
-# spec = $(spec_dir)/amqp.0-9.xml $(spec_dir)/amqp-errata.0-9.xml $(spec_dir)/amqp-nogen.0-9.xml
 spec = $(spec_dir)/amqp.0-9.xml $(spec_dir)/amqp-errata.0-9.xml
-
 gentools_srcdir = $(gentools_dir)/src/org/apache/qpid/gentools
 
 $(BUILT_SOURCES) $(gen)/timestamp: $(spec) $(java_sources) $(cxx_templates) Makefile.am
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 <boost/weak_ptr.hpp>
 #include <vector>
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 <boost/ptr_container/ptr_map.hpp>
 
 #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 <memory>
 
-#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 {
diff --git a/cpp/src/client/ClientAdapter.cpp b/cpp/src/client/ClientAdapter.cpp
index 4bf91f915b..f5eb2f4536 100644
--- a/cpp/src/client/ClientAdapter.cpp
+++ b/cpp/src/client/ClientAdapter.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "AMQP_ClientOperations.h"
+#include "../gen/AMQP_ClientOperations.h"
 #include "ClientAdapter.h"
 #include "Connection.h"
 #include "../Exception.h"
diff --git a/cpp/src/framing/AMQFrame.h b/cpp/src/framing/AMQFrame.h
index d4c2e0640d..d31df4cc41 100644
--- a/cpp/src/framing/AMQFrame.h
+++ b/cpp/src/framing/AMQFrame.h
@@ -30,8 +30,8 @@
 #include "AMQHeaderBody.h"
 #include "AMQContentBody.h"
 #include "AMQHeartbeatBody.h"
-#include "AMQP_MethodVersionMap.h"
-#include "AMQP_HighestVersion.h"
+#include "../gen/AMQP_MethodVersionMap.h"
+#include "../gen/AMQP_HighestVersion.h"
 #include "Buffer.h"
 
 namespace qpid {
diff --git a/cpp/src/framing/AMQMethodBody.cpp b/cpp/src/framing/AMQMethodBody.cpp
index 44924b76e1..0180d6c372 100644
--- a/cpp/src/framing/AMQMethodBody.cpp
+++ b/cpp/src/framing/AMQMethodBody.cpp
@@ -21,7 +21,7 @@
 #include "AMQFrame.h"
 #include "AMQMethodBody.h"
 #include "../QpidError.h"
-#include "AMQP_MethodVersionMap.h"
+#include "../gen/AMQP_MethodVersionMap.h"
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/src/framing/AMQMethodBody.h b/cpp/src/framing/AMQMethodBody.h
index c5f0a1adf7..2fb952ddbb 100644
--- a/cpp/src/framing/AMQMethodBody.h
+++ b/cpp/src/framing/AMQMethodBody.h
@@ -25,7 +25,7 @@
 #include "amqp_types.h"
 #include "AMQBody.h"
 #include "Buffer.h"
-#include "AMQP_ServerOperations.h"
+#include "../gen/AMQP_ServerOperations.h"
 #include "MethodContext.h"
 
 namespace qpid {
diff --git a/cpp/src/framing/AMQRequestBody.cpp b/cpp/src/framing/AMQRequestBody.cpp
index 54e1c11863..bb5a448dc3 100644
--- a/cpp/src/framing/AMQRequestBody.cpp
+++ b/cpp/src/framing/AMQRequestBody.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "AMQRequestBody.h"
-#include "AMQP_MethodVersionMap.h"
+#include "../gen/AMQP_MethodVersionMap.h"
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/src/framing/AMQResponseBody.cpp b/cpp/src/framing/AMQResponseBody.cpp
index 7da71a5d25..ad99ab32e0 100644
--- a/cpp/src/framing/AMQResponseBody.cpp
+++ b/cpp/src/framing/AMQResponseBody.cpp
@@ -18,7 +18,7 @@
 
 #include "AMQFrame.h"
 #include "AMQResponseBody.h"
-#include "AMQP_MethodVersionMap.h"
+#include "../gen/AMQP_MethodVersionMap.h"
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/src/framing/amqp_framing.h b/cpp/src/framing/amqp_framing.h
index 5cbaedb102..c99dd2bb64 100644
--- a/cpp/src/framing/amqp_framing.h
+++ b/cpp/src/framing/amqp_framing.h
@@ -26,7 +26,7 @@
 #include "AMQHeaderBody.h"
 #include "AMQContentBody.h"
 #include "AMQHeartbeatBody.h"
-#include "AMQP_MethodVersionMap.h"
+#include "../gen/AMQP_MethodVersionMap.h"
 #include "InputHandler.h"
 #include "OutputHandler.h"
 #include "InitiationHandler.h"
diff --git a/cpp/src/tests/BrokerChannelTest.cpp b/cpp/src/tests/BrokerChannelTest.cpp
index 006391bbd2..7d8bbf5e49 100644
--- a/cpp/src/tests/BrokerChannelTest.cpp
+++ b/cpp/src/tests/BrokerChannelTest.cpp
@@ -26,7 +26,7 @@
 #include "qpid_test_plugin.h"
 #include <iostream>
 #include <memory>
-#include "AMQP_HighestVersion.h"
+#include "../gen/AMQP_HighestVersion.h"
 #include "../framing/AMQFrame.h"
 #include "MockChannel.h"
 #include "../broker/Connection.h"
diff --git a/cpp/src/tests/ExchangeTest.cpp b/cpp/src/tests/ExchangeTest.cpp
index 97846cf527..ff0e6b4ae2 100644
--- a/cpp/src/tests/ExchangeTest.cpp
+++ b/cpp/src/tests/ExchangeTest.cpp
@@ -26,7 +26,7 @@
 #include "../broker/TopicExchange.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
-#include "BasicGetBody.h"
+#include "../gen/BasicGetBody.h"
 
 using namespace qpid::broker;
 using namespace qpid::framing;
diff --git a/cpp/src/tests/FramingTest.cpp b/cpp/src/tests/FramingTest.cpp
index aa7cd90bc2..24e609e9b9 100644
--- a/cpp/src/tests/FramingTest.cpp
+++ b/cpp/src/tests/FramingTest.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "ConnectionRedirectBody.h"
+#include "../gen/ConnectionRedirectBody.h"
 #include "../framing/ProtocolVersion.h"
 #include "../framing/amqp_framing.h"
 #include <iostream>
@@ -26,7 +26,7 @@
 #include <sstream>
 #include <typeinfo>
 #include "../QpidError.h"
-#include "AMQP_HighestVersion.h"
+#include "../gen/AMQP_HighestVersion.h"
 #include "../framing/AMQRequestBody.h"
 #include "../framing/AMQResponseBody.h"
 #include "../framing/Requester.h"
@@ -36,7 +36,7 @@
 #include "../client/ClientExchange.h"
 #include "../client/ClientQueue.h"
 #include "../framing/Correlator.h"
-#include "BasicGetOkBody.h"
+#include "../gen/BasicGetOkBody.h"
 #include <memory>
 #include <boost/lexical_cast.hpp>
 #include <boost/bind.hpp>
diff --git a/cpp/src/tests/InMemoryContentTest.cpp b/cpp/src/tests/InMemoryContentTest.cpp
index 6c7dd58258..3dbe31e072 100644
--- a/cpp/src/tests/InMemoryContentTest.cpp
+++ b/cpp/src/tests/InMemoryContentTest.cpp
@@ -20,7 +20,7 @@
  */
 #include "../broker/InMemoryContent.h"
 #include "qpid_test_plugin.h"
-#include "AMQP_HighestVersion.h"
+#include "../gen/AMQP_HighestVersion.h"
 #include <iostream>
 #include <list>
 #include "../framing/AMQFrame.h"
diff --git a/cpp/src/tests/InProcessBroker.h b/cpp/src/tests/InProcessBroker.h
index ff94ddbe9f..22af62879a 100644
--- a/cpp/src/tests/InProcessBroker.h
+++ b/cpp/src/tests/InProcessBroker.h
@@ -18,7 +18,7 @@
  * limitations under the License.
  *
  */
-#include "AMQP_HighestVersion.h"
+#include "../gen/AMQP_HighestVersion.h"
 #include "../framing/AMQFrame.h"
 #include "../broker/Broker.h"
 #include "../broker/Connection.h"
diff --git a/cpp/src/tests/LazyLoadedContentTest.cpp b/cpp/src/tests/LazyLoadedContentTest.cpp
index 9d0da2206d..f366a25cf9 100644
--- a/cpp/src/tests/LazyLoadedContentTest.cpp
+++ b/cpp/src/tests/LazyLoadedContentTest.cpp
@@ -19,7 +19,7 @@
  *
  */
 #include "../broker/LazyLoadedContent.h"
-#include "AMQP_HighestVersion.h"
+#include "../gen/AMQP_HighestVersion.h"
 #include "../broker/NullMessageStore.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am
index 0c5e43c5ca..62acf3cec6 100644
--- a/cpp/src/tests/Makefile.am
+++ b/cpp/src/tests/Makefile.am
@@ -61,16 +61,20 @@ TESTS_ENVIRONMENT = VALGRIND=$(VALGRIND) srcdir=$(srcdir)
 CLIENT_TESTS = client_test quick_topictest
 TESTS = run-unit-tests start_broker $(CLIENT_TESTS) python_tests kill_broker
 
-EXTRA_DIST =		\
-  run-unit-tests start_broker python_tests kill_broker \
-  .valgrind.supp	\
-  .valgrindrc-default   \
-  InProcessBroker.h	\
-  MockChannel.h		\
-  MockConnectionInputHandler.h \
-  qpid_test_plugin.h	\
-  test_env		\
-  topictest		\
+EXTRA_DIST =					\
+  test_env					\
+  topictest					\
+  quick_topictest				\
+  run-unit-tests				\
+  start_broker					\
+  python_tests					\
+  kill_broker					\
+  .valgrind.supp				\
+  .valgrindrc-default				\
+  InProcessBroker.h				\
+  MockChannel.h					\
+  MockConnectionInputHandler.h			\
+  qpid_test_plugin.h				\
   APRBaseTest.cpp
 
 CLEANFILES=qpidd.log
diff --git a/cpp/src/tests/MessageHandlerTest.cpp b/cpp/src/tests/MessageHandlerTest.cpp
index 277c0fc4b9..4c4321d19d 100644
--- a/cpp/src/tests/MessageHandlerTest.cpp
+++ b/cpp/src/tests/MessageHandlerTest.cpp
@@ -19,7 +19,7 @@
  *
  */
 //#include <iostream>
-//#include <AMQP_HighestVersion.h>
+//#include "../gen/AMQP_HighestVersion.h>
 #include "../framing/amqp_framing.h"
 #include "qpid_test_plugin.h"
 
diff --git a/cpp/src/tests/MessageTest.cpp b/cpp/src/tests/MessageTest.cpp
index 136c6f2d8d..dd6d66c3cd 100644
--- a/cpp/src/tests/MessageTest.cpp
+++ b/cpp/src/tests/MessageTest.cpp
@@ -21,7 +21,7 @@
 #include "../broker/BrokerMessage.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
-#include "AMQP_HighestVersion.h"
+#include "../gen/AMQP_HighestVersion.h"
 #include "../framing/AMQFrame.h"
 #include "MockChannel.h"
 
diff --git a/cpp/src/tests/MockChannel.h b/cpp/src/tests/MockChannel.h
index e47d591a9e..dfadb3a3cc 100644
--- a/cpp/src/tests/MockChannel.h
+++ b/cpp/src/tests/MockChannel.h
@@ -23,7 +23,7 @@
 #include "../framing/ChannelAdapter.h"
 #include "../framing/OutputHandler.h"
 #include "../framing/AMQFrame.h"
-#include "BasicGetBody.h"
+#include "../gen/BasicGetBody.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 
diff --git a/cpp/src/tests/ProducerConsumerTest.cpp b/cpp/src/tests/ProducerConsumerTest.cpp
index f2f3ab689a..0aa812e33e 100644
--- a/cpp/src/tests/ProducerConsumerTest.cpp
+++ b/cpp/src/tests/ProducerConsumerTest.cpp
@@ -27,7 +27,7 @@
 #include "InProcessBroker.h"
 #include "../sys/ProducerConsumer.h"
 #include "../sys/Thread.h"
-#include "AMQP_HighestVersion.h"
+#include "../gen/AMQP_HighestVersion.h"
 #include "../sys/AtomicCount.h"
 
 using namespace qpid;
diff --git a/cpp/src/tests/ReferenceTest.cpp b/cpp/src/tests/ReferenceTest.cpp
index 223f750ef6..3f23d1072f 100644
--- a/cpp/src/tests/ReferenceTest.cpp
+++ b/cpp/src/tests/ReferenceTest.cpp
@@ -23,8 +23,8 @@
 #include "qpid_test_plugin.h"
 #include "../broker/Reference.h"
 #include "../broker/BrokerMessageMessage.h"
-#include "MessageTransferBody.h"
-#include "MessageAppendBody.h"
+#include "../gen/MessageTransferBody.h"
+#include "../gen/MessageAppendBody.h"
 #include "../broker/CompletionHandler.h"
 
 using namespace boost;