1 files changed, 50 insertions, 20 deletions

diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am
index 87087ef369..cb17425369 100644
--- a/qpid/cpp/src/Makefile.am
+++ b/qpid/cpp/src/Makefile.am
@@ -30,44 +30,75 @@ qpidd_LDADD =					\
 sbin_PROGRAMS = qpidd
 qpidd_SOURCES = qpidd.cpp
 
-apr_src = \
+apr_netio_src = \
   qpid/sys/apr/APRAcceptor.cpp \
   qpid/sys/apr/APRBase.cpp \
   qpid/sys/apr/APRPool.cpp \
   qpid/sys/apr/APRSocket.cpp \
   qpid/sys/apr/LFProcessor.cpp \
-  qpid/sys/apr/LFSessionContext.cpp \
-  qpid/sys/apr/Socket.cpp \
-  qpid/sys/apr/Thread.cpp
+  qpid/sys/apr/LFSessionContext.cpp
 
-apr_hdr = \
+apr_netio_hdr = \
   qpid/sys/apr/APRBase.h \
   qpid/sys/apr/APRPool.h \
   qpid/sys/apr/APRSocket.h \
   qpid/sys/apr/LFProcessor.h \
   qpid/sys/apr/LFSessionContext.h	
 
-posix_src = \
-  qpid/sys/posix/PosixAcceptor.cpp \
-  qpid/sys/posix/Socket.cpp \
-  qpid/sys/posix/Thread.cpp \
-  qpid/sys/posix/check.cpp \
+apr_plat_src = \
+  qpid/sys/apr/Socket.cpp \
+  qpid/sys/apr/Time.cpp \
+  qpid/sys/apr/Thread.cpp
+
+apr_plat_hdr = \
+  qpid/sys/apr/Condition.h \
+  qpid/sys/apr/Module.h \
+  qpid/sys/apr/Mutex.h \
+  qpid/sys/apr/Socket.h \
+  qpid/sys/apr/Thread.h
+
+posix_netio_src = \
   qpid/sys/posix/EventChannel.cpp \
+  qpid/sys/posix/EventChannelAcceptor.cpp \
+  qpid/sys/posix/EventChannelConnection.cpp \
   qpid/sys/posix/EventChannelThreads.cpp
 
-posix_hdr = \
-  qpid/sys/posix/check.h \
+posix_netio_hdr = \
   qpid/sys/posix/EventChannel.h \
   qpid/sys/posix/EventChannelThreads.h
 
-if USE_APR
- platform_dist=$(posix_src) $(posix_hdr)
- platform_src = $(apr_src)
- platform_hdr = $(apr_hdr)
+posix_plat_src = \
+  qpid/sys/posix/check.cpp \
+  qpid/sys/posix/Socket.cpp \
+  qpid/sys/posix/Time.cpp \
+  qpid/sys/posix/Thread.cpp
+
+posix_plat_hdr = \
+  qpid/sys/posix/check.h \
+  qpid/sys/posix/Condition.h \
+  qpid/sys/posix/Module.h \
+  qpid/sys/posix/Mutex.h \
+  qpid/sys/posix/Socket.h \
+  qpid/sys/posix/Thread.h
+
+if USE_APR_NETIO
+ platform_dist=$(posix_netio_src) $(posix_netio_hdr)
+ platform_src = $(apr_netio_src)
+ platform_hdr = $(apr_netio_hdr)
+else
+ platform_dist=$(apr_netio_src) $(apr_netio_hdr)
+ platform_src = $(posix_netio_src)
+ platform_hdr = $(posix_netio_hdr)
+endif
+
+if USE_APR_PLATFORM
+ platform_dist+=$(posix_plat_src) $(posix_plat_hdr)
+ platform_src += $(apr_plat_src)
+ platform_hdr += $(apr_plat_hdr)
 else
- platform_dist =$(apr_src) $(apr_hdr) $(generated_cpp) $(generated_h)
- platform_src = $(posix_src)
- platform_hdr = $(posix_hdr)
+ platform_dist+=$(apr_plat_src) $(apr_plat_hdr)
+ platform_src += $(posix_plat_src)
+ platform_hdr += $(posix_plat_hdr)
 endif
 
 lib_LTLIBRARIES = libqpidcommon.la libqpidbroker.la libqpidclient.la
@@ -111,7 +142,6 @@ libqpidcommon_la_SOURCES = \
   qpid/ExceptionHolder.cpp \
   qpid/QpidError.cpp \
   qpid/sys/Runnable.cpp \
-  qpid/sys/Time.cpp \
   qpid/sys/ProducerConsumer.cpp \
   qpid/CommonOptions.cpp