You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/10/27 02:27:32 UTC
svn commit: r468206 - in
/incubator/activemq/activemq-cpp/trunk/activemq-cpp: configure.ac
src/examples/Makefile.am src/main/Makefile.am
src/test-integration/Makefile.am src/test/Makefile.am
Author: chirino
Date: Thu Oct 26 17:27:31 2006
New Revision: 468206
URL: http://svn.apache.org/viewvc?view=rev&rev=468206
Log:
Switch build so that it produces a static lib. I think staying static would be best until
the implemenation stablizes.
Modified:
incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/Makefile.am
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.am
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/Makefile.am
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac?view=diff&rev=468206&r1=468205&r2=468206
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac Thu Oct 26 17:27:31 2006
@@ -49,7 +49,9 @@
AC_PROG_CC
AC_PROG_CXX
-AM_PROG_LIBTOOL
+## Uncomment to use libtool for shared libs
+## AM_PROG_LIBTOOL
+AC_PROG_RANLIB
AM_SANITY_CHECK
AC_LANG_CPLUSPLUS
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/Makefile.am?view=diff&rev=468206&r1=468205&r2=468206
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/Makefile.am (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/Makefile.am Thu Oct 26 17:27:31 2006
@@ -9,4 +9,4 @@
bin_PROGRAMS = example
example_SOURCES = $(cc_sources)
-example_LDADD= ../main/libactivemq-cpp.la
+example_LDADD= ../main/libactivemq-cpp.a
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am?view=diff&rev=468206&r1=468205&r2=468206
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am Thu Oct 26 17:27:31 2006
@@ -226,10 +226,15 @@
## Compiler / Linker Info
##
-#INCLUDES = -I$(srcdir)
-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)
+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
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.am?view=diff&rev=468206&r1=468205&r2=468206
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.am (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.am Thu Oct 26 17:27:31 2006
@@ -15,5 +15,5 @@
##
activemq_test_integration_SOURCES = $(cc_sources)
activemq_test_integration_CXXFLAGS = -I$(srcdir)/../main @CPPUNIT_CFLAGS@
-activemq_test_integration_LDADD= ../main/libactivemq-cpp.la @CPPUNIT_LIBS@
+activemq_test_integration_LDADD= ../main/libactivemq-cpp.a @CPPUNIT_LIBS@
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/Makefile.am?view=diff&rev=468206&r1=468205&r2=468206
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/Makefile.am (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/Makefile.am Thu Oct 26 17:27:31 2006
@@ -63,5 +63,5 @@
##
activemq_test_SOURCES = $(cc_sources)
activemq_test_CXXFLAGS = -I$(srcdir)/../main @CPPUNIT_CFLAGS@
-activemq_test_LDADD= ../main/libactivemq-cpp.la @CPPUNIT_LIBS@
+activemq_test_LDADD= ../main/libactivemq-cpp.a @CPPUNIT_LIBS@