diff options
| author | Alan Conway <aconway@apache.org> | 2007-05-30 16:13:58 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-05-30 16:13:58 +0000 |
| commit | 9193f94dd996458e76506134ad4b506444badd99 (patch) | |
| tree | 57c8a3c32570b0abc1d351de3c149ac511652cd3 /qpid/cpp/src/Makefile.am | |
| parent | f75078e91e36cc12fc0e4c91fcac95c2c5a1f431 (diff) | |
| download | qpid-python-9193f94dd996458e76506134ad4b506444badd99.tar.gz | |
Logging infrastructure: See qpidd --long-help for details.
* src/qpid/log/*: Logging infrastructure, QPID_LOG macro.
* src/*: changed output to cout/cerr to logging.
* src/qpidd.cpp: logging options.
* src/tests/Makefile.am: fixed issues with valgrind
* src/tests/kill|start_broker: use broker daemon options.
* src/tests/run_test: run tests in valgrind. Disabled till leaks in
client_test are fixed.
* src/test/unit/logging.cpp: Logging unit test using boost test framework.
Eventually we should move all unit tests to boost & drop CppUnit.
* src/test/unit/test_tools.h: useful extensions to boost framework:
Regular expression check, ostream << for vectors.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@542855 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/Makefile.am')
| -rw-r--r-- | qpid/cpp/src/Makefile.am | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am index 4293719a6f..acc3507d24 100644 --- a/qpid/cpp/src/Makefile.am +++ b/qpid/cpp/src/Makefile.am @@ -21,7 +21,7 @@ EXTRA_DIST=generate.sh $(generated_cpp) $(generated_h) $(platform_dist) AM_CXXFLAGS = $(WARNING_CFLAGS) $(APR_CXXFLAGS) AM_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG) -INCLUDES = -I$(builddir)/gen -I$(srcdir)/gen +INCLUDES = -Igen -I$(srcdir)/gen qpidd_LDADD = \ libqpidbroker.la \ @@ -103,11 +103,22 @@ endif lib_LTLIBRARIES = libqpidcommon.la libqpidbroker.la libqpidclient.la +# The logger library uses boost::date_time to format time. +# We have to disable the unused parameters warning to get around +# unused parameters in boost::date_time headers. So we build it +# in a convenience library to link into libqpid_common. +# +noinst_LTLIBRARIES=libLogger.la +libLogger_la_SOURCES=qpid/log/Logger.cpp qpid/log/Logger.h +libLogger_la_CXXFLAGS=$(AM_CXXFLAGS) -Wno-unused-parameter + libqpidcommon_la_LIBADD = \ -lboost_program_options \ + libLogger.la \ $(APR_LIBS) \ $(LIB_DLOPEN) \ $(LIB_CLOCK_GETTIME) + libqpidcommon_la_SOURCES = \ $(platform_src) \ qpid/framing/AMQBody.cpp \ @@ -143,8 +154,14 @@ libqpidcommon_la_SOURCES = \ qpid/QpidError.cpp \ qpid/sys/Runnable.cpp \ qpid/sys/ProducerConsumer.cpp \ - qpid/CommonOptions.cpp - + qpid/CommonOptions.cpp \ + qpid/log/Options.cpp \ + qpid/log/Options.h \ + qpid/log/Selector.cpp \ + qpid/log/Selector.h \ + qpid/log/Statement.cpp \ + qpid/log/Statement.h \ + qpid/memory.h libqpidbroker_la_LIBADD = libqpidcommon.la -ldaemon -lboost_filesystem libqpidbroker_la_SOURCES = \ |