summaryrefslogtreecommitdiff
path: root/qpid/cpp/examples/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/cpp/examples/Makefile.am')
-rw-r--r--qpid/cpp/examples/Makefile.am12
1 files changed, 7 insertions, 5 deletions
diff --git a/qpid/cpp/examples/Makefile.am b/qpid/cpp/examples/Makefile.am
index 02d5961fad..9e6e77f37f 100644
--- a/qpid/cpp/examples/Makefile.am
+++ b/qpid/cpp/examples/Makefile.am
@@ -1,11 +1,12 @@
+# List all example files here
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/declare_queues.cpp \
examples/fanout/listener.cpp \
examples/fanout/fanout_publisher.cpp \
examples/pub-sub/Makefile \
@@ -15,7 +16,7 @@ nobase_pkgdata_DATA= \
examples/direct/direct_publisher.cpp \
examples/direct/direct_persistent_config_queues.cpp \
examples/direct/listener.cpp \
- examples/direct/direct_config_queues.cpp \
+ examples/direct/declare_queues.cpp \
examples/direct/direct_persistent_publisher.cpp
EXTRA_DIST=$(nobase_pkgdata_DATA)
@@ -30,20 +31,21 @@ clean-local:
abs_srcdir=@abs_srcdir@
abs_top_builddir=@abs_top_builddir@
+abs_top_srcdir=@abs_top_srcdir@
# 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 source tree.
+# Verify the examples in the buid tree.
check-local:
- cd examples && QPIDD=$(abs_top_builddir)/src/qpidd ../verify
+ cd examples && QPIDD=$(abs_top_builddir)/src/qpidd $(abs_top_srcdir)/examples/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=$(top_builddir)/src/qpidd $(abs_srcdir)/verify
+ cd $(EXAMPLE_DIR) && QPIDD=$(DESTDIR)$(sbindir)/qpidd $(abs_srcdir)/verify
cd $(EXAMPLE_DIR) && $(MAKE) clean