summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2006-12-08 12:53:21 +0000
committerGordon Sim <gsim@apache.org>2006-12-08 12:53:21 +0000
commita07c0fedb38be87ccf6d28059c1414e81e270c1b (patch)
tree4a98ee0c19c1ea90bb9fbe9f83dc249e4906f201
parent1ae8e45eb9c80748fc431bb74ccaad4d696c1b74 (diff)
downloadqpid-python-a07c0fedb38be87ccf6d28059c1414e81e270c1b.tar.gz
Patch submitted to dev:
2006-12-08 Jim Meyering <meyering@redhat.com> Automatically generate qpidd.1 from qpidd --help output. * Makefile.am (SUBDIRS): Add man. * configure.ac: Test for help2man. * man/qpidd.x: New file. * man/Makefile.am: New file. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@483973 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/Makefile.am2
-rw-r--r--qpid/cpp/configure.ac3
-rw-r--r--qpid/cpp/man/Makefile.am18
-rw-r--r--qpid/cpp/man/qpidd.x5
4 files changed, 27 insertions, 1 deletions
diff --git a/qpid/cpp/Makefile.am b/qpid/cpp/Makefile.am
index 644b1519dc..c3636e5683 100644
--- a/qpid/cpp/Makefile.am
+++ b/qpid/cpp/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = README-dist DESIGN LICENSE.txt NOTICE.txt README.rhel3
-SUBDIRS = gen lib tests src docs/api
+SUBDIRS = gen lib tests src docs/api man
# Update libtool, if needed.
libtool: $(LIBTOOL_DEPS)
diff --git a/qpid/cpp/configure.ac b/qpid/cpp/configure.ac
index a43040befd..3ee1a9b1de 100644
--- a/qpid/cpp/configure.ac
+++ b/qpid/cpp/configure.ac
@@ -25,6 +25,8 @@ AM_PROG_CC_C_O
AC_PROG_CXX
AC_USE_SYSTEM_EXTENSIONS
+AM_MISSING_PROG([HELP2MAN], [help2man])
+
AC_ARG_ENABLE(warnings,
[ --enable-warnings turn on lots of compiler warnings (recommended)],
[case "${enableval}" in
@@ -128,6 +130,7 @@ AC_CONFIG_FILES([
lib/client/Makefile
lib/broker/Makefile
src/Makefile
+ man/Makefile
tests/Makefile
docs/api/Makefile
])
diff --git a/qpid/cpp/man/Makefile.am b/qpid/cpp/man/Makefile.am
new file mode 100644
index 0000000000..392633251e
--- /dev/null
+++ b/qpid/cpp/man/Makefile.am
@@ -0,0 +1,18 @@
+dist_man_MANS = qpidd.1
+
+man_aux = $(dist_man_MANS:.1=.x) $(optional_mans:.1=.x)
+EXTRA_DIST = $(man_aux) $(optional_mans)
+MAINTAINERCLEANFILES = $(dist_man_MANS)
+
+qpidd.1: $(srcdir)/qpidd.x $(top_srcdir)/src/qpidd.cpp
+
+# Depend on configure.ac to get version number changes.
+$(dist_man_MANS): $(top_srcdir)/configure.ac
+
+SUFFIXES = .x .1
+.x.1:
+ @rm -f $@
+ @echo "Updating man page $@"
+ $(HELP2MAN) --no-info --include=$(srcdir)/$*.x --output=$@-t ../src/$*
+ @chmod a-w $@-t
+ @mv $@-t $@
diff --git a/qpid/cpp/man/qpidd.x b/qpid/cpp/man/qpidd.x
new file mode 100644
index 0000000000..e60505cc9c
--- /dev/null
+++ b/qpid/cpp/man/qpidd.x
@@ -0,0 +1,5 @@
+[NAME]
+qpidd \- the Qpid broker daemon
+
+[DESCRIPTION]
+.\" Add any additional description here