You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2008/06/23 15:53:16 UTC
svn commit: r670571 - in /incubator/qpid/trunk/qpid/cpp/examples: Makefile
Makefile.am verify_all
Author: aconway
Date: Mon Jun 23 06:53:15 2008
New Revision: 670571
URL: http://svn.apache.org/viewvc?rev=670571&view=rev
Log:
Fix path problems in examples make check
Modified:
incubator/qpid/trunk/qpid/cpp/examples/Makefile
incubator/qpid/trunk/qpid/cpp/examples/Makefile.am
incubator/qpid/trunk/qpid/cpp/examples/verify_all
Modified: incubator/qpid/trunk/qpid/cpp/examples/Makefile
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/Makefile?rev=670571&r1=670570&r2=670571&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/Makefile (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/Makefile Mon Jun 23 06:53:15 2008
@@ -202,6 +202,9 @@
examplesdir = $(pkgdatadir)/examples
examples_DATA = README $(MAKEDIST)
EXTRA_DIST = $(examples_DATA) README.verify verify verify_all
+
+# For older versions of automake
+abs_top_srcdir = /home/aconway/qpid/cpp/examples/..
all: all-recursive
.SUFFIXES:
@@ -542,7 +545,7 @@
# Verify the examples in the buid tree.
check-local:
- $(srcdir)/verify_all $(abs_top_srcdir)/.. $(abs_top_builddir)/src/qpidd $(exclude_examples_regexp)
+ $(srcdir)/verify_all $(abs_top_srcdir)/.. $(top_builddir)/src/qpidd $(exclude_examples_regexp)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: incubator/qpid/trunk/qpid/cpp/examples/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/Makefile.am?rev=670571&r1=670570&r2=670571&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/Makefile.am Mon Jun 23 06:53:15 2008
@@ -17,7 +17,10 @@
EXTRA_DIST = $(examples_DATA) README.verify verify verify_all
+# For older versions of automake
+abs_top_srcdir = @abs_top_srcdir@
+
# Verify the examples in the buid tree.
check-local:
- $(srcdir)/verify_all $(abs_top_srcdir)/.. $(abs_top_builddir)/src/qpidd $(exclude_examples_regexp)
+ $(srcdir)/verify_all $(abs_top_srcdir)/.. $(top_builddir)/src/qpidd $(exclude_examples_regexp)
Modified: incubator/qpid/trunk/qpid/cpp/examples/verify_all
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/verify_all?rev=670571&r1=670570&r2=670571&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/verify_all (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/verify_all Mon Jun 23 06:53:15 2008
@@ -15,7 +15,7 @@
export QPID_PORT PYTHON_EXAMPLES PYTHONPATH
test -d $PYTHON_EXAMPLES || echo "WARNING: No python examples. $PYTHON_EXAMPLES not found."
-find="find examples"
+find="find"
test -d $PYTHON_EXAMPLES && find="$find $PYTHON_EXAMPLES"
find="$find -name verify"
test -d $PYTHON_EXAMPLES && \