From 8ea91b2aa2b1a6a3fdbf47a2eb36e7c2c997bec8 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Wed, 27 Jun 2007 00:12:26 +0000
Subject: 	Make check now starts a broker on a dynamically assigned port,
 so 	multiple qpid builds on one host will not conflict.

	* src/tests/run_test, start_broker, kill_broker:
	  Broker writes port to file, run_test sets QPID_PORT
	  in environment of all tests.

	* src/tests/topic_publisher.cpp, topic_listener.cpp, client_test.cpp:
	  All test clients use TestOptions to parse options from args and env.

	* src/qpid/Options.h: Renamed from CommonOptions.h
	  Simplified use of Options class.

	* src/qpid/Url.h: Renamed defaultPort constant.

	* src/tests/logging.cpp:
	* src/tests/interop_runner.cpp:
	* src/tests/TestOptions.h:
	* src/qpidd.cpp:
	* src/qpid/log/Options.cpp:
	* src/qpid/log/Logger.cpp:
	* src/qpid/broker/Broker.cpp:
	  Updated for changes to Options.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@550993 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/docs/man/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'qpid/cpp/docs/man')

diff --git a/qpid/cpp/docs/man/Makefile.am b/qpid/cpp/docs/man/Makefile.am
index f9fff2d520..c8df4eab6a 100644
--- a/qpid/cpp/docs/man/Makefile.am
+++ b/qpid/cpp/docs/man/Makefile.am
@@ -15,6 +15,6 @@ SUFFIXES = .x .1
 .x.1:
 	@rm -f $@
 	@echo "Updating man page $@"
-	$(HELP2MAN) --no-info --include=$(srcdir)/$*.x --output=$@-t -h --long-help ../../src/$*
+	$(HELP2MAN) --no-info --include=$(srcdir)/$*.x --output=$@-t ../../src/$*
 	@chmod a-w $@-t
 	@mv $@-t $@
-- 
cgit v1.2.1