Fix version info

- no version info for modules
- no $(PLUGINLDFLAGS)  on libqmfconsole, typo in previous merge.


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

7 files changed, 11 insertions, 30 deletions

diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index b364b46e17..30df5a1da2 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -232,8 +232,7 @@ rdma_la_LIBADD = \
   libqpidbroker.la \
   librdmawrap.la \
   -libverbs
-RDMA_VERSION_INFO  = 2:0:0
-rdma_la_LDFLAGS = $(PLUGINLDFLAGS) -version-info $(RDMA_VERSION_INFO)
+rdma_la_LDFLAGS = $(PLUGINLDFLAGS)
 rdma_la_CXXFLAGS = \
   $(AM_CXXFLAGS) -Wno-missing-field-initializers
 dmodule_LTLIBRARIES += \
@@ -245,8 +244,7 @@ rdmaconnector_la_LIBADD = \
   libqpidclient.la \
   librdmawrap.la \
   -libverbs
-RDMACONNECTOR_VERSION_INFO = 2:0:0
-rdmaconnector_la_LDFLAGS = $(PLUGINLDFLAGS) -version-info $(RDMACONNECTOR_VERSION_INFO)
+rdmaconnector_la_LDFLAGS = $(PLUGINLDFLAGS)
 rdmaconnector_la_CXXFLAGS = \
   $(AM_CXXFLAGS) -Wno-missing-field-initializers
 cmodule_LTLIBRARIES += \
@@ -650,7 +648,6 @@ libqpidbroker_la_SOURCES = \
   qpid/management/ManagementTopicExchange.h \
   qpid/sys/TCPIOPlugin.cpp
 
-# Library Version Information:
 QPIDBROKER_VERSION_INFO = 2:0:0
 libqpidbroker_la_LDFLAGS = -version-info $(QPIDBROKER_VERSION_INFO)
 
@@ -714,7 +711,6 @@ libqpidclient_la_SOURCES =			\
   qpid/client/TCPConnector.cpp			\
   qpid/client/TCPConnector.h
 
-# Library Version Information:
 QPIDCLIENT_VERSION_INFO  = 2:0:0
 libqpidclient_la_LDFLAGS = -version-info $(QPIDCLIENT_VERSION_INFO)
 
@@ -760,7 +756,6 @@ libqpidmessaging_la_SOURCES =			\
   qpid/client/amqp0_10/SimpleUrlParser.h	\
   qpid/client/amqp0_10/SimpleUrlParser.cpp
 
-# Library Version Information:
 QPIDMESSAGING_VERSION_INFO  = 2:0:0
 libqpidmessaging_la_LDFLAGS = -version-info $(QPIDMESSAGING_VERSION_INFO)
 
diff --git a/cpp/src/acl.mk b/cpp/src/acl.mk
index 0450905902..bcd1d88335 100644
--- a/cpp/src/acl.mk
+++ b/cpp/src/acl.mk
@@ -37,6 +37,5 @@ if SUNOS
   acl_la_LIBADD +=  libqmfagent.la libqmfconsole.la libqpidcommon.la -lboost_program_options $(SUNCC_RUNTIME_LIBS)
 endif
 
-ACL_VERSION_INFO  = 2:0:0
-acl_la_LDFLAGS = $(PLUGINLDFLAGS) -version-info $(ACL_VERSION_INFO)
+acl_la_LDFLAGS = $(PLUGINLDFLAGS)
 
diff --git a/cpp/src/cluster.mk b/cpp/src/cluster.mk
index 2e4942dfdf..2a648e968c 100644
--- a/cpp/src/cluster.mk
+++ b/cpp/src/cluster.mk
@@ -97,15 +97,13 @@ cluster_la_SOURCES =				\
 
 cluster_la_LIBADD=  -lcpg $(libcman) libqpidbroker.la libqpidclient.la
 cluster_la_CXXFLAGS = $(AM_CXXFLAGS) -fno-strict-aliasing
-CLUSTER_VERSION_INFO = 2:0:0
-cluster_la_LDFLAGS = $(PLUGINLDFLAGS) -version-info $(CLUSTER_VERSION_INFO)
+cluster_la_LDFLAGS = $(PLUGINLDFLAGS)
 
 # The watchdog plugin and helper executable
 dmodule_LTLIBRARIES += watchdog.la
 watchdog_la_SOURCES = qpid/cluster/WatchDogPlugin.cpp
 watchdog_la_LIBADD = libqpidbroker.la
-WATCHDOG_VERSION_INFO  = 2:0:0
-watchdog_la_LDFLAGS = $(PLUGINLDFLAGS) -version-info $(WATCHDOG_VERSION_INFO)
+watchdog_la_LDFLAGS = $(PLUGINLDFLAGS)
 
 qpidexec_PROGRAMS += qpidd_watchdog
 qpidd_watchdog_SOURCES = qpid/cluster/qpidd_watchdog.cpp
diff --git a/cpp/src/qmfc.mk b/cpp/src/qmfc.mk
index 9e8078f364..b0ef68dea4 100644
--- a/cpp/src/qmfc.mk
+++ b/cpp/src/qmfc.mk
@@ -53,6 +53,5 @@ libqmfconsole_la_SOURCES =			\
 
 libqmfconsole_la_LIBADD = libqpidclient.la
 
-# Library Version Information:
 QMFCONSOLE_VERSION_INFO  = 2:0:0
-libqmfconsole_la_LDFLAGS = $(PLUGINLDFLAGS) -version-info $(QMFCONSOLE_VERSION_INFO)
+libqmfconsole_la_LDFLAGS = -version-info $(QMFCONSOLE_VERSION_INFO)
diff --git a/cpp/src/replication.mk b/cpp/src/replication.mk
index e27920d2ee..dbe071f405 100644
--- a/cpp/src/replication.mk
+++ b/cpp/src/replication.mk
@@ -32,11 +32,7 @@ replicating_listener_la_LIBADD = libqpidbroker.la
 if SUNOS
   replicating_listener_la_LIBADD += libqpidcommon.la -lboost_program_options -luuid $(SUNCC_RUNTIME_LIBS)
 endif
-
-# Library Version Information:
-REPLICATING_LISTENER_VERSION_INFO = 2:0:0
-replicating_listener_la_LDFLAGS = $(PLUGINLDFLAGS) \
-  -version-info $(REPLICATING_LISTENER_VERSION_INFO)
+replicating_listener_la_LDFLAGS = $(PLUGINLDFLAGS)
 
 # a custom exchange plugin that allows an exchange to be created that
 # can process the messages from a replication queue (populated on the
@@ -52,8 +48,5 @@ replication_exchange_la_LIBADD = libqpidbroker.la
 if SUNOS
   replication_exchange_la_LIBADD += libqpidcommon.la -lboost_program_options $(SUNCC_RUNTIME_LIBS) -luuid
 endif
-# Library Version Information:
-REPLICATION_EXCHANGE_VERSION_INFO  = 2:0:0
-replication_exchange_la_LDFLAGS = $(PLUGINLDFLAGS) \
-  -version-info $(REPLICATION_EXCHANGE_VERSION_INFO)
+replication_exchange_la_LDFLAGS = $(PLUGINLDFLAGS)
 
diff --git a/cpp/src/ssl.mk b/cpp/src/ssl.mk
index 40cb9d021a..5fbdd55438 100644
--- a/cpp/src/ssl.mk
+++ b/cpp/src/ssl.mk
@@ -45,8 +45,7 @@ ssl_la_LIBADD= libqpidbroker.la libsslcommon.la
 
 ssl_la_CXXFLAGS=$(AM_CXXFLAGS) $(SSL_CFLAGS)
 
-SSL_VERSION_INFO  = 2:0:0
-ssl_la_LDFLAGS = $(PLUGINLDFLAGS) -version-info $(SSL_VERSION_INFO)
+ssl_la_LDFLAGS = $(PLUGINLDFLAGS)
 
 dmodule_LTLIBRARIES += ssl.la
 
@@ -59,8 +58,7 @@ sslconnector_la_LIBADD = \
 
 sslconnector_la_CXXFLAGS = $(AM_CXXFLAGS) -DQPIDC_CONF_FILE=\"$(confdir)/qpidc.conf\"  $(SSL_CFLAGS)
 
-SSLCONNECTOR_VERSION_INFO  = 2:0:0
-sslconnector_la_LDFLAGS = $(PLUGINLDFLAGS) -version-info $(SSLCONNECTOR_VERSION_INFO)
+sslconnector_la_LDFLAGS = $(PLUGINLDFLAGS)
 
 cmodule_LTLIBRARIES += \
   sslconnector.la
diff --git a/cpp/src/xml.mk b/cpp/src/xml.mk
index 237220291e..0d700fcc03 100644
--- a/cpp/src/xml.mk
+++ b/cpp/src/xml.mk
@@ -25,6 +25,5 @@ xml_la_SOURCES =  \
 
 xml_la_LIBADD = -lxerces-c -lxqilla libqpidbroker.la
 
-XML_VERSION_INFO = 2:0:0
-xml_la_LDFLAGS = $(PLUGINLDFLAGS) -version-info $(XML_VERSION_INFO)
+xml_la_LDFLAGS = $(PLUGINLDFLAGS)