diff options
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | doxygen.cfg.in | 18 | ||||
| -rw-r--r-- | doxygen_global.cfg | 4 | ||||
| -rw-r--r-- | epan/Makefile.am | 3 | ||||
| -rw-r--r-- | epan/doxygen.cfg.in | 14 | ||||
| -rw-r--r-- | ui/Makefile.am | 3 | ||||
| -rw-r--r-- | ui/doxygen.cfg.in | 14 |
7 files changed, 49 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index ba011c53ee..9f7de5d30d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1150,3 +1150,12 @@ checkapi: checkapi_local cd epan/dissectors && $(MAKE) checkapi cd plugins && $(MAKE) checkapi cd wsutil && $(MAKE) checkapi + +wsar_html: doxygen.cfg doxygen_global.cfg + $(DOXYGEN) doxygen.cfg + cd epan && $(MAKE) $@ + cd ui && $(MAKE) $@ + +wsar-zip: wsar_html + rm -f wsar_html.zip + zip -rq wsar_html.zip wsar_html diff --git a/doxygen.cfg.in b/doxygen.cfg.in index 640b0fdcc1..b453233e90 100644 --- a/doxygen.cfg.in +++ b/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 +PROJECT_NAME = "Wireshark Core" # 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 = core # 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 @@ -39,13 +47,13 @@ FILE_PATTERNS = # should be searched for input files as well. Possible values are YES and NO. # If left blank NO is used. -RECURSIVE = YES +RECURSIVE = NO # The EXCLUDE tag can be used to specify files and/or directories that should # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = gtk2.tmp +EXCLUDE = # The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories # that are symbolic links (a Unix filesystem feature) are excluded from the input. @@ -64,5 +72,3 @@ EXCLUDE_PATTERNS = # written to the html output directory. CHM_FILE = wireshark-gtk.chm - -@INCLUDE = doxygen_global.cfg diff --git a/doxygen_global.cfg b/doxygen_global.cfg index 25bee6df2e..849c2eb655 100644 --- a/doxygen_global.cfg +++ b/doxygen_global.cfg @@ -38,7 +38,7 @@ PROJECT_NUMBER = # 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 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create # 4096 sub-directories (in 2 levels) under the output directory of each output @@ -780,7 +780,7 @@ GENERATE_HTML = YES # 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 = html +HTML_OUTPUT = # The HTML_FILE_EXTENSION tag can be used to specify the file extension for # each generated HTML page (for example: .htm,.php,.asp). If it is left blank 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 diff --git a/ui/Makefile.am b/ui/Makefile.am index f271d1118a..0c99b30556 100644 --- a/ui/Makefile.am +++ b/ui/Makefile.am @@ -69,6 +69,9 @@ if HAVE_DOXYGEN $(DOXYGEN) doxygen.cfg endif # HAVE_DOXYGEN +wsar_html: doxygen.cfg ../doxygen_global.cfg + $(DOXYGEN) doxygen.cfg + checkapi: checkapi-base checkapi-todo checkapi-base: diff --git a/ui/doxygen.cfg.in b/ui/doxygen.cfg.in index 1268ca4c1a..1f8d325a72 100644 --- a/ui/doxygen.cfg.in +++ b/ui/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-UI +PROJECT_NAME = "Wireshark Common UI" # 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 = ui # 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 @@ -65,5 +73,3 @@ EXCLUDE_PATTERNS = # written to the html output directory. CHM_FILE = wireshark-ui.chm - -@INCLUDE = ../doxygen_global.cfg |