From 219664470d939b7f514fce3f0b6ce2ea9193ef7d Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 14 May 2008 16:24:08 +0000 Subject: Exclude XML example checks if XML support is not available. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@656326 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/examples/Makefile.am | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'cpp/examples/Makefile.am') diff --git a/cpp/examples/Makefile.am b/cpp/examples/Makefile.am index 54c59810ed..739110de34 100644 --- a/cpp/examples/Makefile.am +++ b/cpp/examples/Makefile.am @@ -64,18 +64,10 @@ 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 +if !HAVE_XML +exclude_examples_regexp="xml" # Exclude XML examples. +endif + # Verify the examples in the buid tree. check-local: all-local verify $(srcdir)/verify_all $(abs_top_srcdir)/.. - -# TODO: -# create a tarball for testing installed examples. -# installcheck-local to use the tarball on installed example and clean up after. -# Build and verify installed C++ examples, clean up to avoid rpmbuild warnings. -# EXAMPLE_FLAGS=-I$(DESTDIR)$(includedir) -L$(DESTDIR)$(libdir) -Wl,-rpath,$(DESTDIR)$(libdir) -# EXAMPLE_DIR=$(DESTDIR)$(pkgdatadir)/examples/cpp -# installcheck-local: -# cd $(EXAMPLE_DIR) && $(MAKE) CXX="$(CXX)" CXXFLAGS="$(EXAMPLE_FLAGS)" all -# cd $(EXAMPLE_DIR) && QPIDD=$(sbindir)/qpidd $(srcdir)/verify * -# cd $(EXAMPLE_DIR) && $(MAKE) clean - -- cgit v1.2.1