You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2012/11/29 13:15:38 UTC
svn commit: r1415137 - in /qpid/trunk/qpid/cpp: bindings/qmf2/examples/cpp/
examples/messaging/ examples/old_api/direct/ examples/old_api/failover/
examples/old_api/fanout/ examples/old_api/pub-sub/
examples/old_api/request-response/ examples/old_api/t...
Author: gsim
Date: Thu Nov 29 12:15:36 2012
New Revision: 1415137
URL: http://svn.apache.org/viewvc?rev=1415137&view=rev
Log:
QPID-3723: Applied patch from Fraser Adams for explicit linking
Modified:
qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/Makefile.am
qpid/trunk/qpid/cpp/examples/messaging/Makefile.am
qpid/trunk/qpid/cpp/examples/old_api/direct/Makefile.am
qpid/trunk/qpid/cpp/examples/old_api/failover/Makefile.am
qpid/trunk/qpid/cpp/examples/old_api/fanout/Makefile.am
qpid/trunk/qpid/cpp/examples/old_api/pub-sub/Makefile.am
qpid/trunk/qpid/cpp/examples/old_api/request-response/Makefile.am
qpid/trunk/qpid/cpp/examples/old_api/tradedemo/Makefile.am
qpid/trunk/qpid/cpp/examples/old_api/xml-exchange/Makefile.am
qpid/trunk/qpid/cpp/examples/qmf-console/Makefile.am
qpid/trunk/qpid/cpp/src/Makefile.am
qpid/trunk/qpid/cpp/src/tests/Makefile.am
qpid/trunk/qpid/cpp/src/tests/testagent.mk
Modified: qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/Makefile.am?rev=1415137&r1=1415136&r2=1415137&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/Makefile.am Thu Nov 29 12:15:36 2012
@@ -24,13 +24,13 @@ AM_CPPFLAGS = $(INCLUDE)
noinst_PROGRAMS=agent event_driven_list_agents list_agents print_events
agent_SOURCES=agent.cpp
-agent_LDADD=$(top_builddir)/src/libqmf2.la
+agent_LDADD=$(top_builddir)/src/libqmf2.la -lqpidtypes -lqpidmessaging
list_agents_SOURCES=list_agents.cpp
-list_agents_LDADD=$(top_builddir)/src/libqmf2.la
+list_agents_LDADD=$(top_builddir)/src/libqmf2.la -lqpidmessaging
event_driven_list_agents_SOURCES=event_driven_list_agents.cpp
-event_driven_list_agents_LDADD=$(top_builddir)/src/libqmf2.la
+event_driven_list_agents_LDADD=$(top_builddir)/src/libqmf2.la -lqpidmessaging
print_events_SOURCES=print_events.cpp
-print_events_LDADD=$(top_builddir)/src/libqmf2.la
+print_events_LDADD=$(top_builddir)/src/libqmf2.la -lqpidtypes -lqpidmessaging
Modified: qpid/trunk/qpid/cpp/examples/messaging/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/messaging/Makefile.am?rev=1415137&r1=1415136&r2=1415137&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/messaging/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/messaging/Makefile.am Thu Nov 29 12:15:36 2012
@@ -33,10 +33,10 @@ hello_xml_SOURCES=hello_xml.cpp
hello_xml_LDADD=$(CLIENT_LIB)
drain_SOURCES=drain.cpp OptionParser.h OptionParser.cpp
-drain_LDADD=$(CLIENT_LIB)
+drain_LDADD=$(CLIENT_LIB) -lqpidtypes
spout_SOURCES=spout.cpp OptionParser.h OptionParser.cpp
-spout_LDADD=$(CLIENT_LIB)
+spout_LDADD=$(CLIENT_LIB) -lqpidtypes
client_SOURCES=client.cpp
client_LDADD=$(CLIENT_LIB)
@@ -45,10 +45,10 @@ server_SOURCES=server.cpp
server_LDADD=$(CLIENT_LIB)
map_sender_SOURCES=map_sender.cpp
-map_sender_LDADD=$(CLIENT_LIB)
+map_sender_LDADD=$(CLIENT_LIB) -lqpidtypes
map_receiver_SOURCES=map_receiver.cpp
-map_receiver_LDADD=$(CLIENT_LIB)
+map_receiver_LDADD=$(CLIENT_LIB) -lqpidtypes
examples_DATA= \
hello_world.cpp \
Modified: qpid/trunk/qpid/cpp/examples/old_api/direct/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/old_api/direct/Makefile.am?rev=1415137&r1=1415136&r2=1415137&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/old_api/direct/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/old_api/direct/Makefile.am Thu Nov 29 12:15:36 2012
@@ -23,13 +23,13 @@ include $(top_srcdir)/examples/makedist.
noinst_PROGRAMS=direct_producer listener declare_queues
direct_producer_SOURCES=direct_producer.cpp
-direct_producer_LDADD=$(CLIENT_LIB)
+direct_producer_LDADD=$(CLIENT_LIB) -lqpidcommon
listener_SOURCES=listener.cpp
-listener_LDADD=$(CLIENT_LIB)
+listener_LDADD=$(CLIENT_LIB) -lqpidcommon
declare_queues_SOURCES=declare_queues.cpp
-declare_queues_LDADD=$(CLIENT_LIB)
+declare_queues_LDADD=$(CLIENT_LIB) -lqpidcommon
examples_DATA= \
direct_producer.cpp \
Modified: qpid/trunk/qpid/cpp/examples/old_api/failover/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/old_api/failover/Makefile.am?rev=1415137&r1=1415136&r2=1415137&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/old_api/failover/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/old_api/failover/Makefile.am Thu Nov 29 12:15:36 2012
@@ -24,13 +24,13 @@ include $(top_srcdir)/examples/makedist.
noinst_PROGRAMS=declare_queues resuming_receiver replaying_sender
declare_queues_SOURCES=declare_queues.cpp
-declare_queues_LDADD=$(CLIENT_LIB)
+declare_queues_LDADD=$(CLIENT_LIB) -lqpidcommon
resuming_receiver_SOURCES=resuming_receiver.cpp
-resuming_receiver_LDADD=$(CLIENT_LIB)
+resuming_receiver_LDADD=$(CLIENT_LIB) -lqpidcommon
replaying_sender_SOURCES=replaying_sender.cpp
-replaying_sender_LDADD=$(CLIENT_LIB)
+replaying_sender_LDADD=$(CLIENT_LIB) -lqpidcommon
examples_DATA= \
declare_queues.cpp \
Modified: qpid/trunk/qpid/cpp/examples/old_api/fanout/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/old_api/fanout/Makefile.am?rev=1415137&r1=1415136&r2=1415137&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/old_api/fanout/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/old_api/fanout/Makefile.am Thu Nov 29 12:15:36 2012
@@ -26,7 +26,7 @@ fanout_producer_SOURCES=fanout_producer.
fanout_producer_LDADD=$(CLIENT_LIB)
listener_SOURCES=listener.cpp
-listener_LDADD=$(CLIENT_LIB)
+listener_LDADD=$(CLIENT_LIB) -lqpidcommon
examples_DATA= \
fanout_producer.cpp \
Modified: qpid/trunk/qpid/cpp/examples/old_api/pub-sub/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/old_api/pub-sub/Makefile.am?rev=1415137&r1=1415136&r2=1415137&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/old_api/pub-sub/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/old_api/pub-sub/Makefile.am Thu Nov 29 12:15:36 2012
@@ -24,10 +24,10 @@ include $(top_srcdir)/examples/makedist.
noinst_PROGRAMS=topic_listener topic_publisher
topic_listener_SOURCES=topic_listener.cpp
-topic_listener_LDADD=$(CLIENT_LIB)
+topic_listener_LDADD=$(CLIENT_LIB) -lqpidcommon
topic_publisher_SOURCES=topic_publisher.cpp
-topic_publisher_LDADD=$(CLIENT_LIB)
+topic_publisher_LDADD=$(CLIENT_LIB) -lqpidcommon
examples_DATA= \
topic_listener.cpp \
Modified: qpid/trunk/qpid/cpp/examples/old_api/request-response/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/old_api/request-response/Makefile.am?rev=1415137&r1=1415136&r2=1415137&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/old_api/request-response/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/old_api/request-response/Makefile.am Thu Nov 29 12:15:36 2012
@@ -24,10 +24,10 @@ include $(top_srcdir)/examples/makedist.
noinst_PROGRAMS=client server
client_SOURCES=client.cpp
-client_LDADD=$(CLIENT_LIB)
+client_LDADD=$(CLIENT_LIB) -lqpidcommon
server_SOURCES=server.cpp
-server_LDADD=$(CLIENT_LIB)
+server_LDADD=$(CLIENT_LIB) -lqpidcommon
examples_DATA= \
server.cpp \
Modified: qpid/trunk/qpid/cpp/examples/old_api/tradedemo/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/old_api/tradedemo/Makefile.am?rev=1415137&r1=1415136&r2=1415137&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/old_api/tradedemo/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/old_api/tradedemo/Makefile.am Thu Nov 29 12:15:36 2012
@@ -24,13 +24,13 @@ include $(top_srcdir)/examples/makedist.
noinst_PROGRAMS=topic_listener topic_publisher declare_queues
topic_listener_SOURCES=topic_listener.cpp
-topic_listener_LDADD=$(CLIENT_LIB)
+topic_listener_LDADD=$(CLIENT_LIB) -lqpidcommon
topic_publisher_SOURCES=topic_publisher.cpp
-topic_publisher_LDADD=$(CLIENT_LIB)
+topic_publisher_LDADD=$(CLIENT_LIB) -lqpidcommon
declare_queues_SOURCES=declare_queues.cpp
-declare_queues_LDADD=$(CLIENT_LIB)
+declare_queues_LDADD=$(CLIENT_LIB) -lqpidcommon
examples_DATA= \
Modified: qpid/trunk/qpid/cpp/examples/old_api/xml-exchange/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/old_api/xml-exchange/Makefile.am?rev=1415137&r1=1415136&r2=1415137&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/old_api/xml-exchange/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/old_api/xml-exchange/Makefile.am Thu Nov 29 12:15:36 2012
@@ -24,13 +24,13 @@ include $(top_srcdir)/examples/makedist.
noinst_PROGRAMS=declare_queues xml_producer listener
declare_queues_SOURCES=declare_queues.cpp
-declare_queues_LDADD=$(CLIENT_LIB)
+declare_queues_LDADD=$(CLIENT_LIB) -lqpidcommon
xml_producer_SOURCES=xml_producer.cpp
-xml_producer_LDADD=$(CLIENT_LIB)
+xml_producer_LDADD=$(CLIENT_LIB) -lqpidcommon
listener_SOURCES=listener.cpp
-listener_LDADD=$(CLIENT_LIB)
+listener_LDADD=$(CLIENT_LIB) -lqpidcommon
EXTRA_DIST= \
README.txt \
Modified: qpid/trunk/qpid/cpp/examples/qmf-console/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/qmf-console/Makefile.am?rev=1415137&r1=1415136&r2=1415137&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/qmf-console/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/qmf-console/Makefile.am Thu Nov 29 12:15:36 2012
@@ -25,19 +25,19 @@ include $(top_srcdir)/examples/makedist.
noinst_PROGRAMS=console printevents ping queuestats cluster-qmon
console_SOURCES=console.cpp
-console_LDADD=$(CONSOLE_LIB)
+console_LDADD=$(CONSOLE_LIB) -lqpidcommon -lqpidclient
printevents_SOURCES=printevents.cpp
-printevents_LDADD=$(CONSOLE_LIB)
+printevents_LDADD=$(CONSOLE_LIB) -lqpidcommon -lqpidclient
ping_SOURCES=ping.cpp
-ping_LDADD=$(CONSOLE_LIB)
+ping_LDADD=$(CONSOLE_LIB) -lqpidcommon -lqpidclient
queuestats_SOURCES=queuestats.cpp
-queuestats_LDADD=$(CONSOLE_LIB)
+queuestats_LDADD=$(CONSOLE_LIB) -lqpidcommon -lqpidclient
cluster_qmon_SOURCES=cluster-qmon.cpp
-cluster_qmon_LDADD=$(CONSOLE_LIB)
+cluster_qmon_LDADD=$(CONSOLE_LIB) -lqpidcommon -lqpidclient
examples_DATA= \
console.cpp \
Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=1415137&r1=1415136&r2=1415137&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Thu Nov 29 12:15:36 2012
@@ -146,7 +146,8 @@ libqpidclient_la_CXXFLAGS = $(AM_CXXFLAG
qpidd_LDADD = \
libqpidbroker.la \
- libqpidcommon.la
+ libqpidcommon.la \
+ -lboost_program_options
posix_qpidd_src = posix/QpiddBroker.cpp
Modified: qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/Makefile.am?rev=1415137&r1=1415136&r2=1415137&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/tests/Makefile.am Thu Nov 29 12:15:36 2012
@@ -154,7 +154,7 @@ receiver_SOURCES = \
receiver.cpp \
TestOptions.h \
ConnectionOptions.h
-receiver_LDADD = $(lib_client)
+receiver_LDADD = $(lib_client) -lboost_program_options -lqpidcommon
qpidexectest_PROGRAMS += sender
sender_SOURCES = \
@@ -162,7 +162,7 @@ sender_SOURCES = \
TestOptions.h \
ConnectionOptions.h \
Statistics.cpp
-sender_LDADD = $(lib_messaging)
+sender_LDADD = $(lib_messaging) -lboost_program_options -lqpidcommon -lqpidtypes -lqpidclient
qpidexectest_PROGRAMS += qpid-receive
qpid_receive_SOURCES = \
@@ -171,7 +171,7 @@ qpid_receive_SOURCES = \
ConnectionOptions.h \
Statistics.h \
Statistics.cpp
-qpid_receive_LDADD = $(lib_messaging)
+qpid_receive_LDADD = $(lib_messaging) -lboost_program_options -lqpidcommon -lqpidtypes
qpidexectest_PROGRAMS += qpid-send
qpid_send_SOURCES = \
@@ -180,42 +180,42 @@ qpid_send_SOURCES = \
ConnectionOptions.h \
Statistics.h \
Statistics.cpp
-qpid_send_LDADD = $(lib_messaging)
+qpid_send_LDADD = $(lib_messaging) -lboost_program_options -lqpidcommon -lqpidtypes
qpidexectest_PROGRAMS+=qpid-perftest
qpid_perftest_SOURCES=qpid-perftest.cpp test_tools.h TestOptions.h ConnectionOptions.h
qpid_perftest_INCLUDES=$(PUBLIC_INCLUDES)
-qpid_perftest_LDADD=$(lib_client)
+qpid_perftest_LDADD=$(lib_client) -lboost_program_options -lqpidcommon
qpidexectest_PROGRAMS+=qpid-txtest
qpid_txtest_INCLUDES=$(PUBLIC_INCLUDES)
qpid_txtest_SOURCES=qpid-txtest.cpp TestOptions.h ConnectionOptions.h
-qpid_txtest_LDADD=$(lib_client)
+qpid_txtest_LDADD=$(lib_client) -lboost_program_options -lqpidcommon
qpidexectest_PROGRAMS+=qpid-latency-test
qpid_latency_test_INCLUDES=$(PUBLIC_INCLUDES)
qpid_latency_test_SOURCES=qpid-latency-test.cpp TestOptions.h ConnectionOptions.h
-qpid_latency_test_LDADD=$(lib_client)
+qpid_latency_test_LDADD=$(lib_client) -lboost_program_options -lqpidcommon
qpidexectest_PROGRAMS+=qpid-client-test
qpid_client_test_INCLUDES=$(PUBLIC_INCLUDES)
qpid_client_test_SOURCES=qpid-client-test.cpp TestOptions.h ConnectionOptions.h
-qpid_client_test_LDADD=$(lib_client)
+qpid_client_test_LDADD=$(lib_client) -lboost_program_options -lqpidcommon
qpidexectest_PROGRAMS+=qpid-topic-listener
qpid_topic_listener_INCLUDES=$(PUBLIC_INCLUDES)
qpid_topic_listener_SOURCES=qpid-topic-listener.cpp TestOptions.h ConnectionOptions.h
-qpid_topic_listener_LDADD=$(lib_client)
+qpid_topic_listener_LDADD=$(lib_client) -lboost_program_options -lqpidcommon
qpidexectest_PROGRAMS+=qpid-topic-publisher
qpid_topic_publisher_INCLUDES=$(PUBLIC_INCLUDES)
qpid_topic_publisher_SOURCES=qpid-topic-publisher.cpp TestOptions.h ConnectionOptions.h
-qpid_topic_publisher_LDADD=$(lib_client)
+qpid_topic_publisher_LDADD=$(lib_client) -lboost_program_options -lqpidcommon
qpidexectest_PROGRAMS+=qpid-ping
qpid_ping_INCLUDES=$(PUBLIC_INCLUDES)
qpid_ping_SOURCES=qpid-ping.cpp test_tools.h TestOptions.h ConnectionOptions.h
-qpid_ping_LDADD=$(lib_client)
+qpid_ping_LDADD=$(lib_client) -lboost_program_options -lqpidcommon
#
# Other test programs
Modified: qpid/trunk/qpid/cpp/src/tests/testagent.mk
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/testagent.mk?rev=1415137&r1=1415136&r2=1415137&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/testagent.mk (original)
+++ qpid/trunk/qpid/cpp/src/tests/testagent.mk Thu Nov 29 12:15:36 2012
@@ -46,6 +46,6 @@ testagent-testagent.$(OBJEXT): $(TESTAGE
qpidexectest_PROGRAMS+=testagent
testagent_CXXFLAGS=$(CXXFLAGS) -Itestagent_gen
testagent_SOURCES=testagent.cpp $(TESTAGENT_GEN_SRC)
-testagent_LDADD=$(top_builddir)/src/libqmf.la
+testagent_LDADD=$(top_builddir)/src/libqmf.la -lqpidcommon -lqpidtypes -lqpidclient
EXTRA_DIST+=testagent.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org