You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kp...@apache.org on 2009/06/04 15:31:02 UTC

svn commit: r781732 - in /qpid/trunk/qpid/cpp/src: Makefile.am tests/Makefile.am

Author: kpvdr
Date: Thu Jun  4 13:31:01 2009
New Revision: 781732

URL: http://svn.apache.org/viewvc?rev=781732&view=rev
Log:
Made the test_store lib installable to be used with installable tests

Modified:
    qpid/trunk/qpid/cpp/src/Makefile.am
    qpid/trunk/qpid/cpp/src/tests/Makefile.am

Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=781732&r1=781731&r2=781732&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Thu Jun  4 13:31:01 2009
@@ -116,6 +116,8 @@
 qpidtestdir = $(qpidexecdir)/test
 qpidtest_PROGRAMS =
 qpidtest_SCRIPTS =
+tmoduledir = $(libdir)/qpid/test
+tmodule_LTLIBRARIES=
 
 ## Automake macros to build libraries and executables.
 qpidd_CXXFLAGS = $(AM_CXXFLAGS) -DQPIDD_MODULE_DIR=\"$(dmoduledir)\" -DQPIDD_CONF_FILE=\"$(sysconfdir)/qpidd.conf\"

Modified: qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/Makefile.am?rev=781732&r1=781731&r2=781732&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/tests/Makefile.am Thu Jun  4 13:31:01 2009
@@ -47,6 +47,8 @@
 qpidtestdir = $(qpidexecdir)/test
 qpidtest_PROGRAMS =
 qpidtest_SCRIPTS =
+tmoduledir = $(libdir)/qpid/test
+tmodule_LTLIBRARIES=
 
 #
 # Unit test program
@@ -128,10 +130,10 @@
 libshlibtest_la_LDFLAGS = $(TESTLIBFLAGS)
 libshlibtest_la_SOURCES = shlibtest.cpp
 
-check_LTLIBRARIES += test_store.la
+tmodule_LTLIBRARIES += test_store.la
 test_store_la_SOURCES = test_store.cpp
 test_store_la_LIBADD = $(lib_broker) # FIXME aconway 2009-04-03: required?
-test_store_la_LDFLAGS = $(TESTLIBFLAGS)
+test_store_la_LDFLAGS = -module
 
 include cluster.mk
 if SSL



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org