You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2007/06/26 21:38:08 UTC
svn commit: r550917 - in /activemq/activemq-cpp/trunk/src:
examples/Makefile.am main/Makefile.am main/activemq/util/Config.h
main/cms/Config.h test-integration/Makefile.am test/Makefile.am
Author: tabish
Date: Tue Jun 26 12:38:07 2007
New Revision: 550917
URL: http://svn.apache.org/viewvc?view=rev&rev=550917
Log:
http://issues.apache.org/activemq/browse/AMQCPP-115
Attempting to get shared libraries building on Unix systems.
Modified:
activemq/activemq-cpp/trunk/src/examples/Makefile.am
activemq/activemq-cpp/trunk/src/main/Makefile.am
activemq/activemq-cpp/trunk/src/main/activemq/util/Config.h
activemq/activemq-cpp/trunk/src/main/cms/Config.h
activemq/activemq-cpp/trunk/src/test-integration/Makefile.am
activemq/activemq-cpp/trunk/src/test/Makefile.am
Modified: activemq/activemq-cpp/trunk/src/examples/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/examples/Makefile.am?view=diff&rev=550917&r1=550916&r2=550917
==============================================================================
--- activemq/activemq-cpp/trunk/src/examples/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/src/examples/Makefile.am Tue Jun 26 12:38:07 2007
@@ -26,4 +26,4 @@
bin_PROGRAMS = example
example_SOURCES = $(cc_sources)
-example_LDADD= ../main/libactivemq-cpp.a
+example_LDADD= ../main/libactivemq-cpp.la
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=550917&r1=550916&r2=550917
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/src/main/Makefile.am Tue Jun 26 12:38:07 2007
@@ -325,17 +325,16 @@
## Compiler / Linker Info
##
-lib_LIBRARIES= libactivemq-cpp.a
-libactivemq_cpp_a_SOURCES= $(h_sources) $(cc_sources)
+## lib_LIBRARIES= libactivemq-cpp.a
+## libactivemq_cpp_a_SOURCES= $(h_sources) $(cc_sources)
##
## Uncomment to build a shared lib
##
-##lib_LTLIBRARIES= libactivemq-cpp.la
-##libactivemq_cpp_la_SOURCES= $(h_sources) $(cc_sources)
-##libactivemq_cpp_la_LDFLAGS= -version-info $(ACTIVEMQ_LIBRARY_VERSION) -release $(ACTIVEMQ_VERSION)
-##libactivemq_cpp_la_LIBADD=-lpthread -ldl -luuid
-
+lib_LTLIBRARIES= libactivemq-cpp.la
+libactivemq_cpp_la_SOURCES= $(h_sources) $(cc_sources)
+libactivemq_cpp_la_LDFLAGS= -version-info $(ACTIVEMQ_LIBRARY_VERSION) -release $(ACTIVEMQ_VERSION)
+libactivemq_cpp_la_LIBADD=-lpthread -ldl -luuid
##
## Packaging Info
Modified: activemq/activemq-cpp/trunk/src/main/activemq/util/Config.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/util/Config.h?view=diff&rev=550917&r1=550916&r2=550917
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/util/Config.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/util/Config.h Tue Jun 26 12:38:07 2007
@@ -18,40 +18,44 @@
#define ACTIVEMQ_UTIL_CONFIG_H_
#ifdef AMQCPP_DLL
-#ifdef AMQCPP_EXPORTS
-#define AMQCPP_API __declspec(dllexport)
+ #ifdef AMQCPP_EXPORTS
+ #define AMQCPP_API __declspec(dllexport)
+ #else
+ #define AMQCPP_API __declspec(dllimport)
+ #endif
#else
-#define AMQCPP_API __declspec(dllimport)
-#endif
-#else
-#define AMQCPP_API
+ #if defined(__GNUC__) && __GNUC__ >= 4
+ #define AMQCPP_API __attribute__ ((visibility("default")))
+ #else
+ #define AMQCPP_API
+ #endif
#endif
//
-// The purpose of this header is to try to detect the supported headers
+// The purpose of this header is to try to detect the supported headers
// of the platform when the ./configure script is not being used to generate
// the config.h file.
//
-#if defined(HAVE_CONFIG_H)
+#if defined(HAVE_CONFIG_H)
- // config.h is generated by the ./configure script and it only
- // used by unix like systems (including cygwin)
- #include <config.h>
+ // config.h is generated by the ./configure script and it only
+ // used by unix like systems (including cygwin)
+ #include <config.h>
#else /* !defined(HAVE_CONFIG_H) */
- // Not using ./configure script and make system.. chances are your using the native build tools
- // of Windows or OS X to do this build
-
- #if defined(_WIN32)
+ // Not using ./configure script and make system.. chances are your using the native build tools
+ // of Windows or OS X to do this build
+
+ #if defined(_WIN32)
#ifndef HAVE_OBJBASE_H
- #define HAVE_OBJBASE_H
+ #define HAVE_OBJBASE_H
#endif
#ifndef HAVE_RPCDCE_H
- #define HAVE_RPCDCE_H
+ #define HAVE_RPCDCE_H
#endif
#ifndef HAVE_WINSOCK2_H
- #define HAVE_WINSOCK2_H
+ #define HAVE_WINSOCK2_H
#endif
#ifndef HAVE_STRUCT_ADDRINFO
#define HAVE_STRUCT_ADDRINFO
@@ -65,9 +69,9 @@
#ifndef HAVE_WINDOWS_H
#define HAVE_WINDOWS_H
#endif
- #else
+ #else
#ifndef HAVE_UUID_UUID_H
- #define HAVE_UUID_UUID_H
+ #define HAVE_UUID_UUID_H
#endif
#ifndef HAVE_UUID_T
#define HAVE_UUID_T
@@ -75,7 +79,7 @@
#ifndef HAVE_PTHREAD_H
#define HAVE_PTHREAD_H
#endif
- #endif
+ #endif
#endif /* !defined(HAVE_CONFIG_H) */
Modified: activemq/activemq-cpp/trunk/src/main/cms/Config.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/cms/Config.h?view=diff&rev=550917&r1=550916&r2=550917
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/cms/Config.h (original)
+++ activemq/activemq-cpp/trunk/src/main/cms/Config.h Tue Jun 26 12:38:07 2007
@@ -19,13 +19,17 @@
#define CMS_CONFIG_H
#ifdef CMS_DLL
-#ifdef CMS_EXPORTS
-#define CMS_API __declspec(dllexport)
+ #ifdef CMS_EXPORTS
+ #define CMS_API __declspec(dllexport)
+ #else
+ #define CMS_API __declspec(dllimport)
+ #endif
#else
-#define CMS_API __declspec(dllimport)
-#endif
-#else
-#define CMS_API
+ #if defined(__GNUC__) && __GNUC__ >= 4
+ #define CMS_API __attribute__ ((visibility("default")))
+ #else
+ #define CMS_API
+ #endif
#endif
#endif /*CMS_CONFIG_H*/
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=550917&r1=550916&r2=550917
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/Makefile.am Tue Jun 26 12:38:07 2007
@@ -42,8 +42,7 @@
##
## Compiler/Linker Options
##
-CXXFLAGS = @CXXFLAGS@ -Wno-non-virtual-dtor -Wno-unused-parameter -Wno-uninitialized
activemq_test_integration_SOURCES = $(cc_sources)
-activemq_test_integration_CXXFLAGS = -I$(srcdir)/../main @CPPUNIT_CFLAGS@
-activemq_test_integration_LDADD= ../main/libactivemq-cpp.a @CPPUNIT_LIBS@
+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@
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=550917&r1=550916&r2=550917
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/src/test/Makefile.am Tue Jun 26 12:38:07 2007
@@ -96,14 +96,14 @@
## Compile this as part of make check
check_PROGRAMS = activemq-test
+
## Also run the tests as part of make check
TESTS = $(check_PROGRAMS)
##
## Compiler/Linker Options
##
-CXXFLAGS = @CXXFLAGS@ -Wno-non-virtual-dtor -Wno-unused-parameter -Wno-uninitialized
activemq_test_SOURCES = $(cc_sources)
-activemq_test_CXXFLAGS = -I$(srcdir)/../main @CPPUNIT_CFLAGS@
-activemq_test_LDADD= ../main/libactivemq-cpp.a @CPPUNIT_LIBS@
+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@