Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 47449 invoked from network); 7 Jul 2007 21:10:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Jul 2007 21:10:16 -0000 Received: (qmail 67099 invoked by uid 500); 7 Jul 2007 21:10:18 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 67078 invoked by uid 500); 7 Jul 2007 21:10:18 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 67058 invoked by uid 99); 7 Jul 2007 21:10:18 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 Jul 2007 14:10:18 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 Jul 2007 14:10:13 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id DD1771A981A; Sat, 7 Jul 2007 14:09:52 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r554266 - in /activemq/activemq-cpp/trunk: configure.ac src/test-benchmarks/Makefile.am src/test-integration/Makefile.am src/test/Makefile.am Date: Sat, 07 Jul 2007 21:09:52 -0000 To: commits@activemq.apache.org From: nmittler@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070707210952.DD1771A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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@