Changeset 76379c for doc

Timestamp:

May 10, 2011, 12:30:50 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

451f17

Parents:

f6ff493

git-author:

Frederik Heber <heber@…> (05/10/11 11:55:32)

git-committer:

Frederik Heber <heber@…> (05/10/11 12:30:50)

Message:

Doxygen now uses m4/ac_doxygen.m4.

• fixes to ac_doxygen.m4 necessary as given here, "is not a valid shell variable name": ​https://issues.apache.org/jira/browse/AMQCPP-191.
• we again have doc/Makefile.am as otherwise PHONY targets doxygen-doc and doc come into conflict.
• using .am file for doxygen configuration from doxample (by Oren Ben-Tiki).

Location:

doc

Files:

• Doxyfile (moved) (moved from doc/Doxyfile.in ) (4 diffs)
• Makefile.am (modified) (1 diff, 1 prop)
• am_doxygen_include.am (added)

doc/Doxyfile

@@ -26 +26 @@
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = @PACKAGE_NAME@
+PROJECT_NAME           = $(PROJECT)-$(VERSION)
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
@@ -32 +32 @@
 # if some version control system is used.
 
-PROJECT_NUMBER         = @PACKAGE_VERSION@
+PROJECT_NUMBER         = 
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
@@ -39 +39 @@
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = @top_builddir@/doc
+OUTPUT_DIRECTORY       = $(DOCDIR)
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
@@ -585 +585 @@
 # with spaces.
 
-INPUT                  = @top_srcdir@/src
+INPUT                  = $(SRCDIR)/../src
 
 # This tag can be used to specify the character encoding of the source files

doc/Makefile.am

@@ -1 +1 @@
 
-SRCMANDOCS =
+include am_doxygen_include.am
 
-GENMANDOCS =
+EXTRA_DIST = am_doxygen_include.am Doxyfile
 
-dist_man_MANS = $(SRCMANDOCS) $(GENMANDOCS)
-dist_doc_DATA = $(PDFFILES)
-
-SUFFIXES = .pdf .ps .dvi .tex .xml .html
-
-html-local: doxygen-docs
-
-doxygen-docs:
-        $(DOXYGEN)
-
-.xml.ps:
-        $(XMLTO) $(XMLTOFLAGS) ps $<
-        @touch $@
-
-.xml.html:
-        $(XMLTO) $(XMLTOFLAGS) html-nochunks $<
-        @touch $@
-
-CodePatterns.stamp: CodePatterns.xml
-        @rm -f CodePatterns.tmp
-        @touch CodePatterns.tmp
-        $(XMLTO) $(XMLTOFLAGS) man $<
-        @touch $(GENMANDOCS)
-        @mv -f CodePatterns.tmp $@
-
-$(GENMANDOCS): CodePatterns.stamp
-        @if test -f $@; then touch $@; else \
-          rm -f CodePatterns.stamp; \
-          $(MAKE) $(AM_MAKEFLAGS) CodePatterns.stamp; \
-        fi
-
-clean-local: 
-        rm -f *.aux *.bbl *.blg *.log *.aux.bak
-distclean-local:
-        rm -f *.dvi *.ps *.pdf *.html $(GENMANDOCS) CodePatterns.stamp
-
-.PHONY: allclean doxygen-docs
-allclean: distclean
-
-