activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nmitt...@apache.org
Subject svn commit: r554243 - in /activemq/activemq-cpp/trunk: configure.ac src/main/Makefile.am src/test-benchmarks/Makefile.am src/test-integration/Makefile.am src/test/Makefile.am
Date Sat, 07 Jul 2007 19:10:20 GMT
Author: nmittler
Date: Sat Jul  7 12:10:19 2007
New Revision: 554243

URL: http://svn.apache.org/viewvc?view=rev&rev=554243
Log:
AMQCPP-134 - fixing warnings when building tests on gcc

Modified:
    activemq/activemq-cpp/trunk/configure.ac
    activemq/activemq-cpp/trunk/src/main/Makefile.am
    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=554243&r1=554242&r2=554243
==============================================================================
--- activemq/activemq-cpp/trunk/configure.ac (original)
+++ activemq/activemq-cpp/trunk/configure.ac Sat Jul  7 12:10:19 2007
@@ -18,7 +18,7 @@
 ## --------------------------------
 ## Initialization macros.
 ## --------------------------------
-AC_INIT(activemq-cpp, 1, activemq-dev@geronimo.apache.org)
+AC_INIT(activemq-cpp, 1, dev@activemq.apache.org)
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_SRCDIR(src/main/activemq/core/ActiveMQConnection.cpp)
 
@@ -122,8 +122,17 @@
     PLAT_LIBS="-lm -lpthread -luuid"
 esac
 
-CXXFLAGS="$CXXFLAGS $PLAT_CXXFLAGS -W -Wall -fPIC -fstrict-aliasing -Wstrict-aliasing=2 -Wno-long-long"
-LIBS="$LIBS $PLAT_LIBS"
+## Flags for building the activemq-cpp library
+AC_SUBST([AMQ_CXXFLAGS])
+AC_SUBST([AMQ_LIBS])
+AMQ_CXXFLAGS="$PLAT_CXXFLAGS -W -Wall -fPIC -fstrict-aliasing -Wstrict-aliasing=2 -Wno-long-long"
+AMQ_LIBS="$PLAT_LIBS"
+
+## 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_LIBS="../main/libactivemq-cpp.la"
 
 AC_DEFUN([AMQCPP_CHECK_VISIBILITY], [
     AC_MSG_CHECKING([whether -fvisibility flags work])

Modified: activemq/activemq-cpp/trunk/src/main/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/Makefile.am?view=diff&rev=554243&r1=554242&r2=554243
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/src/main/Makefile.am Sat Jul  7 12:10:19 2007
@@ -333,8 +333,9 @@
 ##
 lib_LTLIBRARIES= libactivemq-cpp.la
 libactivemq_cpp_la_SOURCES= $(h_sources) $(cc_sources)
+libactivemq_cpp_la_CXXFLAGS= $(AMQ_CXXFLAGS)
 libactivemq_cpp_la_LDFLAGS= -version-info $(ACTIVEMQ_LIBRARY_VERSION) -release $(ACTIVEMQ_VERSION)
-libactivemq_cpp_la_LIBADD=-lpthread -ldl -luuid
+libactivemq_cpp_la_LIBADD= $(AMQ_LIBS)
 
 ##
 ## Packaging Info

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=554243&r1=554242&r2=554243
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-benchmarks/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/src/test-benchmarks/Makefile.am Sat Jul  7 12:10:19 2007
@@ -33,6 +33,6 @@
 ## Compiler/Linker Options
 ##
 activemq_test_benchmarks_SOURCES = $(cc_sources)
-activemq_test_benchmarks_CXXFLAGS = -Wno-non-virtual-dtor -Wno-unused-parameter -Wno-uninitialized
-I$(srcdir)/../main @CPPUNIT_CFLAGS@
-activemq_test_benchmarks_LDADD= ../main/libactivemq-cpp.la @CPPUNIT_LIBS@
+activemq_test_benchmarks_CXXFLAGS = $(AMQ_TEST_CXXFLAGS) @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=554243&r1=554242&r2=554243
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/Makefile.am Sat Jul  7 12:10:19 2007
@@ -43,6 +43,6 @@
 ## Compiler/Linker Options
 ##
 activemq_test_integration_SOURCES = $(cc_sources)
-activemq_test_integration_CXXFLAGS = -Wno-non-virtual-dtor -Wno-unused-parameter -Wno-uninitialized
-I$(srcdir)/../main @CPPUNIT_CFLAGS@
-activemq_test_integration_LDADD= ../main/libactivemq-cpp.la @CPPUNIT_LIBS@
+activemq_test_integration_CXXFLAGS = $(AMQ_TEST_CXXFLAGS) @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=554243&r1=554242&r2=554243
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/src/test/Makefile.am Sat Jul  7 12:10:19 2007
@@ -104,6 +104,6 @@
 ## Compiler/Linker Options
 ##
 activemq_test_SOURCES = $(cc_sources)
-activemq_test_CXXFLAGS = -Wno-non-virtual-dtor -Wno-unused-parameter -Wno-uninitialized -I$(srcdir)/../main
@CPPUNIT_CFLAGS@
-activemq_test_LDADD= ../main/libactivemq-cpp.la @CPPUNIT_LIBS@
-
+activemq_test_CXXFLAGS = $(AMQ_TEST_CXXFLAGS) @CPPUNIT_CFLAGS@
+activemq_test_LDADD= $(AMQ_TEST_LIBS) @CPPUNIT_LIBS@ 
+ 



Mime
View raw message