21 files changed, 36 insertions, 92 deletions
diff --git a/cpp/examples/Makefile.am b/cpp/examples/Makefile.am
index 3836665c35..5915e0a282 100644
--- a/cpp/examples/Makefile.am
+++ b/cpp/examples/Makefile.am
@@ -1,18 +1,38 @@
-# Note: we don't use normal automake SUBDIRS because the example
-# makefiles are don't understand all automake targets.
 
-EXAMPLE_DIRS=direct fanout pub-sub request-response
-src=../$(top_srcdir)/src
-bld=../$(top_builddir)/src
+nobase_pkgdata_DATA=						\
+	examples/Makefile					\
+	examples/request-response/client.cpp			\
+	examples/request-response/server.cpp			\
+	examples/request-response/Makefile			\
+	examples/fanout/Makefile				\
+	examples/fanout/fanout_config_queues.cpp		\
+	examples/fanout/listener.cpp				\
+	examples/fanout/fanout_consumer.cpp			\
+	examples/fanout/fanout_publisher.cpp			\
+	examples/pub-sub/Makefile				\
+	examples/pub-sub/topic_publisher.cpp			\
+	examples/pub-sub/topic_config_queues.cpp		\
+	examples/pub-sub/topic_listener.cpp			\
+	examples/direct/Makefile				\
+	examples/direct/direct_publisher.cpp			\
+	examples/direct/direct_persistent_config_queues.cpp	\
+	examples/direct/listener.cpp				\
+	examples/direct/direct_config_queues.cpp		\
+	examples/direct/direct_persistent_publisher.cpp
+
+EXTRA_DIST=$(nobase_pkgdata_DATA)
+
+# Note: we don't use normal automake SUBDIRS because the example
+# makefiles don't understand all the recursive automake targets.
+#
+src=../../$(top_srcdir)/src
+bld=../../$(top_builddir)/src
 EXAMPLE_FLAGS=-I$(src) -I$(src)/gen -I$(bld)/gen -L$(bld)/.libs
 
 all:
-	for d in $(EXAMPLE_DIRS); do ( cd $$d; make CXX="$(CXX)" CXXFLAGS="$(EXAMPLE_FLAGS)" $@; ) ; done
+	cd examples; $(MAKE) CXX="$(CXX)" CXXFLAGS="$(EXAMPLE_FLAGS)" all
 
 clean:
-	for d in $(EXAMPLE_DIRS); do ( cd $$d; make $@; ) ; done
-
-dist-hook: clean
-	cp --parents `find $(EXAMPLE_DIRS) -name Makefile -o -name '*.cpp'` $(distdir)
+	cd examples; $(MAKE) clean
 
 
diff --git a/cpp/examples/create_queue.cpp b/cpp/examples/create_queue.cpp
deleted file mode 100644
index ad9805187b..0000000000
--- a/cpp/examples/create_queue.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/**
- * This file provides one half of a test and example of a pub-sub
- * style of interaction. See topic_listener.cpp for the other half, in
- * which the logic for subscribers is defined.
- * 
- * This file contains the publisher logic. The publisher will send a
- * number of messages to the exchange with the appropriate routing key
- * for the logical 'topic'. Once it has done this it will then send a
- * request that each subscriber report back with the number of message
- * it has received and the time that elapsed between receiving the
- * first one and receiving the report request. Once the expected
- * number of reports are received, it sends out a request that each
- * subscriber shutdown.
- */
-
-#include "qpid/Exception.h"
-#include "qpid/client/Channel.h"
-#include "qpid/client/Connection.h"
-#include "qpid/client/Exchange.h"
-#include "qpid/client/MessageListener.h"
-#include "qpid/client/Queue.h"
-#include "qpid/sys/Monitor.h"
-#include <unistd.h>
-#include "qpid/sys/Time.h"
-#include <cstdlib>
-#include <iostream>
-
-using namespace qpid::client;
-using namespace qpid::sys;
-using std::string;
-
-
-int main() {
-    Connection connection;
-    Channel channel;
-    Message msg;
-    try {
-        connection.open("127.0.0.1", 5672, "guest", "guest", "/test");
-        connection.openChannel(channel);
-
-
-  //--------- Main body of program --------------------------------------------
-
-        Queue response("listener");
-        channel.declareQueue(response);
-        channel.bind(Exchange::STANDARD_TOPIC_EXCHANGE, response, "listener");
-        
-	channel.start();
-
-  //-----------------------------------------------------------------------------
-
-        channel.close();
-        connection.close();
-        return 0;
-    } catch(const std::exception& error) {
-        std::cout << error.what() << std::endl;
-    }
-    return 1;
-}
-
-
diff --git a/cpp/examples/examples/Makefile b/cpp/examples/examples/Makefile
new file mode 100644
index 0000000000..8591bd3361
--- /dev/null
+++ b/cpp/examples/examples/Makefile
@@ -0,0 +1,6 @@
+SUBDIRS=direct fanout pub-sub request-response
+all:
+	for d in $(SUBDIRS); do ( cd $$d; $(MAKE) $@; ) ; done
+clean:
+	for d in $(SUBDIRS); do ( cd $$d; $(MAKE) $@; ) ; done
+
diff --git a/cpp/examples/direct/Makefile b/cpp/examples/examples/direct/Makefile
index c94e900a75..c94e900a75 100644
--- a/cpp/examples/direct/Makefile
+++ b/cpp/examples/examples/direct/Makefile
diff --git a/cpp/examples/direct/direct_config_queues.cpp b/cpp/examples/examples/direct/direct_config_queues.cpp
index 3a52d4f62f..3a52d4f62f 100644
--- a/cpp/examples/direct/direct_config_queues.cpp
+++ b/cpp/examples/examples/direct/direct_config_queues.cpp
diff --git a/cpp/examples/direct/direct_persistent_config_queues.cpp b/cpp/examples/examples/direct/direct_persistent_config_queues.cpp
index afe076278b..afe076278b 100644
--- a/cpp/examples/direct/direct_persistent_config_queues.cpp
+++ b/cpp/examples/examples/direct/direct_persistent_config_queues.cpp
diff --git a/cpp/examples/direct/direct_persistent_publisher.cpp b/cpp/examples/examples/direct/direct_persistent_publisher.cpp
index 75637c7eb9..75637c7eb9 100644
--- a/cpp/examples/direct/direct_persistent_publisher.cpp
+++ b/cpp/examples/examples/direct/direct_persistent_publisher.cpp
diff --git a/cpp/examples/direct/direct_publisher.cpp b/cpp/examples/examples/direct/direct_publisher.cpp
index 5135f926c3..5135f926c3 100644
--- a/cpp/examples/direct/direct_publisher.cpp
+++ b/cpp/examples/examples/direct/direct_publisher.cpp
diff --git a/cpp/examples/direct/listener.cpp b/cpp/examples/examples/direct/listener.cpp
index 52840efa03..52840efa03 100644
--- a/cpp/examples/direct/listener.cpp
+++ b/cpp/examples/examples/direct/listener.cpp
diff --git a/cpp/examples/fanout/Makefile b/cpp/examples/examples/fanout/Makefile
index 719a7e7416..719a7e7416 100644
--- a/cpp/examples/fanout/Makefile
+++ b/cpp/examples/examples/fanout/Makefile
diff --git a/cpp/examples/fanout/fanout_config_queues.cpp b/cpp/examples/examples/fanout/fanout_config_queues.cpp
index b09b5191d1..b09b5191d1 100644
--- a/cpp/examples/fanout/fanout_config_queues.cpp
+++ b/cpp/examples/examples/fanout/fanout_config_queues.cpp
diff --git a/cpp/examples/fanout/fanout_consumer.cpp b/cpp/examples/examples/fanout/fanout_consumer.cpp
index 663c765159..663c765159 100644
--- a/cpp/examples/fanout/fanout_consumer.cpp
+++ b/cpp/examples/examples/fanout/fanout_consumer.cpp
diff --git a/cpp/examples/fanout/fanout_publisher.cpp b/cpp/examples/examples/fanout/fanout_publisher.cpp
index 976c53aae4..976c53aae4 100644
--- a/cpp/examples/fanout/fanout_publisher.cpp
+++ b/cpp/examples/examples/fanout/fanout_publisher.cpp
diff --git a/cpp/examples/fanout/listener.cpp b/cpp/examples/examples/fanout/listener.cpp
index 52840efa03..52840efa03 100644
--- a/cpp/examples/fanout/listener.cpp
+++ b/cpp/examples/examples/fanout/listener.cpp
diff --git a/cpp/examples/pub-sub/Makefile b/cpp/examples/examples/pub-sub/Makefile
index ea08031da5..ea08031da5 100644
--- a/cpp/examples/pub-sub/Makefile
+++ b/cpp/examples/examples/pub-sub/Makefile
diff --git a/cpp/examples/pub-sub/topic_config_queues.cpp b/cpp/examples/examples/pub-sub/topic_config_queues.cpp
index 8c05241f3c..8c05241f3c 100644
--- a/cpp/examples/pub-sub/topic_config_queues.cpp
+++ b/cpp/examples/examples/pub-sub/topic_config_queues.cpp
diff --git a/cpp/examples/pub-sub/topic_listener.cpp b/cpp/examples/examples/pub-sub/topic_listener.cpp
index 323c93dd0b..323c93dd0b 100644
--- a/cpp/examples/pub-sub/topic_listener.cpp
+++ b/cpp/examples/examples/pub-sub/topic_listener.cpp
diff --git a/cpp/examples/pub-sub/topic_publisher.cpp b/cpp/examples/examples/pub-sub/topic_publisher.cpp
index 52c2827e58..52c2827e58 100644
--- a/cpp/examples/pub-sub/topic_publisher.cpp
+++ b/cpp/examples/examples/pub-sub/topic_publisher.cpp
diff --git a/cpp/examples/request-response/Makefile b/cpp/examples/examples/request-response/Makefile
index 32612843eb..32612843eb 100644
--- a/cpp/examples/request-response/Makefile
+++ b/cpp/examples/examples/request-response/Makefile
diff --git a/cpp/examples/request-response/client.cpp b/cpp/examples/examples/request-response/client.cpp
index 59024a1cb6..59024a1cb6 100644
--- a/cpp/examples/request-response/client.cpp
+++ b/cpp/examples/examples/request-response/client.cpp
diff --git a/cpp/examples/request-response/server.cpp b/cpp/examples/examples/request-response/server.cpp
index 6c82090794..6c82090794 100644
--- a/cpp/examples/request-response/server.cpp
+++ b/cpp/examples/examples/request-response/server.cpp