diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2009-06-04 13:31:01 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2009-06-04 13:31:01 +0000 |
| commit | 9cfce1d6d2a975fb208b33941814b09ee0c19a37 (patch) | |
| tree | 2ba0ef5c4cf3603052574c7e83d8f9b39fd76b64 | |
| parent | d7e2d5b8a2ebaa2188a294dd999bff8e27df15b6 (diff) | |
| download | qpid-python-9cfce1d6d2a975fb208b33941814b09ee0c19a37.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@781732 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/Makefile.am | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/Makefile.am | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am index bba0b83509..d9b8b54222 100644 --- a/qpid/cpp/src/Makefile.am +++ b/qpid/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/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am index 3563faf56a..51922ee3bd 100644 --- a/qpid/cpp/src/tests/Makefile.am +++ b/qpid/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 |