diff options
Diffstat (limited to 'cpp/examples/Makefile.am')
| -rw-r--r-- | cpp/examples/Makefile.am | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/cpp/examples/Makefile.am b/cpp/examples/Makefile.am index 9e6e77f37f..73b7a84ad0 100644 --- a/cpp/examples/Makefile.am +++ b/cpp/examples/Makefile.am @@ -8,19 +8,20 @@ nobase_pkgdata_DATA= \ examples/fanout/Makefile \ examples/fanout/declare_queues.cpp \ examples/fanout/listener.cpp \ - examples/fanout/fanout_publisher.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_publisher.cpp \ - examples/direct/direct_persistent_config_queues.cpp \ + examples/direct/direct_producer.cpp \ examples/direct/listener.cpp \ - examples/direct/declare_queues.cpp \ - examples/direct/direct_persistent_publisher.cpp - -EXTRA_DIST=$(nobase_pkgdata_DATA) + examples/direct/declare_queues.cpp +EXTRA_DIST=$(nobase_pkgdata_DATA) verify \ + examples/request-response/verify.in \ + examples/fanout/verify.in \ + examples/pub-sub/verify.in \ + examples/direct/verify.in # Note: we don't use normal automake SUBDIRS because the example # makefiles don't understand all the recursive automake targets. @@ -29,23 +30,24 @@ clean-local: cd examples; $(MAKE) clean rm -f examples/*/*.out examples/*/*.wait -abs_srcdir=@abs_srcdir@ abs_top_builddir=@abs_top_builddir@ abs_top_srcdir=@abs_top_srcdir@ +VERIFY=$(abs_top_srcdir)/examples/verify + # Build the examples in the source tree. all-local: cd examples && $(MAKE) CXX="$(CXX)" CXXFLAGS="-I../../$(top_srcdir)/src -I../../$(top_srcdir)/src/gen -I../../$(top_builddir)/src/gen -L../../$(top_builddir)/src/.libs -Wl,-rpath,$(abs_top_builddir)/src/.libs" all # Verify the examples in the buid tree. -check-local: - cd examples && QPIDD=$(abs_top_builddir)/src/qpidd $(abs_top_srcdir)/examples/verify +check-local: all-local + cd examples && QPIDD=$(abs_top_builddir)/src/qpidd $(VERIFY) # Build and verify the installed examples, then clean up to avoid rpmbuild warnings. EXAMPLE_FLAGS=-I$(DESTDIR)$(includedir) -L$(DESTDIR)$(libdir) -Wl,-rpath,$(DESTDIR)$(libdir) EXAMPLE_DIR=$(DESTDIR)$(pkgdatadir)/examples installcheck-local: cd $(EXAMPLE_DIR) && $(MAKE) CXX="$(CXX)" CXXFLAGS="$(EXAMPLE_FLAGS)" all - cd $(EXAMPLE_DIR) && QPIDD=$(DESTDIR)$(sbindir)/qpidd $(abs_srcdir)/verify + cd $(EXAMPLE_DIR) && QPIDD=$(sbindir)/qpidd $(VERIFY) cd $(EXAMPLE_DIR) && $(MAKE) clean |