You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by nm...@apache.org on 2007/07/07 23:09:52 UTC
svn commit: r554266 - in /activemq/activemq-cpp/trunk: configure.ac
src/test-benchmarks/Makefile.am src/test-integration/Makefile.am
src/test/Makefile.am
Author: nmittler
Date: Sat Jul 7 14:09:51 2007
New Revision: 554266
URL: http://svn.apache.org/viewvc?view=rev&rev=554266
Log:
AMQCPP-134 - moving include directory portion of the test CXX_FLAGS back to the Makefile.am files.
Modified:
activemq/activemq-cpp/trunk/configure.ac
activemq/activemq-cpp/trunk/src/test-benchmarks/Makefile.am
activemq/activemq-cpp/trunk/src/test-integration/Makefile.am
activemq/activemq-cpp/trunk/src/test/Makefile.am
Modified: activemq/activemq-cpp/trunk/configure.ac
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/configure.ac?view=diff&rev=554266&r1=554265&r2=554266
==============================================================================
--- activemq/activemq-cpp/trunk/configure.ac (original)
+++ activemq/activemq-cpp/trunk/configure.ac Sat Jul 7 14:09:51 2007
@@ -131,7 +131,7 @@
## Flags for building the test applications.
AC_SUBST([AMQ_TEST_CXXFLAGS])
AC_SUBST([AMQ_TEST_LIBS])
-AMQ_TEST_CXXFLAGS="$AMQ_CXXFLAGS -Wno-non-virtual-dtor -Wno-unused-parameter -Wno-uninitialized -I${srcdir}/../main"
+AMQ_TEST_CXXFLAGS="$AMQ_CXXFLAGS -Wno-non-virtual-dtor -Wno-unused-parameter -Wno-uninitialized"
AMQ_TEST_LIBS="../main/libactivemq-cpp.la"
Modified: activemq/activemq-cpp/trunk/src/test-benchmarks/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-benchmarks/Makefile.am?view=diff&rev=554266&r1=554265&r2=554266
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-benchmarks/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/src/test-benchmarks/Makefile.am Sat Jul 7 14:09:51 2007
@@ -35,6 +35,6 @@
## Compiler/Linker Options
##
activemq_test_benchmarks_SOURCES = $(cc_sources)
-activemq_test_benchmarks_CXXFLAGS = $(AMQ_TEST_CXXFLAGS) @CPPUNIT_CFLAGS@
+activemq_test_benchmarks_CXXFLAGS = $(AMQ_TEST_CXXFLAGS) -I$(srcdir)/../main @CPPUNIT_CFLAGS@
activemq_test_benchmarks_LDADD= $(AMQ_TEST_LIBS) @CPPUNIT_LIBS@
Modified: activemq/activemq-cpp/trunk/src/test-integration/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/Makefile.am?view=diff&rev=554266&r1=554265&r2=554266
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/Makefile.am Sat Jul 7 14:09:51 2007
@@ -43,6 +43,6 @@
## Compiler/Linker Options
##
activemq_test_integration_SOURCES = $(cc_sources)
-activemq_test_integration_CXXFLAGS = $(AMQ_TEST_CXXFLAGS) @CPPUNIT_CFLAGS@
+activemq_test_integration_CXXFLAGS = $(AMQ_TEST_CXXFLAGS) -I$(srcdir)/../main @CPPUNIT_CFLAGS@
activemq_test_integration_LDADD= $(AMQ_TEST_LIBS) @CPPUNIT_LIBS@
Modified: activemq/activemq-cpp/trunk/src/test/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/Makefile.am?view=diff&rev=554266&r1=554265&r2=554266
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/src/test/Makefile.am Sat Jul 7 14:09:51 2007
@@ -104,6 +104,6 @@
## Compiler/Linker Options
##
activemq_test_SOURCES = $(cc_sources)
-activemq_test_CXXFLAGS = $(AMQ_TEST_CXXFLAGS) @CPPUNIT_CFLAGS@
+activemq_test_CXXFLAGS = $(AMQ_TEST_CXXFLAGS) -I$(srcdir)/../main @CPPUNIT_CFLAGS@
activemq_test_LDADD= $(AMQ_TEST_LIBS) @CPPUNIT_LIBS@