diff options
author | Gordon Sim <gsim@apache.org> | 2012-12-06 16:53:25 +0000 |
---|---|---|
committer | Gordon Sim <gsim@apache.org> | 2012-12-06 16:53:25 +0000 |
commit | fe1fca626713e731c36aed958b469e98110a8f0c (patch) | |
tree | 43092c1738a34b142b544317eb16ffc5df5c452e /qpid/cpp/examples/messaging | |
parent | d04463af5a5632ac57e4f13c1f78b48506ce085d (diff) | |
download | qpid-python-fe1fca626713e731c36aed958b469e98110a8f0c.tar.gz |
QPID-3723: further refinement to the change to link against the .la files, rather than use the unqualified lib names
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1418000 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/examples/messaging')
-rw-r--r-- | qpid/cpp/examples/messaging/Makefile.am | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/qpid/cpp/examples/messaging/Makefile.am b/qpid/cpp/examples/messaging/Makefile.am index d5303f4437..f11ca20c71 100644 --- a/qpid/cpp/examples/messaging/Makefile.am +++ b/qpid/cpp/examples/messaging/Makefile.am @@ -22,6 +22,7 @@ examplesdir=$(pkgdatadir)/examples/messaging AM_CXXFLAGS = $(WARNING_CFLAGS) INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include CLIENT_LIB=$(top_builddir)/src/libqpidmessaging.la +TYPES_LIB=$(top_builddir)/src/libqpidtypes.la CLIENTFLAGS=-lqpidmessaging noinst_PROGRAMS=drain spout client server map_sender map_receiver hello_world hello_xml @@ -33,10 +34,10 @@ hello_xml_SOURCES=hello_xml.cpp hello_xml_LDADD=$(CLIENT_LIB) drain_SOURCES=drain.cpp OptionParser.h OptionParser.cpp -drain_LDADD=$(CLIENT_LIB) -lqpidtypes +drain_LDADD=$(CLIENT_LIB) $(TYPES_LIB) spout_SOURCES=spout.cpp OptionParser.h OptionParser.cpp -spout_LDADD=$(CLIENT_LIB) -lqpidtypes +spout_LDADD=$(CLIENT_LIB) $(TYPES_LIB) client_SOURCES=client.cpp client_LDADD=$(CLIENT_LIB) @@ -45,10 +46,10 @@ server_SOURCES=server.cpp server_LDADD=$(CLIENT_LIB) map_sender_SOURCES=map_sender.cpp -map_sender_LDADD=$(CLIENT_LIB) -lqpidtypes +map_sender_LDADD=$(CLIENT_LIB) $(TYPES_LIB) map_receiver_SOURCES=map_receiver.cpp -map_receiver_LDADD=$(CLIENT_LIB) -lqpidtypes +map_receiver_LDADD=$(CLIENT_LIB) $(TYPES_LIB) examples_DATA= \ hello_world.cpp \ |