Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 059EDDE0E for ; Thu, 29 Nov 2012 19:04:01 +0000 (UTC) Received: (qmail 14527 invoked by uid 500); 29 Nov 2012 19:04:00 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 14500 invoked by uid 500); 29 Nov 2012 19:04:00 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 14493 invoked by uid 99); 29 Nov 2012 19:04:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Nov 2012 19:04:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Nov 2012 19:03:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 473CA238890B; Thu, 29 Nov 2012 19:03:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1415325 - in /qpid/branches/0.20/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/o... Date: Thu, 29 Nov 2012 19:03:27 -0000 To: commits@qpid.apache.org From: gsim@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121129190330.473CA238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gsim Date: Thu Nov 29 19:03:26 2012 New Revision: 1415325 URL: http://svn.apache.org/viewvc?rev=1415325&view=rev Log: QPID-3723: Applied patch from Fraser Adams for explicit linking Modified: qpid/branches/0.20/qpid/cpp/bindings/qmf2/examples/cpp/Makefile.am qpid/branches/0.20/qpid/cpp/examples/messaging/Makefile.am qpid/branches/0.20/qpid/cpp/examples/old_api/direct/Makefile.am qpid/branches/0.20/qpid/cpp/examples/old_api/failover/Makefile.am qpid/branches/0.20/qpid/cpp/examples/old_api/fanout/Makefile.am qpid/branches/0.20/qpid/cpp/examples/old_api/pub-sub/Makefile.am qpid/branches/0.20/qpid/cpp/examples/old_api/request-response/Makefile.am qpid/branches/0.20/qpid/cpp/examples/old_api/tradedemo/Makefile.am qpid/branches/0.20/qpid/cpp/examples/old_api/xml-exchange/Makefile.am qpid/branches/0.20/qpid/cpp/examples/qmf-console/Makefile.am qpid/branches/0.20/qpid/cpp/src/ (props changed) qpid/branches/0.20/qpid/cpp/src/Makefile.am qpid/branches/0.20/qpid/cpp/src/tests/ (props changed) qpid/branches/0.20/qpid/cpp/src/tests/Makefile.am qpid/branches/0.20/qpid/cpp/src/tests/testagent.mk Modified: qpid/branches/0.20/qpid/cpp/bindings/qmf2/examples/cpp/Makefile.am URL: http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/cpp/bindings/qmf2/examples/cpp/Makefile.am?rev=1415325&r1=1415324&r2=1415325&view=diff ============================================================================== --- qpid/branches/0.20/qpid/cpp/bindings/qmf2/examples/cpp/Makefile.am (original) +++ qpid/branches/0.20/qpid/cpp/bindings/qmf2/examples/cpp/Makefile.am Thu Nov 29 19:03:26 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/branches/0.20/qpid/cpp/examples/messaging/Makefile.am URL: http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/cpp/examples/messaging/Makefile.am?rev=1415325&r1=1415324&r2=1415325&view=diff ============================================================================== --- qpid/branches/0.20/qpid/cpp/examples/messaging/Makefile.am (original) +++ qpid/branches/0.20/qpid/cpp/examples/messaging/Makefile.am Thu Nov 29 19:03:26 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/branches/0.20/qpid/cpp/examples/old_api/direct/Makefile.am URL: http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/cpp/examples/old_api/direct/Makefile.am?rev=1415325&r1=1415324&r2=1415325&view=diff ============================================================================== --- qpid/branches/0.20/qpid/cpp/examples/old_api/direct/Makefile.am (original) +++ qpid/branches/0.20/qpid/cpp/examples/old_api/direct/Makefile.am Thu Nov 29 19:03:26 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/branches/0.20/qpid/cpp/examples/old_api/failover/Makefile.am URL: http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/cpp/examples/old_api/failover/Makefile.am?rev=1415325&r1=1415324&r2=1415325&view=diff ============================================================================== --- qpid/branches/0.20/qpid/cpp/examples/old_api/failover/Makefile.am (original) +++ qpid/branches/0.20/qpid/cpp/examples/old_api/failover/Makefile.am Thu Nov 29 19:03:26 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/branches/0.20/qpid/cpp/examples/old_api/fanout/Makefile.am URL: http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/cpp/examples/old_api/fanout/Makefile.am?rev=1415325&r1=1415324&r2=1415325&view=diff ============================================================================== --- qpid/branches/0.20/qpid/cpp/examples/old_api/fanout/Makefile.am (original) +++ qpid/branches/0.20/qpid/cpp/examples/old_api/fanout/Makefile.am Thu Nov 29 19:03:26 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/branches/0.20/qpid/cpp/examples/old_api/pub-sub/Makefile.am URL: http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/cpp/examples/old_api/pub-sub/Makefile.am?rev=1415325&r1=1415324&r2=1415325&view=diff ============================================================================== --- qpid/branches/0.20/qpid/cpp/examples/old_api/pub-sub/Makefile.am (original) +++ qpid/branches/0.20/qpid/cpp/examples/old_api/pub-sub/Makefile.am Thu Nov 29 19:03:26 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/branches/0.20/qpid/cpp/examples/old_api/request-response/Makefile.am URL: http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/cpp/examples/old_api/request-response/Makefile.am?rev=1415325&r1=1415324&r2=1415325&view=diff ============================================================================== --- qpid/branches/0.20/qpid/cpp/examples/old_api/request-response/Makefile.am (original) +++ qpid/branches/0.20/qpid/cpp/examples/old_api/request-response/Makefile.am Thu Nov 29 19:03:26 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/branches/0.20/qpid/cpp/examples/old_api/tradedemo/Makefile.am URL: http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/cpp/examples/old_api/tradedemo/Makefile.am?rev=1415325&r1=1415324&r2=1415325&view=diff ============================================================================== --- qpid/branches/0.20/qpid/cpp/examples/old_api/tradedemo/Makefile.am (original) +++ qpid/branches/0.20/qpid/cpp/examples/old_api/tradedemo/Makefile.am Thu Nov 29 19:03:26 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/branches/0.20/qpid/cpp/examples/old_api/xml-exchange/Makefile.am URL: http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/cpp/examples/old_api/xml-exchange/Makefile.am?rev=1415325&r1=1415324&r2=1415325&view=diff ============================================================================== --- qpid/branches/0.20/qpid/cpp/examples/old_api/xml-exchange/Makefile.am (original) +++ qpid/branches/0.20/qpid/cpp/examples/old_api/xml-exchange/Makefile.am Thu Nov 29 19:03:26 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/branches/0.20/qpid/cpp/examples/qmf-console/Makefile.am URL: http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/cpp/examples/qmf-console/Makefile.am?rev=1415325&r1=1415324&r2=1415325&view=diff ============================================================================== --- qpid/branches/0.20/qpid/cpp/examples/qmf-console/Makefile.am (original) +++ qpid/branches/0.20/qpid/cpp/examples/qmf-console/Makefile.am Thu Nov 29 19:03:26 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 \ Propchange: qpid/branches/0.20/qpid/cpp/src/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/cpp/src:r1415137 Modified: qpid/branches/0.20/qpid/cpp/src/Makefile.am URL: http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/cpp/src/Makefile.am?rev=1415325&r1=1415324&r2=1415325&view=diff ============================================================================== --- qpid/branches/0.20/qpid/cpp/src/Makefile.am (original) +++ qpid/branches/0.20/qpid/cpp/src/Makefile.am Thu Nov 29 19:03:26 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 Propchange: qpid/branches/0.20/qpid/cpp/src/tests/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/cpp/src/tests:r1415137 Modified: qpid/branches/0.20/qpid/cpp/src/tests/Makefile.am URL: http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/cpp/src/tests/Makefile.am?rev=1415325&r1=1415324&r2=1415325&view=diff ============================================================================== --- qpid/branches/0.20/qpid/cpp/src/tests/Makefile.am (original) +++ qpid/branches/0.20/qpid/cpp/src/tests/Makefile.am Thu Nov 29 19:03:26 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/branches/0.20/qpid/cpp/src/tests/testagent.mk URL: http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/cpp/src/tests/testagent.mk?rev=1415325&r1=1415324&r2=1415325&view=diff ============================================================================== --- qpid/branches/0.20/qpid/cpp/src/tests/testagent.mk (original) +++ qpid/branches/0.20/qpid/cpp/src/tests/testagent.mk Thu Nov 29 19:03:26 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