* 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

12 files changed, 28 insertions, 24 deletions

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;