From 2dc35740d139bfd2eba10e6be779a8c0df630c93 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 12 Feb 2008 21:57:36 +0000 Subject: Fix verify error in Makefile.am git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@627141 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/examples/Makefile.am | 5 ++++- cpp/examples/verify_all | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'cpp/examples') diff --git a/cpp/examples/Makefile.am b/cpp/examples/Makefile.am index 6e696c1ab2..92625550e2 100644 --- a/cpp/examples/Makefile.am +++ b/cpp/examples/Makefile.am @@ -45,6 +45,9 @@ VERIFY_FILES= verify verify_all \ EXTRA_DIST=$(nobase_pkgdata_DATA) $(VERIFY_FILES) +verify: + cp $(top_srcdir)/../bin/verify $@ + # Note: we don't use normal automake SUBDIRS because the example # makefiles don't understand all the recursive automake targets. @@ -61,7 +64,7 @@ all-local: cd examples && $(MAKE) CXX="$(CXX)" CXXFLAGS="$(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: all-local +check-local: all-local verify $(srcdir)/verify_all $(abs_top_srcdir) $(abs_top_builddir) # TODO: diff --git a/cpp/examples/verify_all b/cpp/examples/verify_all index 3eb88c7718..e6d75929b2 100755 --- a/cpp/examples/verify_all +++ b/cpp/examples/verify_all @@ -4,7 +4,7 @@ src=$1 ; build=$2 -verify=$src/../bin/verify +verify=./verify qpidd=$build/src/qpidd cpp=$build/examples/examples python=$src/../python -- cgit v1.2.1