From 4be048a8a6a0e4b7a3852a2c9ec7b449c93977ee Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 2 Jan 2009 21:57:51 +0200 Subject: [PATCH] Updated doxygen configuration files to work with new doxygen The doxygen run is not exactly warning free yet, but this gets a step closer to being able to produce something useful again. --- hostapd/doc/doxygen.fast | 13 ++++--------- hostapd/doc/doxygen.full | 10 ++++------ wpa_supplicant/doc/doxygen.fast | 10 ++++------ wpa_supplicant/doc/doxygen.full | 8 +++----- 4 files changed, 15 insertions(+), 26 deletions(-) diff --git a/hostapd/doc/doxygen.fast b/hostapd/doc/doxygen.fast index 44760f420..96db8e265 100644 --- a/hostapd/doc/doxygen.fast +++ b/hostapd/doc/doxygen.fast @@ -4,11 +4,10 @@ # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = hostapd -PROJECT_NUMBER = 0.5.x +PROJECT_NUMBER = 0.6.x OUTPUT_DIRECTORY = doc CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English -USE_WINDOWS_ENCODING = NO BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES ABBREVIATE_BRIEF = "The $name class" \ @@ -73,7 +72,7 @@ FILE_VERSION_FILTER = #--------------------------------------------------------------------------- QUIET = NO WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES +WARN_IF_UNDOCUMENTED = NO WARN_IF_DOC_ERROR = YES WARN_NO_PARAMDOC = YES WARN_FORMAT = "$file:$line: $text" @@ -81,9 +80,7 @@ WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = . \ - ../wpa_supplicant/eap_sim_common.c \ - ../wpa_supplicant/eap_sim_common.h +INPUT = . FILE_PATTERNS = *.c *.h *.doxygen RECURSIVE = YES EXCLUDE = @@ -93,7 +90,7 @@ EXAMPLE_PATH = EXAMPLE_PATTERNS = * EXAMPLE_RECURSIVE = NO IMAGE_PATH = doc -INPUT_FILTER = doc/kerneldoc2doxygen.pl +INPUT_FILTER = kerneldoc2doxygen.pl FILTER_PATTERNS = FILTER_SOURCE_FILES = YES #--------------------------------------------------------------------------- @@ -220,8 +217,6 @@ DIRECTORY_GRAPH = NO DOT_IMAGE_FORMAT = png DOT_PATH = DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 1024 -MAX_DOT_GRAPH_HEIGHT = 1024 MAX_DOT_GRAPH_DEPTH = 1000 DOT_TRANSPARENT = NO DOT_MULTI_TARGETS = NO diff --git a/hostapd/doc/doxygen.full b/hostapd/doc/doxygen.full index 619f97730..39402c6e2 100644 --- a/hostapd/doc/doxygen.full +++ b/hostapd/doc/doxygen.full @@ -1,14 +1,13 @@ -# Doxyfile 1.4.1 +# Doxyfile 1.4.4 #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = hostapd -PROJECT_NUMBER = 0.5.x +PROJECT_NUMBER = 0.6.x OUTPUT_DIRECTORY = doc CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English -USE_WINDOWS_ENCODING = NO BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES ABBREVIATE_BRIEF = "The $name class" \ @@ -33,6 +32,7 @@ MULTILINE_CPP_IS_BRIEF = NO DETAILS_AT_TOP = NO INHERIT_DOCS = YES DISTRIBUTE_GROUP_DOC = NO +SEPARATE_MEMBER_PAGES = NO TAB_SIZE = 8 ALIASES = OPTIMIZE_OUTPUT_FOR_C = YES @@ -72,7 +72,7 @@ FILE_VERSION_FILTER = #--------------------------------------------------------------------------- QUIET = NO WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES +WARN_IF_UNDOCUMENTED = NO WARN_IF_DOC_ERROR = YES WARN_NO_PARAMDOC = YES WARN_FORMAT = "$file:$line: $text" @@ -217,8 +217,6 @@ DIRECTORY_GRAPH = NO DOT_IMAGE_FORMAT = png DOT_PATH = DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 1024 -MAX_DOT_GRAPH_HEIGHT = 1024 MAX_DOT_GRAPH_DEPTH = 1000 DOT_TRANSPARENT = NO DOT_MULTI_TARGETS = NO diff --git a/wpa_supplicant/doc/doxygen.fast b/wpa_supplicant/doc/doxygen.fast index a3e1a5377..d0a6c41a8 100644 --- a/wpa_supplicant/doc/doxygen.fast +++ b/wpa_supplicant/doc/doxygen.fast @@ -1,4 +1,4 @@ -# Doxyfile 1.4.1 +# Doxyfile 1.4.4 #--------------------------------------------------------------------------- # Project related configuration options @@ -8,7 +8,6 @@ PROJECT_NUMBER = 0.6.x OUTPUT_DIRECTORY = doc CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English -USE_WINDOWS_ENCODING = NO BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES ABBREVIATE_BRIEF = "The $name class" \ @@ -33,6 +32,7 @@ MULTILINE_CPP_IS_BRIEF = NO DETAILS_AT_TOP = NO INHERIT_DOCS = YES DISTRIBUTE_GROUP_DOC = NO +SEPARATE_MEMBER_PAGES = NO TAB_SIZE = 8 ALIASES = OPTIMIZE_OUTPUT_FOR_C = YES @@ -72,7 +72,7 @@ FILE_VERSION_FILTER = #--------------------------------------------------------------------------- QUIET = NO WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES +WARN_IF_UNDOCUMENTED = NO WARN_IF_DOC_ERROR = YES WARN_NO_PARAMDOC = YES WARN_FORMAT = "$file:$line: $text" @@ -196,7 +196,7 @@ EXPAND_ONLY_PREDEF = NO SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = -PREDEFINED = IEEE8021X_EAPOL +PREDEFINED = IEEE8021X_EAPOL CONFIG_CTRL_IFACE EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- @@ -226,8 +226,6 @@ DIRECTORY_GRAPH = NO DOT_IMAGE_FORMAT = png DOT_PATH = DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 1024 -MAX_DOT_GRAPH_HEIGHT = 1024 MAX_DOT_GRAPH_DEPTH = 1000 DOT_TRANSPARENT = NO DOT_MULTI_TARGETS = NO diff --git a/wpa_supplicant/doc/doxygen.full b/wpa_supplicant/doc/doxygen.full index 3ea15dfff..bbd6a4e9b 100644 --- a/wpa_supplicant/doc/doxygen.full +++ b/wpa_supplicant/doc/doxygen.full @@ -1,4 +1,4 @@ -# Doxyfile 1.4.1 +# Doxyfile 1.4.4 #--------------------------------------------------------------------------- # Project related configuration options @@ -8,7 +8,6 @@ PROJECT_NUMBER = 0.6.x OUTPUT_DIRECTORY = wpa_supplicant/doc CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English -USE_WINDOWS_ENCODING = NO BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES ABBREVIATE_BRIEF = "The $name class" \ @@ -33,6 +32,7 @@ MULTILINE_CPP_IS_BRIEF = NO DETAILS_AT_TOP = NO INHERIT_DOCS = YES DISTRIBUTE_GROUP_DOC = NO +SEPARATE_MEMBER_PAGES = NO TAB_SIZE = 8 ALIASES = OPTIMIZE_OUTPUT_FOR_C = YES @@ -72,7 +72,7 @@ FILE_VERSION_FILTER = #--------------------------------------------------------------------------- QUIET = NO WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES +WARN_IF_UNDOCUMENTED = NO WARN_IF_DOC_ERROR = YES WARN_NO_PARAMDOC = YES WARN_FORMAT = "$file:$line: $text" @@ -227,8 +227,6 @@ DIRECTORY_GRAPH = NO DOT_IMAGE_FORMAT = png DOT_PATH = DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 1024 -MAX_DOT_GRAPH_HEIGHT = 1024 MAX_DOT_GRAPH_DEPTH = 1000 DOT_TRANSPARENT = NO DOT_MULTI_TARGETS = NO