summaryrefslogtreecommitdiff
path: root/cpp/docs/api
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2006-12-13 00:26:30 +0000
committerAlan Conway <aconway@apache.org>2006-12-13 00:26:30 +0000
commitf6f325b0101da7d1f42a0a3766537bb7745d8330 (patch)
treeb15501c87f66020a24e9ba89114ba1b4f8ff5bdc /cpp/docs/api
parent19176def0ac87f7dc1e6208edb188000ed80025d (diff)
downloadqpid-python-f6f325b0101da7d1f42a0a3766537bb7745d8330.tar.gz
Sundry fixes to spec and build system for RPM packaging.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@486428 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/docs/api')
-rw-r--r--cpp/docs/api/Makefile.am22
-rw-r--r--cpp/docs/api/user.doxygen2
2 files changed, 4 insertions, 20 deletions
diff --git a/cpp/docs/api/Makefile.am b/cpp/docs/api/Makefile.am
index 7e2f2e811d..3f64ce6f46 100644
--- a/cpp/docs/api/Makefile.am
+++ b/cpp/docs/api/Makefile.am
@@ -1,9 +1,9 @@
-html: user.doxygen doxygen.tstamp
+html: doxygen.tstamp
dist-hook: html
-EXTRA_DIST=html
+nobase_dist_doc_DATA=$(wildcard html/*)
SOURCES = \
$(wildcard $(topsrcdir)/gen/*.h) \
@@ -12,27 +12,11 @@ SOURCES = \
$(wildcard $(topsrcdir)/lib/common/framing/*.h) \
$(wildcard $(topsrcdir)/lib/client/*.h)
-doxygen.tstamp: $(SOURCES)
+doxygen.tstamp: user.doxygen $(SOURCES)
doxygen user.doxygen
touch $@
clean-local:
rm -rf docs.tstamp html man latex doxygen.tstamp xml
-HTML_TARGET_DIR=$(pkgdatadir)/api/html
-
-install-data-local:
- installfiles=`echo html/*`; \
- if test "$$installfiles" = 'html/*'; \
- then echo '-- Nothing to install' ; \
- else \
- $(mkinstalldirs) $(DESTDIR)$(HTML_TARGET_DIR); \
- for i in $$installfiles; do \
- echo '-- Installing '$$i ; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(HTML_TARGET_DIR); \
- done; \
- fi
-
-uninstall-local:
- rm -f $(DESTDIR)$(HTML_TARGET_DIR)/*
diff --git a/cpp/docs/api/user.doxygen b/cpp/docs/api/user.doxygen
index d2f47be9b4..2b19196568 100644
--- a/cpp/docs/api/user.doxygen
+++ b/cpp/docs/api/user.doxygen
@@ -138,7 +138,7 @@ STRIP_FROM_INC_PATH =
# (but less readable) file names. This can be useful is your file systems
# doesn't support long names like on DOS, Mac, or CD-ROM.
-SHORT_NAMES = NO
+SHORT_NAMES = YES
# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
# will interpret the first line (until the first dot) of a JavaDoc-style