Fix for the most disruptive items in QPID-243.

* All #include lines now use '""' rather than '<>' where appropriate.
* #include lines within the qpid project use relative includes so that
  the same path will work in /usr/include when installed as part of the
  client libraries.
* All the source code has now been rearranged to be under src in a directory
  analogous to the namespace of the classes in it.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@524769 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 144 insertions, 11 deletions

diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index 40398eb2c9..22bcd5c554 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -1,17 +1,150 @@
+SUBDIRS = broker . client tests gen
+
 AM_CXXFLAGS = $(WARNING_CFLAGS)
-INCLUDES = \
-  -I$(top_srcdir)/gen \
-  -I$(top_srcdir)/lib/broker \
-  -I$(top_srcdir)/lib/common \
-  -I$(top_srcdir)/lib/common/framing \
-  -I$(top_srcdir)/lib/common/sys
 
-LDADD =				\
-  ../lib/broker/libqpidbroker.la	\
-  ../lib/common/libqpidcommon.la
+INCLUDES =				\
+  -I$(srcdir)/gen			\
+  $(APR_CXXFLAGS)
+
+qpidd_LDADD =                         \
+  broker/libqpidbroker.la        \
+  libqpidcommon.la
 
 sbin_PROGRAMS = qpidd
 qpidd_SOURCES = qpidd.cpp
 
-# Force build of qpidd during dist phase so help2man will work.
-dist-hook: $(sbin_PROGRAMS)
+apr = sys/apr
+apr_src =			\
+  $(apr)/APRAcceptor.cpp	\
+  $(apr)/APRBase.cpp		\
+  $(apr)/APRPool.cpp		\
+  $(apr)/APRSocket.cpp		\
+  $(apr)/LFProcessor.cpp	\
+  $(apr)/LFSessionContext.cpp	\
+  $(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)/EventChannel.cpp		\
+  $(posix)/EventChannelThreads.cpp		
+posix_hdr = 				\
+  $(posix)/check.h			\
+  $(posix)/EventChannel.h		\
+  $(posix)/EventChannelThreads.h
+
+EXTRA_DIST=$(posix_src) $(posix_hdr)
+platform_src = $(apr_src)
+platform_hdr = $(apr_hdr)
+
+framing = framing
+gen     = gen
+
+lib_LTLIBRARIES = libqpidcommon.la
+libqpidcommon_la_LIBADD =		\
+  $(APR_LIBS)			\
+  $(LIB_DLOPEN)			\
+  $(LIB_CLOCK_GETTIME)
+
+libqpidcommon_la_LDFLAGS =		\
+  -version-info			\
+  $(LIBTOOL_VERSION_INFO_ARG)
+
+libqpidcommon_la_SOURCES =			\
+  $(platform_src)				\
+  $(framing)/AMQBody.cpp			\
+  $(framing)/AMQRequestBody.cpp			\
+  $(framing)/AMQResponseBody.cpp		\
+  $(framing)/AMQContentBody.cpp			\
+  $(framing)/AMQFrame.cpp			\
+  $(framing)/AMQHeaderBody.cpp			\
+  $(framing)/AMQHeartbeatBody.cpp		\
+  $(framing)/AMQMethodBody.cpp			\
+  $(framing)/MethodContext.cpp			\
+  $(framing)/BasicHeaderProperties.cpp		\
+  $(framing)/BodyHandler.cpp			\
+  $(framing)/ChannelAdapter.cpp			\
+  $(framing)/Buffer.cpp				\
+  $(framing)/FieldTable.cpp			\
+  $(framing)/FramingContent.cpp			\
+  $(framing)/InitiationHandler.cpp		\
+  $(framing)/ProtocolInitiation.cpp		\
+  $(framing)/ProtocolVersion.cpp		\
+  $(framing)/ProtocolVersionException.cpp	\
+  $(framing)/Requester.cpp			\
+  $(framing)/Responder.cpp			\
+  $(framing)/Value.cpp				\
+  $(framing)/Proxy.cpp				\
+  $(gen)/AMQP_ClientProxy.cpp			\
+  $(gen)/AMQP_HighestVersion.h		\
+  $(gen)/AMQP_MethodVersionMap.cpp		\
+  $(gen)/AMQP_ServerProxy.cpp			\
+  Exception.cpp					\
+  ExceptionHolder.cpp				\
+  QpidError.cpp					\
+  sys/Runnable.cpp				\
+  sys/Time.cpp					\
+  sys/ProducerConsumer.cpp
+
+nobase_pkginclude_HEADERS =			\
+  $(gen)/AMQP_HighestVersion.h			\
+  $(platform_hdr)				\
+  $(framing)/AMQBody.h				\
+  $(framing)/AMQContentBody.h			\
+  $(framing)/AMQDataBlock.h			\
+  $(framing)/AMQFrame.h				\
+  $(framing)/AMQHeaderBody.h			\
+  $(framing)/AMQHeartbeatBody.h			\
+  $(framing)/AMQMethodBody.h			\
+  $(framing)/MethodContext.h			\
+  $(framing)/BasicHeaderProperties.h		\
+  $(framing)/BodyHandler.h			\
+  $(framing)/ChannelAdapter.h			\
+  $(framing)/Buffer.h				\
+  $(framing)/FieldTable.h			\
+  $(framing)/FramingContent.h			\
+  $(framing)/HeaderProperties.h			\
+  $(framing)/InitiationHandler.h		\
+  $(framing)/InputHandler.h			\
+  $(framing)/OutputHandler.h			\
+  $(framing)/ProtocolInitiation.h		\
+  $(framing)/ProtocolVersion.h			\
+  $(framing)/ProtocolVersionException.h		\
+  $(framing)/Value.h				\
+  $(framing)/amqp_framing.h			\
+  $(framing)/amqp_types.h			\
+  $(framing)/Proxy.h				\
+  shared_ptr.h					\
+  Exception.h					\
+  ExceptionHolder.h				\
+  QpidError.h					\
+  SharedObject.h				\
+  sys/Acceptor.h				\
+  sys/AtomicCount.h				\
+  sys/Module.h					\
+  sys/Monitor.h					\
+  sys/Mutex.h					\
+  sys/Runnable.h				\
+  sys/ConnectionOutputHandler.h			\
+  sys/ConnectionInputHandler.h			\
+  sys/ConnectionInputHandlerFactory.h		\
+  sys/ShutdownHandler.h				\
+  sys/Socket.h					\
+  sys/Thread.h					\
+  sys/Time.h					\
+  sys/TimeoutHandler.h				\
+  sys/ProducerConsumer.h
+
+
+# Force build during dist phase so help2man will work.
+dist-hook: $(lib_LTLIBRARIES) $(sbin_PROGRAMS)