diff options
| author | Alan Conway <aconway@apache.org> | 2007-04-30 19:03:53 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-04-30 19:03:53 +0000 |
| commit | 311ac3b34c254109bc74ffa962850fba1d5b85e5 (patch) | |
| tree | dbd8acd183d8f21012a8640de74ba5a638175d59 /cpp/src/Makefile.am | |
| parent | 102644d52e4bf4add4a2cb7b8759e205399f7aaa (diff) | |
| download | qpid-python-311ac3b34c254109bc74ffa962850fba1d5b85e5.tar.gz | |
Resolves: QPID-298, QPID-304: qpidd flags to control broker daemon.
* README: added new dependency, libdaemon.
* qpidc.spec.in: libdaemon dependencies.
* broker/Daemon.h|cpp: Daemon and pid file management, wrapper for libdaemon.
* qpidd.cpp modifid flags
-d [ --daemon ] - waits till deamon is listening before returning.
* qpidd.cpp: new flags
-q [ --quit ] Stop the running daemon politely.
-k [ --kill ] Kill the running daemon harshly.
-c [ --check ] If daemon is running return 0.
--wait SECONDS (=10) Maximum wait for daemon response.
--ppid Print daemon pid to stdout
* tests/dameon_test: Test daemon startup, shutdown.
* test_env: minor fix.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@533828 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/Makefile.am')
| -rw-r--r-- | cpp/src/Makefile.am | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index 99250e15ad..0d104c1470 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -5,10 +5,9 @@ AM_CXXFLAGS = $(WARNING_CFLAGS) $(APR_CXXFLAGS) # -I top_builddir for config.h INCLUDES = -I$(top_builddir) -I$(top_srcdir)/gen -qpidd_LDADD = \ - libqpidbroker.la \ - libqpidcommon.la \ - -lboost_program_options +qpidd_LDADD = \ + libqpidbroker.la \ + libqpidcommon.la sbin_PROGRAMS = qpidd qpidd_SOURCES = qpidd.cpp @@ -104,7 +103,7 @@ libqpidcommon_la_SOURCES = \ qpid/CommonOptions.cpp -libqpidbroker_la_LIBADD = libqpidcommon.la +libqpidbroker_la_LIBADD = libqpidcommon.la -ldaemon -lboost_filesystem libqpidbroker_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG) libqpidbroker_la_SOURCES = \ qpid/broker/AccumulatedAck.cpp \ @@ -118,6 +117,7 @@ libqpidbroker_la_SOURCES = \ qpid/broker/BrokerQueue.cpp \ qpid/broker/Connection.cpp \ qpid/broker/ConnectionFactory.cpp \ + qpid/broker/Daemon.cpp \ qpid/broker/DeliverableMessage.cpp \ qpid/broker/DeliveryRecord.cpp \ qpid/broker/DirectExchange.cpp \ @@ -204,6 +204,7 @@ nobase_include_HEADERS = \ qpid/broker/ConnectionFactory.h \ qpid/broker/ConnectionToken.h \ qpid/broker/Content.h \ + qpid/broker/Daemon.h \ qpid/broker/DeliveryRecord.h \ qpid/broker/HeadersExchange.h \ qpid/broker/LazyLoadedContent.h \ |