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 | f49b6190fa96f024dd91794703f5a0b1cb3ae2dd (patch) | |
| tree | eba6527f2e082ddc4efb50522cee32869f8dc08a /qpid/cpp/src/cluster.mk | |
| parent | 44f245f131a7464e153b213ed1ed886942987077 (diff) | |
| download | qpid-python-f49b6190fa96f024dd91794703f5a0b1cb3ae2dd.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@1083077 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/cluster.mk')
| -rw-r--r-- | qpid/cpp/src/cluster.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qpid/cpp/src/cluster.mk b/qpid/cpp/src/cluster.mk index a791b2d41a..3ce4ce25b3 100644 --- a/qpid/cpp/src/cluster.mk +++ b/qpid/cpp/src/cluster.mk @@ -18,7 +18,7 @@ # # # Cluster library makefile fragment, to be included in Makefile.am -# +# # Optional CMAN support @@ -34,7 +34,7 @@ endif if HAVE_LIBCPG -dmodule_LTLIBRARIES += cluster.la +dmoduleexec_LTLIBRARIES += cluster.la cluster_la_SOURCES = \ $(CMAN_SOURCES) \ @@ -102,7 +102,7 @@ cluster_la_CXXFLAGS = $(AM_CXXFLAGS) -fno-strict-aliasing cluster_la_LDFLAGS = $(PLUGINLDFLAGS) # The watchdog plugin and helper executable -dmodule_LTLIBRARIES += watchdog.la +dmoduleexec_LTLIBRARIES += watchdog.la watchdog_la_SOURCES = qpid/cluster/WatchDogPlugin.cpp watchdog_la_LIBADD = libqpidbroker.la watchdog_la_LDFLAGS = $(PLUGINLDFLAGS) |