summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorKim van der Riet <kpvdr@apache.org>2009-06-04 13:31:01 +0000
committerKim van der Riet <kpvdr@apache.org>2009-06-04 13:31:01 +0000
commit8cd3c2e8d906ebc34e2297b7f1bd3752448031c0 (patch)
tree2072157e8775a575da13a8573b3eef00e9e7ba7b /cpp/src
parent900b798d1a52a80adccf1bb53b743d422ab15891 (diff)
downloadqpid-python-8cd3c2e8d906ebc34e2297b7f1bd3752448031c0.tar.gz
Made the test_store lib installable to be used with installable tests
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@781732 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Makefile.am2
-rw-r--r--cpp/src/tests/Makefile.am6
2 files changed, 6 insertions, 2 deletions
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index bba0b83509..d9b8b54222 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -116,6 +116,8 @@ qpidexec_SCRIPTS =
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\"
diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am
index 3563faf56a..51922ee3bd 100644
--- a/cpp/src/tests/Makefile.am
+++ b/cpp/src/tests/Makefile.am
@@ -47,6 +47,8 @@ qpidexec_SCRIPTS =
qpidtestdir = $(qpidexecdir)/test
qpidtest_PROGRAMS =
qpidtest_SCRIPTS =
+tmoduledir = $(libdir)/qpid/test
+tmodule_LTLIBRARIES=
#
# Unit test program
@@ -128,10 +130,10 @@ check_LTLIBRARIES += libshlibtest.la
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