diff options
| author | Gordon Sim <gsim@apache.org> | 2010-05-18 13:13:34 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2010-05-18 13:13:34 +0000 |
| commit | bcd2d99268a9c175e032dca896ce63199b337703 (patch) | |
| tree | 47d3afb0635dd0b3b458c785dac71bb44615808c /qpid/cpp/src/Makefile.am | |
| parent | c5861d69bbaaf47bfb9ec9b92a373de1aa733403 (diff) | |
| download | qpid-python-bcd2d99268a9c175e032dca896ce63199b337703.tar.gz | |
QPID-2612: remove qpidtypes lib as it causes problems on windows
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@945642 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/Makefile.am')
| -rw-r--r-- | qpid/cpp/src/Makefile.am | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am index 77b31103a2..af353407b3 100644 --- a/qpid/cpp/src/Makefile.am +++ b/qpid/cpp/src/Makefile.am @@ -186,7 +186,7 @@ libqpidcommon_la_SOURCES += $(poller) $(systeminfo) posix_broker_src = \ qpid/broker/posix/BrokerDefaults.cpp -lib_LTLIBRARIES = libqpidtypes.la libqpidcommon.la libqpidbroker.la libqpidclient.la libqpidmessaging.la +lib_LTLIBRARIES = libqpidcommon.la libqpidbroker.la libqpidclient.la libqpidmessaging.la # Definitions for client and daemon plugins PLUGINLDFLAGS=-no-undefined -module -avoid-version @@ -312,7 +312,6 @@ EXTRA_DIST +=\ qpid/store libqpidcommon_la_LIBADD = \ - libqpidtypes.la \ -lboost_program_options \ -lboost_filesystem \ -luuid \ @@ -479,7 +478,11 @@ libqpidcommon_la_SOURCES += \ qpid/sys/Timer.h \ qpid/sys/Waitable.h \ qpid/sys/alloca.h \ - qpid/sys/uuid.h + qpid/sys/uuid.h ` \ + qpid/amqp_0_10/Codecs.cpp \ + qpid/types/Exception.cpp \ + qpid/types/Uuid.cpp \ + qpid/types/Variant.cpp if HAVE_SASL libqpidcommon_la_SOURCES += qpid/sys/cyrus/CyrusSecurityLayer.h @@ -487,12 +490,6 @@ libqpidcommon_la_SOURCES += qpid/sys/cyrus/CyrusSecurityLayer.cpp libqpidcommon_la_LIBADD += -lsasl2 endif -libqpidtypes_la_SOURCES = \ - qpid/amqp_0_10/Codecs.cpp \ - qpid/types/Exception.cpp \ - qpid/types/Uuid.cpp \ - qpid/types/Variant.cpp - libqpidbroker_la_LIBADD = libqpidcommon.la -luuid libqpidbroker_la_SOURCES = \ |