diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2007-07-30 13:25:31 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2007-07-30 13:25:31 +0000 |
| commit | f5bcdf79d18710205afb5ce95ab20686e9acea63 (patch) | |
| tree | fc143ce68ddd8509da07f7a9192cecb6f6da18c1 /cpp/src/Makefile.am | |
| parent | 04a5eca2d8ff39952f8b76a647572756f277b17c (diff) | |
| download | qpid-python-f5bcdf79d18710205afb5ce95ab20686e9acea63.tar.gz | |
r797@fuschia: andrew | 2007-07-30 14:25:02 +0100
* Removed all the leader-follower acceptor code (APR based acceptor)
* Removed the --enable/disable-apr-netio option to configure
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@560973 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/Makefile.am')
| -rw-r--r-- | cpp/src/Makefile.am | 50 |
1 files changed, 12 insertions, 38 deletions
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index 7950299f64..b455a4558b 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -33,40 +33,22 @@ qpidd_LDADD = \ sbin_PROGRAMS = qpidd qpidd_SOURCES = qpidd.cpp -apr_netio_src = \ - qpid/sys/apr/APRAcceptor.cpp \ +apr_plat_src = \ 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 - -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 - -apr_plat_src = \ qpid/sys/apr/Socket.cpp \ qpid/sys/apr/Time.cpp \ qpid/sys/apr/Thread.cpp \ qpid/sys/apr/Shlib.cpp - apr_plat_hdr = \ + qpid/sys/apr/APRBase.h \ + qpid/sys/apr/APRPool.h \ qpid/sys/apr/Condition.h \ qpid/sys/apr/Mutex.h \ qpid/sys/apr/Thread.h -posix_netio_src = \ - qpid/sys/AsynchIOAcceptor.cpp - -posix_netio_hdr = - posix_plat_src = \ - qpid/sys/Dispatcher.cpp \ qpid/sys/epoll/EpollPoller.cpp \ qpid/sys/posix/check.cpp \ qpid/sys/posix/Socket.cpp \ @@ -82,24 +64,14 @@ posix_plat_hdr = \ qpid/sys/posix/Mutex.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) + platform_dist=$(posix_plat_src) $(posix_plat_hdr) + platform_src = $(apr_plat_src) + platform_hdr = $(apr_plat_hdr) else - platform_dist+=$(apr_plat_src) $(apr_plat_hdr) - platform_src += $(posix_plat_src) - platform_hdr += $(posix_plat_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 @@ -166,8 +138,10 @@ libqpidcommon_la_SOURCES = \ qpid/Url.h \ qpid/Url.cpp \ qpid/QpidError.cpp \ - qpid/sys/Serializer.cpp \ + qpid/sys/AsynchIOAcceptor.cpp \ + qpid/sys/Dispatcher.cpp \ qpid/sys/Runnable.cpp \ + qpid/sys/Serializer.cpp \ qpid/sys/Shlib.h \ qpid/sys/Shlib.cpp \ qpid/Options.cpp \ |