From 6536407690660e10529c826ab3aa21baaa121ea1 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Sat, 23 Dec 2006 17:20:37 +0000 Subject: - rpm: make rpm now builds RPMs under rpm/ directory. - src/qpidd.cpp: added --daemon option to run as daemon. - etc/qpidd: fixed bugs in init.rc script. - qpidc.spec: fixed rpmlint warnings, added apache URL git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@489905 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/docs/api/Makefile.am | 10 +++++----- cpp/docs/api/user.doxygen | 4 ++-- cpp/docs/man/Makefile.am | 4 +++- 3 files changed, 10 insertions(+), 8 deletions(-) (limited to 'cpp/docs') diff --git a/cpp/docs/api/Makefile.am b/cpp/docs/api/Makefile.am index 6845ec0b0d..ed7a00b20c 100644 --- a/cpp/docs/api/Makefile.am +++ b/cpp/docs/api/Makefile.am @@ -6,11 +6,11 @@ dist-hook: html EXTRA_DIST=html SOURCES = \ - $(wildcard $(topsrcdir)/gen/*.h) \ - $(wildcard $(topsrcdir)/lib/common/*.h) \ - $(wildcard $(topsrcdir)/lib/common/sys/*.h) \ - $(wildcard $(topsrcdir)/lib/common/framing/*.h) \ - $(wildcard $(topsrcdir)/lib/client/*.h) + $(wildcard $(top_srcdir)/gen/*.h) \ + $(wildcard $(top_srcdir)/lib/common/*.h) \ + $(wildcard $(top_srcdir)/lib/common/sys/*.h) \ + $(wildcard $(top_srcdir)/lib/common/framing/*.h) \ + $(wildcard $(top_srcdir)/lib/client/*.h) doxygen.tstamp: user.doxygen $(SOURCES) doxygen user.doxygen diff --git a/cpp/docs/api/user.doxygen b/cpp/docs/api/user.doxygen index 2b19196568..0d92dc283b 100644 --- a/cpp/docs/api/user.doxygen +++ b/cpp/docs/api/user.doxygen @@ -146,7 +146,7 @@ SHORT_NAMES = YES # comments will behave just like the Qt-style comments (thus requiring an # explicit @brief command for a brief description. -JAVADOC_AUTOBRIEF = NO +JAVADOC_AUTOBRIEF = YES # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen # treat a multi-line C++ special comment block (i.e. a block of //! or /// @@ -729,7 +729,7 @@ ENUM_VALUES_PER_LINE = 4 # Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are # probably better off using the HTML help feature. -GENERATE_TREEVIEW = YES +GENERATE_TREEVIEW = NO # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be # used to set the initial width (in pixels) of the frame in which the tree diff --git a/cpp/docs/man/Makefile.am b/cpp/docs/man/Makefile.am index 1edfdd55d2..f637328cbb 100644 --- a/cpp/docs/man/Makefile.am +++ b/cpp/docs/man/Makefile.am @@ -4,7 +4,9 @@ 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 +dist-hook: $(man_aux) + +qpidd.1: $(srcdir)/qpidd.x $(top_srcdir)/src/qpidd # Depend on configure.ac to get version number changes. $(dist_man_MANS): $(top_srcdir)/configure.ac -- cgit v1.2.1