diff options
| author | Alan Conway <aconway@apache.org> | 2006-12-01 07:36:35 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2006-12-01 07:36:35 +0000 |
| commit | 86e2310d07a37eada38945d821efe1dab3c06fd6 (patch) | |
| tree | f731c4f3adc5aae53caf76729dd4a08559e0d980 /cpp/lib/common | |
| parent | 292a098994a6633c80ee5e50582525538efae044 (diff) | |
| download | qpid-python-86e2310d07a37eada38945d821efe1dab3c06fd6.tar.gz | |
Buliding APR code, running python tests.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@481175 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/lib/common')
| -rw-r--r-- | cpp/lib/common/Makefile.am | 61 |
1 files changed, 34 insertions, 27 deletions
diff --git a/cpp/lib/common/Makefile.am b/cpp/lib/common/Makefile.am index ed02cea6a7..829519eac6 100644 --- a/cpp/lib/common/Makefile.am +++ b/cpp/lib/common/Makefile.am @@ -1,29 +1,44 @@ -AM_CXXFLAGS = $(WARNING_CFLAGS) +AM_CXXFLAGS = $(WARNING_CFLAGS) -DUSE_APR=1 +LIBS = -lapr-1 + INCLUDES = \ + -I$(shell apr-1-config --includedir) \ -I$(top_srcdir)/gen \ -I$(top_srcdir)/lib/common/sys \ -I$(top_srcdir)/lib/common/framing -# This is a kludge to include the contents of the apr/ directory. -# For now, we don't use it. -EXTRA_DIST = \ - sys/apr/APRAcceptor.cpp \ - sys/apr/APRBase.cpp \ - sys/apr/APRBase.h \ - sys/apr/APRPool.cpp \ - sys/apr/APRPool.h \ - sys/apr/APRSocket.cpp \ - sys/apr/APRSocket.h \ - sys/apr/LFProcessor.cpp \ - sys/apr/LFProcessor.h \ - sys/apr/LFSessionContext.cpp \ - sys/apr/LFSessionContext.h \ - sys/apr/Socket.cpp \ - sys/apr/Thread.cpp +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 + +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)/EventChannelThreads.h +EXTRA_DIST=$(posix_src) +platform_src = $(apr_src) framing = framing -posix = sys/posix gen = $(srcdir)/../../gen lib_LTLIBRARIES = libcommon.la @@ -36,6 +51,7 @@ libcommon_la_LDFLAGS = \ $(LIBTOOL_VERSION_INFO_ARG) libcommon_la_SOURCES = \ + $(platform_src) \ $(framing)/AMQBody.cpp \ $(framing)/AMQBody.h \ $(framing)/AMQContentBody.cpp \ @@ -75,15 +91,6 @@ libcommon_la_SOURCES = \ $(gen)/AMQP_ClientProxy.cpp \ $(gen)/AMQP_MethodVersionMap.cpp \ $(gen)/AMQP_ServerProxy.cpp \ - $(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)/EventChannelThreads.h \ Exception.cpp \ Exception.h \ ExceptionHolder.cpp \ |