diff options
Diffstat (limited to 'cpp/lib')
| -rw-r--r-- | cpp/lib/broker/Makefile.am | 6 | ||||
| -rw-r--r-- | cpp/lib/client/Makefile.am | 25 | ||||
| -rw-r--r-- | cpp/lib/common/Makefile.am | 88 |
3 files changed, 63 insertions, 56 deletions
diff --git a/cpp/lib/broker/Makefile.am b/cpp/lib/broker/Makefile.am index f02dc4f545..036efe3955 100644 --- a/cpp/lib/broker/Makefile.am +++ b/cpp/lib/broker/Makefile.am @@ -6,9 +6,9 @@ INCLUDES = \ -I$(top_srcdir)/lib/common/framing \ $(APR_CXXFLAGS) -lib_LTLIBRARIES = libbroker.la -libbroker_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG) -libbroker_la_SOURCES = \ +lib_LTLIBRARIES = libqpidbroker.la +libqpidbroker_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG) +libqpidbroker_la_SOURCES = \ AccumulatedAck.cpp \ AccumulatedAck.h \ AutoDelete.cpp \ diff --git a/cpp/lib/client/Makefile.am b/cpp/lib/client/Makefile.am index 28b96d7844..e4bd5a1151 100644 --- a/cpp/lib/client/Makefile.am +++ b/cpp/lib/client/Makefile.am @@ -6,27 +6,28 @@ INCLUDES = \ -I$(top_srcdir)/lib/common/framing \ $(APR_CXXFLAGS) -lib_LTLIBRARIES = libclient.la -libclient_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG) -libclient_la_SOURCES = \ +lib_LTLIBRARIES = libqpidclient.la +libqpidclient_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG) +libqpidclient_la_SOURCES = \ ClientChannel.cpp \ - ClientChannel.h \ ClientExchange.cpp \ - ClientExchange.h \ ClientMessage.cpp \ - ClientMessage.h \ ClientQueue.cpp \ - ClientQueue.h \ Connection.cpp \ - Connection.h \ Connector.cpp \ - Connector.h \ IncomingMessage.cpp \ - IncomingMessage.h \ MessageListener.cpp \ + ResponseHandler.cpp \ + ReturnedMessageHandler.cpp +pkginclude_HEADERS = \ + ClientChannel.h \ + ClientExchange.h \ + ClientMessage.h \ + ClientQueue.h \ + Connection.h \ + Connector.h \ + IncomingMessage.h \ MessageListener.h \ MethodBodyInstances.h \ - ResponseHandler.cpp \ ResponseHandler.h \ - ReturnedMessageHandler.cpp \ ReturnedMessageHandler.h diff --git a/cpp/lib/common/Makefile.am b/cpp/lib/common/Makefile.am index 6f21a332d4..bd9f3f422e 100644 --- a/cpp/lib/common/Makefile.am +++ b/cpp/lib/common/Makefile.am @@ -10,94 +10,102 @@ apr = sys/apr apr_src = \ $(apr)/APRAcceptor.cpp \ $(apr)/APRBase.cpp \ - $(apr)/APRBase.h \ $(apr)/APRPool.cpp \ - $(apr)/APRPool.h \ $(apr)/APRSocket.cpp \ - $(apr)/APRSocket.h \ $(apr)/LFProcessor.cpp \ - $(apr)/LFProcessor.h \ $(apr)/LFSessionContext.cpp \ - $(apr)/LFSessionContext.h \ $(apr)/Socket.cpp \ $(apr)/Thread.cpp +apr_hdr = \ + $(apr)/APRBase.h \ + $(apr)/APRPool.h \ + $(apr)/APRSocket.h \ + $(apr)/LFProcessor.h \ + $(apr)/LFSessionContext.h posix = sys/posix -posix_src = \ - $(posix)/PosixAcceptor.cpp \ - $(posix)/Socket.cpp \ - $(posix)/Thread.cpp \ - $(posix)/check.cpp \ - $(posix)/check.h \ - $(posix)/EventChannel.cpp \ - $(posix)/EventChannel.h \ - $(posix)/EventChannelThreads.cpp \ +posix_src = \ + $(posix)/PosixAcceptor.cpp \ + $(posix)/Socket.cpp \ + $(posix)/Thread.cpp \ + $(posix)/check.cpp \ + $(posix)/EventChannel.cpp \ + $(posix)/EventChannelThreads.cpp +posix_hdr = \ + $(posix)/check.h \ + $(posix)/EventChannel.h \ $(posix)/EventChannelThreads.h -EXTRA_DIST=$(posix_src) +EXTRA_DIST=$(posix_src) $(posix_hdr) platform_src = $(apr_src) +platform_hdr = $(apr_hdr) framing = framing gen = $(srcdir)/../../gen -lib_LTLIBRARIES = libcommon.la -libcommon_la_LIBADD = \ +lib_LTLIBRARIES = libqpidcommon.la +libqpidcommon_la_LIBADD = \ $(APR_LIBS) \ $(LIB_DLOPEN) \ $(LIB_CLOCK_GETTIME) -libcommon_la_LDFLAGS = \ +libqpidcommon_la_LDFLAGS = \ -version-info \ $(LIBTOOL_VERSION_INFO_ARG) -libcommon_la_SOURCES = \ +libqpidcommon_la_SOURCES = \ $(platform_src) \ $(framing)/AMQBody.cpp \ - $(framing)/AMQBody.h \ $(framing)/AMQContentBody.cpp \ + $(framing)/AMQFrame.cpp \ + $(framing)/AMQHeaderBody.cpp \ + $(framing)/AMQHeartbeatBody.cpp \ + $(framing)/AMQMethodBody.cpp \ + $(framing)/BasicHeaderProperties.cpp \ + $(framing)/BodyHandler.cpp \ + $(framing)/Buffer.cpp \ + $(framing)/FieldTable.cpp \ + $(framing)/InitiationHandler.cpp \ + $(framing)/ProtocolInitiation.cpp \ + $(framing)/ProtocolVersion.cpp \ + $(framing)/ProtocolVersionException.cpp \ + $(framing)/Value.cpp \ + $(gen)/AMQP_ClientProxy.cpp \ + $(gen)/AMQP_MethodVersionMap.cpp \ + $(gen)/AMQP_ServerProxy.cpp \ + Exception.cpp \ + ExceptionHolder.cpp \ + QpidError.cpp \ + sys/Runnable.cpp \ + sys/Time.cpp + +nobase_pkginclude_HEADERS = \ + $(platform_hdr) \ + $(framing)/AMQBody.h \ $(framing)/AMQContentBody.h \ $(framing)/AMQDataBlock.h \ - $(framing)/AMQFrame.cpp \ $(framing)/AMQFrame.h \ - $(framing)/AMQHeaderBody.cpp \ $(framing)/AMQHeaderBody.h \ - $(framing)/AMQHeartbeatBody.cpp \ $(framing)/AMQHeartbeatBody.h \ - $(framing)/AMQMethodBody.cpp \ $(framing)/AMQMethodBody.h \ - $(framing)/BasicHeaderProperties.cpp \ $(framing)/BasicHeaderProperties.h \ - $(framing)/BodyHandler.cpp \ $(framing)/BodyHandler.h \ - $(framing)/Buffer.cpp \ $(framing)/Buffer.h \ - $(framing)/FieldTable.cpp \ $(framing)/FieldTable.h \ $(framing)/FramingContent.cpp \ $(framing)/FramingContent.h \ $(framing)/HeaderProperties.h \ - $(framing)/InitiationHandler.cpp \ $(framing)/InitiationHandler.h \ $(framing)/InputHandler.h \ $(framing)/OutputHandler.h \ - $(framing)/ProtocolInitiation.cpp \ $(framing)/ProtocolInitiation.h \ - $(framing)/ProtocolVersion.cpp \ $(framing)/ProtocolVersion.h \ - $(framing)/ProtocolVersionException.cpp \ $(framing)/ProtocolVersionException.h \ - $(framing)/Value.cpp \ $(framing)/Value.h \ $(framing)/amqp_framing.h \ $(framing)/amqp_types.h \ - $(gen)/AMQP_ClientProxy.cpp \ - $(gen)/AMQP_MethodVersionMap.cpp \ - $(gen)/AMQP_ServerProxy.cpp \ - Exception.cpp \ Exception.h \ - ExceptionHolder.cpp \ ExceptionHolder.h \ - QpidError.cpp \ QpidError.h \ SharedObject.h \ sys/Acceptor.h \ @@ -105,7 +113,6 @@ libcommon_la_SOURCES = \ sys/Module.h \ sys/Monitor.h \ sys/Mutex.h \ - sys/Runnable.cpp \ sys/Runnable.h \ sys/SessionContext.h \ sys/SessionHandler.h \ @@ -113,6 +120,5 @@ libcommon_la_SOURCES = \ sys/ShutdownHandler.h \ sys/Socket.h \ sys/Thread.h \ - sys/Time.cpp \ sys/Time.h \ sys/TimeoutHandler.h |