From 4a19585c415851d0b308228a83b8abd55c8dc5a9 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 9 Mar 2007 18:15:02 +0000 Subject: Merged revisions 493126-493151 via svnmerge from https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid ........ r493126 | aconway | 2007-01-05 13:34:08 -0500 (Fri, 05 Jan 2007) | 2 lines Add refernece to prereqs in README-dist. ........ r493140 | aconway | 2007-01-05 14:09:10 -0500 (Fri, 05 Jan 2007) | 8 lines 2007-01-05 Jim Meyering * gen/Makefile.am (gen-src.mk) [CAN_GENERATE_CODE]: Emit an empty dependency for each generated file, in case they are renamed, removed, or no longer generated. Otherwise, "./bootstrap --build" would fail with e.g., `*** No rule to make target ../../gentools/templ.cpp/AMQP_HighestVersion.cpp.tmpl'. ........ r493151 | aconway | 2007-01-05 14:25:32 -0500 (Fri, 05 Jan 2007) | 6 lines 2007-01-05 Jim Meyering * lib/broker/Makefile.am (libqpidbroker_la_LIBADD): Define, so we link with libqpidcommon.la. * lib/client/Makefile.am (libqpidclient_la_LIBADD): Likewise. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@516489 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/lib/broker/Makefile.am | 3 ++- cpp/lib/client/Makefile.am | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'cpp/lib') diff --git a/cpp/lib/broker/Makefile.am b/cpp/lib/broker/Makefile.am index 760c6d61e2..68649c2b28 100644 --- a/cpp/lib/broker/Makefile.am +++ b/cpp/lib/broker/Makefile.am @@ -7,8 +7,9 @@ INCLUDES = \ $(APR_CXXFLAGS) lib_LTLIBRARIES = libqpidbroker.la +libqpidbroker_la_LIBADD = ../common/libqpidcommon.la libqpidbroker_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG) -libqpidbroker_la_SOURCES = \ +libqpidbroker_la_SOURCES = \ AccumulatedAck.cpp \ AccumulatedAck.h \ AutoDelete.cpp \ diff --git a/cpp/lib/client/Makefile.am b/cpp/lib/client/Makefile.am index 9f345d866d..1e10a2a244 100644 --- a/cpp/lib/client/Makefile.am +++ b/cpp/lib/client/Makefile.am @@ -7,8 +7,9 @@ INCLUDES = \ $(APR_CXXFLAGS) lib_LTLIBRARIES = libqpidclient.la +libqpidclient_la_LIBADD = ../common/libqpidcommon.la libqpidclient_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG) -libqpidclient_la_SOURCES = \ +libqpidclient_la_SOURCES = \ ClientChannel.cpp \ ClientExchange.cpp \ ClientMessage.cpp \ @@ -20,7 +21,7 @@ libqpidclient_la_SOURCES = \ MessageListener.cpp \ ResponseHandler.cpp \ ReturnedMessageHandler.cpp -pkginclude_HEADERS = \ +pkginclude_HEADERS = \ ClientChannel.h \ ClientExchange.h \ ClientMessage.h \ -- cgit v1.2.1