Refactored c++ client library to allow multiple protocols to be

used simultaneously:
- Added in capability for client library plugins:
  Client library will load in plugin modules from
  the client library module directory on library load.
- Add protocol option into the standard client command line options
- Split plugin module load area into daemon and client;
  default daemon module directory is now <libdir>/qpid/daemon,
  default client module directory is <libdir>/qpid/client.
- Changed names of plugins to leave out libqpid prefix


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@694113 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 insertions, 4 deletions

diff --git a/qpid/cpp/src/cluster.mk b/qpid/cpp/src/cluster.mk
index 334cc907e3..bb9546f387 100644
--- a/qpid/cpp/src/cluster.mk
+++ b/qpid/cpp/src/cluster.mk
@@ -1,11 +1,11 @@
 #
 # Cluster library makefile fragment, to be included in Makefile.am
 # 
-lib_LTLIBRARIES += libqpidcluster.la
+dmodule_LTLIBRARIES += cluster.la
 
 if CPG
 
-libqpidcluster_la_SOURCES = \
+cluster_la_SOURCES = \
   qpid/cluster/types.h \
   qpid/cluster/Cluster.cpp \
   qpid/cluster/Cluster.h \
@@ -31,10 +31,12 @@ libqpidcluster_la_SOURCES = \
   qpid/cluster/DumpClient.h \
   qpid/cluster/DumpClient.cpp
 
-libqpidcluster_la_LIBADD= -lcpg libqpidbroker.la libqpidclient.la
+cluster_la_LIBADD= -lcpg libqpidbroker.la libqpidclient.la
 
 else
 # Empty stub library to satisfy rpm spec file.
-libqpidcluster_la_SOURCES = 
+cluster_la_SOURCES = 
 
 endif
+
+cluster_la_LDFLAGS = $(PLUGINLDFLAGS)