diff options
| author | Gordon Sim <gsim@apache.org> | 2012-11-29 12:15:36 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2012-11-29 12:15:36 +0000 |
| commit | 16234b37d7f509bf4689b6bdb9ee05f09408dc0d (patch) | |
| tree | 3dfd7ef8dd3dd3c439d600649de38752d6102c6e /qpid/cpp/src/tests | |
| parent | 90fbdb59f8c098c858af00af10c494dbec8597e5 (diff) | |
| download | qpid-python-16234b37d7f509bf4689b6bdb9ee05f09408dc0d.tar.gz | |
QPID-3723: Applied patch from Fraser Adams for explicit linking
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1415137 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests')
| -rw-r--r-- | qpid/cpp/src/tests/Makefile.am | 22 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/testagent.mk | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am index f3a639c234..55387f0091 100644 --- a/qpid/cpp/src/tests/Makefile.am +++ b/qpid/cpp/src/tests/Makefile.am @@ -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 diff --git a/qpid/cpp/src/tests/testagent.mk b/qpid/cpp/src/tests/testagent.mk index 25cf43d71e..9f530621c6 100644 --- a/qpid/cpp/src/tests/testagent.mk +++ b/qpid/cpp/src/tests/testagent.mk @@ -46,6 +46,6 @@ testagent-testagent.$(OBJEXT): $(TESTAGENT_GEN_SRC) 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 |