Author: aconway
Date: Fri Mar 9 10:15:02 2007
New Revision: 516489
URL: http://svn.apache.org/viewvc?view=rev&rev=516489
Log:
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 <[EMAIL PROTECTED]>
* 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 <[EMAIL PROTECTED]>
* lib/broker/Makefile.am (libqpidbroker_la_LIBADD): Define, so we
link with libqpidcommon.la.
* lib/client/Makefile.am (libqpidclient_la_LIBADD): Likewise.
........
Modified:
incubator/qpid/branches/qpid.0-9/ (props changed)
incubator/qpid/branches/qpid.0-9/cpp/README-dev
incubator/qpid/branches/qpid.0-9/cpp/gen/Makefile.am
incubator/qpid/branches/qpid.0-9/cpp/lib/broker/Makefile.am
incubator/qpid/branches/qpid.0-9/cpp/lib/client/Makefile.am
Propchange: incubator/qpid/branches/qpid.0-9/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Mar 9 10:15:02 2007
@@ -1 +1 @@
-/incubator/qpid/trunk/qpid:1-492620,492636,492641,492756
+/incubator/qpid/trunk/qpid:1-492620,492636,492641,492756,493126-493151
Modified: incubator/qpid/branches/qpid.0-9/cpp/README-dev
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/README-dev?view=diff&rev=516489&r1=516488&r2=516489
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/README-dev (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/README-dev Fri Mar 9 10:15:02 2007
@@ -6,10 +6,12 @@
== Prerequisites ==
If you have taken the sources from SVN you will need the following
-packages (or later) to build Qpid. We prefer to avoid spending time
-accommodating older versions of these packages, so please make sure
-that you have the latest stable version.
+packages (or later)
+We prefer to avoid spending time accommodating older versions of these
+packages, so please make sure that you have the latest stable version.
+
+ * All the prerequisites listed in README-dist.
* GNU make <http://www.gnu.org/software/make/>
* autoconf <http://www.gnu.org/software/autoconf/>
* automake <http://www.gnu.org/software/automake/>
Modified: incubator/qpid/branches/qpid.0-9/cpp/gen/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/gen/Makefile.am?view=diff&rev=516489&r1=516488&r2=516489
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/gen/Makefile.am (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/gen/Makefile.am Fri Mar 9 10:15:02
2007
@@ -11,7 +11,7 @@
# Don't attempt to run the code generator unless configure has set
# CAN_GENERATE_CODE, indicating that the amqp.xml and tools needed
# to run the code generator are available.
-#
+#
if CAN_GENERATE_CODE
gentools_dir = $(srcdir)/../../gentools
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/broker/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/broker/Makefile.am?view=diff&rev=516489&r1=516488&r2=516489
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/broker/Makefile.am (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/broker/Makefile.am Fri Mar 9
10:15:02 2007
@@ -7,8 +7,9 @@
$(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 \
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/client/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/client/Makefile.am?view=diff&rev=516489&r1=516488&r2=516489
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/client/Makefile.am (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/client/Makefile.am Fri Mar 9
10:15:02 2007
@@ -7,8 +7,9 @@
$(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 @@
MessageListener.cpp \
ResponseHandler.cpp \
ReturnedMessageHandler.cpp
-pkginclude_HEADERS = \
+pkginclude_HEADERS = \
ClientChannel.h \
ClientExchange.h \
ClientMessage.h \
