diff options
| author | Alan Conway <aconway@apache.org> | 2008-04-17 16:01:05 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-04-17 16:01:05 +0000 |
| commit | 20e4466ca57bc7bdc81ca0857549a63c77f41d8a (patch) | |
| tree | 8f5a8dc8ccb4d0ade27d1e00083da167ba705497 /cpp/src/Makefile.am | |
| parent | d44b5f63b698e66aef2edd9e694cf881f08b88a5 (diff) | |
| download | qpid-python-20e4466ca57bc7bdc81ca0857549a63c77f41d8a.tar.gz | |
src/Makefile.am: Fix problems with rpmbuild.
src/tests/README: Updated information about boost test.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@649159 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/Makefile.am')
| -rw-r--r-- | cpp/src/Makefile.am | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index 564db08905..8b1c1d7246 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -79,7 +79,7 @@ posix_plat_hdr = \ platform_src = $(posix_plat_src) platform_hdr = $(posix_plat_hdr) -lib_LTLIBRARIES = libqpidcommon.la libqpidbroker.la libqpidclient.la libqpidamqp_0_10.la +lib_LTLIBRARIES = libqpidcommon.la libqpidbroker.la libqpidclient.la include cluster.mk @@ -88,10 +88,12 @@ include cluster.mk # unused parameters in boost::date_time headers. So we build it # in a convenience library to link into libqpid_common. # -noinst_LTLIBRARIES=libLogger.la +noinst_LTLIBRARIES=libLogger.la libqpidamqp_0_10.la libLogger_la_SOURCES=qpid/log/Logger.cpp qpid/log/Logger.h libLogger_la_CXXFLAGS=$(AM_CXXFLAGS) -Wno-unused-parameter +# New 0-10 codec, to be integrated in future. +# Currently built for tests only. libqpidamqp_0_10_la_SOURCES= \ $(rgen_amqp_0_10_srcs) \ qpid/amqp_0_10/apply.h \ @@ -130,7 +132,6 @@ libqpidcommon_la_LIBADD = \ -lboost_filesystem \ -luuid \ libLogger.la \ - $(libqpidamqp_0_10_la_SOURCES) \ $(LIB_DLOPEN) \ $(LIB_CLOCK_GETTIME) |