diff options
| author | Alan Conway <aconway@apache.org> | 2007-04-26 16:01:04 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-04-26 16:01:04 +0000 |
| commit | 0a90e5db613b035e15af3b7358205ed1f7960d2c (patch) | |
| tree | c4b1ec81e60a3b93e414ddf725985d1a9ff5d291 /cpp/src/Makefile.am | |
| parent | 4473eb5d9e9da37e515be063952d284034adbec3 (diff) | |
| download | qpid-python-0a90e5db613b035e15af3b7358205ed1f7960d2c.tar.gz | |
Merged revisions 532430 by hand from
https://svn.apache.org/repos/asf/incubator/qpid/branches/trunk/qpid/cpp
------------------------------------------------------------------------
r532430 | aconway | 2007-04-25 14:06:14 -0400 (Wed, 25 Apr 2007) | 10 lines
* qpid/CommonOptions.h:
- Convenience classs/functions to use boost::program_options.
- CommonOptions class for options common to client/broker.
* qpid/broker/Broker.h:
- Replaced broker::Configuration with class Broker::Options,
derived from CommonOptions.
* qpidd.cpp: Updated options handling.
* qpid/Exception.h: Added strError function to get std::string from errno.
------------------------------------------------------------------------
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@532787 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/Makefile.am')
| -rw-r--r-- | cpp/src/Makefile.am | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index 40398eb2c9..42b86f98e6 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -1,14 +1,16 @@ 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 \ + +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 +LDADD = \ + ../lib/broker/libqpidbroker.la \ + ../lib/common/libqpidcommon.la \ + -lboost_program_options sbin_PROGRAMS = qpidd qpidd_SOURCES = qpidd.cpp |