Patch from Manuel Teira: https://issues.apache.org/jira/secure/CommentAssignIssue!default.jspa?action=5&id=12398038

 - Use standard automake makefiles to build cpp/examples.
 - Rationalize examples directory structure.

Additions to patch:
 - Fix for VPATH builds.
 - Fix make distcheck (finally!)


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@670066 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 18 insertions, 68 deletions

diff --git a/cpp/examples/Makefile.am b/cpp/examples/Makefile.am
index b046540b92..be37213d67 100644
--- a/cpp/examples/Makefile.am
+++ b/cpp/examples/Makefile.am
@@ -1,73 +1,23 @@
+SUBDIRS = direct fanout pub-sub request-response
+if HAVE_XML
+  SUBDIRS += xml-exchange
+endif
 
-# List all example files here
-nobase_pkgdata_DATA=						\
-        examples/README                                         \
-	examples/Makefile					\
-	examples/request-response/client.cpp			\
-	examples/request-response/server.cpp			\
-	examples/request-response/Makefile			\
-	examples/fanout/Makefile				\
-	examples/fanout/listener.cpp				\
-	examples/fanout/fanout_producer.cpp			\
-	examples/pub-sub/Makefile				\
-	examples/pub-sub/topic_publisher.cpp			\
-	examples/pub-sub/topic_listener.cpp			\
-	examples/direct/Makefile				\
-	examples/direct/direct_producer.cpp			\
-	examples/direct/listener.cpp				\
-	examples/direct/declare_queues.cpp			\
-	examples/xml-exchange/Makefile				\
-	examples/xml-exchange/declare_queues.cpp		\
-	examples/xml-exchange/xml_producer.cpp			\
-	examples/xml-exchange/listener.cpp
-
-VERIFY_FILES= verify verify_all				\
-	examples/request-response/verify		\
-	examples/request-response/verify.in		\
-	examples/request-response/verify_cpp_python	\
-	examples/request-response/verify_cpp_python.in	\
-	examples/request-response/verify_python_cpp	\
-	examples/request-response/verify_python_cpp.in	\
-	examples/fanout/verify				\
-	examples/fanout/verify.in			\
-	examples/fanout/verify_cpp_python		\
-	examples/fanout/verify_cpp_python.in		\
-	examples/fanout/verify_python_cpp		\
-	examples/fanout/verify_python_cpp.in		\
-	examples/pub-sub/verify				\
-	examples/pub-sub/verify.in			\
-	examples/pub-sub/verify_cpp_python		\
-	examples/pub-sub/verify_cpp_python.in		\
-	examples/pub-sub/verify_python_cpp		\
-	examples/pub-sub/verify_python_cpp.in		\
-	examples/direct/verify				\
-	examples/direct/verify.in			\
-	examples/direct/verify_cpp_python		\
-	examples/direct/verify_cpp_python.in		\
-	examples/direct/verify_python_cpp		\
-	examples/direct/verify_python_cpp.in
-
-EXTRA_DIST=$(nobase_pkgdata_DATA) $(VERIFY_FILES)
-
-# Note: we don't use normal automake SUBDIRS because the example
-# makefiles don't understand all the recursive automake targets.
-
-clean-local:
-	cd examples; $(MAKE) clean
-	rm -f examples/*/*.out  examples/*/*.wait 
-
-abs_top_builddir=@abs_top_builddir@
-abs_top_srcdir=@abs_top_srcdir@
+MAKEDIST=.libs/Makefile
+SUBMAKE='	for d in $(SUBDIRS) ; do $$(MAKE) -C $$$$d $$@ ; done'
+$(MAKEDIST): Makefile
+	@$(MKDIR_P) .libs
+	@$(ECHO) all: 		        > $(MAKEDIST)
+	@$(ECHO) $(SUBMAKE)             >> $(MAKEDIST)
+	@$(ECHO) clean:                 >> $(MAKEDIST)
+	@$(ECHO) $(SUBMAKE)             >> $(MAKEDIST)
 
-# Build the examples - copy sources to the build tree in VPATH build.
-all-local:
-	test -d examples || cp -R $(srcdir)/examples .
-	cd examples && $(MAKE) CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS) -I$(abs_top_srcdir)/src -I$(abs_top_srcdir)/src/gen -I$(abs_top_builddir)/src -I$(abs_top_builddir)/src/gen -L$(abs_top_builddir)/src/.libs -Wl,-rpath,$(abs_top_builddir)/src/.libs" all
+examplesdir=$(pkgdatadir)/examples
+examples_DATA = README $(MAKEDIST)
 
-if !HAVE_XML
-exclude_examples_regexp="xml"	# Exclude XML examples.
-endif
+EXTRA_DIST = $(examples_DATA) README.verify verify verify_all 
 
 # Verify the examples in the buid tree.
-check-local: all-local verify
-	$(srcdir)/verify_all $(abs_top_srcdir)/.. $(top_builddir)/src/qpidd $(exclude_examples_regexp)
+check-local: 
+	$(srcdir)/verify_all $(abs_top_srcdir)/.. $(abs_top_builddir)/src/qpidd $(exclude_examples_regexp)
+