diff options
| author | Alan Conway <aconway@apache.org> | 2010-06-30 19:54:00 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-06-30 19:54:00 +0000 |
| commit | 5911c4831e19e1deb278491d54a7bc2b6e37e8bb (patch) | |
| tree | 3d2f10740f9c4429c4779d1922532c122acd1e25 /cpp/src/Makefile.am | |
| parent | d2530f67169a2fdebf1741ab9cd8f2c566b4050e (diff) | |
| download | qpid-python-5911c4831e19e1deb278491d54a7bc2b6e37e8bb.tar.gz | |
QPID-2708: Create a separate qpidtypes library for the types namespace.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@959419 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/Makefile.am')
| -rw-r--r-- | cpp/src/Makefile.am | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index 30df5a1da2..abfaffbd74 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -185,7 +185,7 @@ libqpidcommon_la_SOURCES += $(poller) $(systeminfo) posix_broker_src = \ qpid/broker/posix/BrokerDefaults.cpp -lib_LTLIBRARIES = libqpidcommon.la libqpidbroker.la libqpidclient.la libqpidmessaging.la +lib_LTLIBRARIES = libqpidcommon.la libqpidbroker.la libqpidclient.la libqpidmessaging.la libqpidtypes.la # Definitions for client and daemon plugins PLUGINLDFLAGS=-no-undefined -module -avoid-version @@ -309,6 +309,7 @@ EXTRA_DIST +=\ qpid/store libqpidcommon_la_LIBADD = \ + libqpidtypes.la \ -lboost_program_options \ -lboost_filesystem \ -luuid \ @@ -477,10 +478,7 @@ libqpidcommon_la_SOURCES += \ qpid/sys/Waitable.h \ qpid/sys/alloca.h \ qpid/sys/uuid.h \ - qpid/amqp_0_10/Codecs.cpp \ - qpid/types/Exception.cpp \ - qpid/types/Uuid.cpp \ - qpid/types/Variant.cpp + qpid/amqp_0_10/Codecs.cpp if HAVE_SASL libqpidcommon_la_SOURCES += qpid/sys/cyrus/CyrusSecurityLayer.h @@ -491,8 +489,7 @@ endif QPIDCOMMON_VERSION_INFO = 2:0:0 libqpidcommon_la_LDFLAGS=-version-info $(QPIDCOMMON_VERSION_INFO) -libqpidbroker_la_LIBADD = libqpidcommon.la -luuid - +libqpidbroker_la_LIBADD = libqpidcommon.la libqpidbroker_la_SOURCES = \ $(mgen_broker_cpp) \ $(posix_broker_src) \ @@ -714,8 +711,15 @@ libqpidclient_la_SOURCES = \ QPIDCLIENT_VERSION_INFO = 2:0:0 libqpidclient_la_LDFLAGS = -version-info $(QPIDCLIENT_VERSION_INFO) -libqpidmessaging_la_LIBADD = libqpidclient.la +libqpidtypes_la_libadd=-luuid +libqpidtypes_la_SOURCES= \ + qpid/types/Exception.cpp \ + qpid/types/Uuid.cpp \ + qpid/types/Variant.cpp +QPIDTYPES_VERSION_INFO = 1:0:0 +libqpidtypes_la_LDFLAGS = -version-info $(QPIDTYPES_VERSION_INFO) +libqpidmessaging_la_LIBADD = libqpidclient.la libqpidtypes.la libqpidmessaging_la_SOURCES = \ qpid/messaging/Address.cpp \ qpid/messaging/AddressParser.h \ |