diff options
author | Gerald Combs <gerald@wireshark.org> | 2013-04-26 00:07:42 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2013-04-26 00:07:42 +0000 |
commit | e6434ae19ec7f731a7e52cf34d4e2ac5cfc53336 (patch) | |
tree | c573fa0bed63eb20ff976d398b2326c775ef2804 /epan | |
parent | c3d7f57f58bcc7062b9b1bb8cc438e0b57806505 (diff) |
Update the main, epan, and ui Doxygen configuration files. Change the
output directory to wsar_html (Wireshark API Reference HTML) to match
the Docbook naming convention. In each doxygen.cfg.in move the
doxygen_global.cfg to the top of the file so that our local definitions
don't get clobbered. Add makefile targets for wsar_html and wsar-zip.
svn path=/trunk/; revision=49043
Diffstat (limited to 'epan')
-rw-r--r-- | epan/Makefile.am | 3 | ||||
-rw-r--r-- | epan/doxygen.cfg.in | 14 |
2 files changed, 13 insertions, 4 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am index f77d645ee9..0c07b59df6 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -293,6 +293,9 @@ if HAVE_DOXYGEN $(AM_V_GEN)$(DOXYGEN) doxygen.cfg endif # HAVE_DOXYGEN +wsar_html: doxygen.cfg ../doxygen_global.cfg + $(DOXYGEN) doxygen.cfg + # ABI compliance checker can be obtained from # http://ispras.linux-foundation.org/index.php/ABI_compliance_checker # Checked using version 1.21.12 diff --git a/epan/doxygen.cfg.in b/epan/doxygen.cfg.in index 4e91a21da7..8dc08d769a 100644 --- a/epan/doxygen.cfg.in +++ b/epan/doxygen.cfg.in @@ -1,10 +1,12 @@ # $Id$ # @configure_input@ +@INCLUDE = ../doxygen_global.cfg + # The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. -PROJECT_NAME = Wireshark-Epan +PROJECT_NAME = "Wireshark EPAN" # The PROJECT_NUMBER tag can be used to enter a project or revision number. # This could be handy for archiving the generated documentation or @@ -17,7 +19,13 @@ PROJECT_NUMBER = @VERSION@ # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = +OUTPUT_DIRECTORY = ../wsar_html + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = epan # The INPUT tag can be used to specify the files and/or directories that contain # documented source files. You may enter file names like "myfile.cpp" or @@ -57,5 +65,3 @@ EXCLUDE_SYMLINKS = NO # certain files from those directories. EXCLUDE_PATTERNS = - -@INCLUDE = ../doxygen_global.cfg |