diff options
| author | Alan Conway <aconway@apache.org> | 2011-03-18 21:38:00 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2011-03-18 21:38:00 +0000 |
| commit | db22714f2217bbf90c5f9ee57f5fb03d5b81377e (patch) | |
| tree | 2d0f82715c00355e1502e9f62b381b80b476f409 /cpp/src/Makefile.am | |
| parent | 8ad522efb72738fad32493be76fef9c71e5d530f (diff) | |
| download | qpid-python-db22714f2217bbf90c5f9ee57f5fb03d5b81377e.tar.gz | |
QPID-3155: Install module libraries during install-exec phase
The C++ automake system has 2 install phases, exec and data. Module
libraries are installed incorrectly in the data phase. Fix the
makefiles to install them in the exec phase.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1083077 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/Makefile.am')
| -rw-r--r-- | cpp/src/Makefile.am | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index 0820a7a29a..172bde35e6 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -127,14 +127,14 @@ qpidexec_SCRIPTS = qpidtestdir = $(qpidexecdir)/tests qpidtest_PROGRAMS = qpidtest_SCRIPTS = -tmoduledir = $(libdir)/qpid/tests -tmodule_LTLIBRARIES= +tmoduleexecdir = $(libdir)/qpid/tests +tmoduleexec_LTLIBRARIES= AM_CXXFLAGS += -DBOOST_FILESYSTEM_VERSION=2 ## Automake macros to build libraries and executables. -qpidd_CXXFLAGS = $(AM_CXXFLAGS) -DQPIDD_MODULE_DIR=\"$(dmoduledir)\" -DQPIDD_CONF_FILE=\"$(sysconfdir)/qpidd.conf\" -libqpidclient_la_CXXFLAGS = $(AM_CXXFLAGS) -DQPIDC_MODULE_DIR=\"$(cmoduledir)\" -DQPIDC_CONF_FILE=\"$(confdir)/qpidc.conf\" +qpidd_CXXFLAGS = $(AM_CXXFLAGS) -DQPIDD_MODULE_DIR=\"$(dmoduleexecdir)\" -DQPIDD_CONF_FILE=\"$(sysconfdir)/qpidd.conf\" +libqpidclient_la_CXXFLAGS = $(AM_CXXFLAGS) -DQPIDC_MODULE_DIR=\"$(cmoduleexecdir)\" -DQPIDC_CONF_FILE=\"$(confdir)/qpidc.conf\" qpidd_LDADD = \ libqpidbroker.la \ @@ -200,10 +200,10 @@ lib_LTLIBRARIES = libqpidtypes.la libqpidcommon.la libqpidbroker.la libqpidclien # Definitions for client and daemon plugins PLUGINLDFLAGS=-no-undefined -module -avoid-version confdir=$(sysconfdir)/qpid -dmoduledir=$(libdir)/qpid/daemon -cmoduledir=$(libdir)/qpid/client -dmodule_LTLIBRARIES = -cmodule_LTLIBRARIES = +dmoduleexecdir=$(libdir)/qpid/daemon +cmoduleexecdir=$(libdir)/qpid/client +dmoduleexec_LTLIBRARIES = +cmoduleexec_LTLIBRARIES = include cluster.mk include acl.mk @@ -245,7 +245,7 @@ rdma_la_LIBADD = \ rdma_la_LDFLAGS = $(PLUGINLDFLAGS) rdma_la_CXXFLAGS = \ $(AM_CXXFLAGS) -Wno-missing-field-initializers -dmodule_LTLIBRARIES += \ +dmoduleexec_LTLIBRARIES += \ rdma.la rdmaconnector_la_SOURCES = \ @@ -257,7 +257,7 @@ rdmaconnector_la_LIBADD = \ rdmaconnector_la_LDFLAGS = $(PLUGINLDFLAGS) rdmaconnector_la_CXXFLAGS = \ $(AM_CXXFLAGS) -Wno-missing-field-initializers -cmodule_LTLIBRARIES += \ +cmoduleexec_LTLIBRARIES += \ rdmaconnector.la # RDMA test/sample programs |