aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--hostapd/Makefile6
-rw-r--r--hostapd/doc/doxygen.fast26
-rw-r--r--hostapd/doc/doxygen.full26
-rw-r--r--wpa_supplicant/Makefile2
-rw-r--r--wpa_supplicant/doc/doxygen.fast31
-rw-r--r--wpa_supplicant/doc/doxygen.full2
6 files changed, 46 insertions, 47 deletions
diff --git a/hostapd/Makefile b/hostapd/Makefile
index e531b28..82214e4 100644
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -552,16 +552,16 @@ clean:
docs-pics: doc/hostapd.png doc/hostapd.eps
docs: docs-pics
- doxygen doc/doxygen.full
+ (cd ..; doxygen hostapd/doc/doxygen.full; cd hostapd)
$(MAKE) -C doc/latex
cp doc/latex/refman.pdf hostapd-devel.pdf
docs-fast: docs-pics
- doxygen doc/doxygen.fast
+ (cd ..; doxygen hostapd/doc/doxygen.fast; cd hostapd)
clean-docs:
rm -rf doc/latex doc/html
- rm -f doc/hosta.d{eps,png} hostapd-devel.pdf
+ rm -f doc/hostapd.{eps,png} hostapd-devel.pdf
TEST_SRC_MILENAGE = ../src/hlr_auc_gw/milenage.c ../src/crypto/aes_wrap.c ../src/crypto/aes.c ../src/utils/common.c ../src/utils/wpa_debug.o ../src/utils/os_$(CONFIG_OS).c
test-milenage: $(TEST_SRC_MILENAGE)
diff --git a/hostapd/doc/doxygen.fast b/hostapd/doc/doxygen.fast
index b4dc004..b912359 100644
--- a/hostapd/doc/doxygen.fast
+++ b/hostapd/doc/doxygen.fast
@@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
PROJECT_NAME = hostapd
PROJECT_NUMBER = 0.6.x
-OUTPUT_DIRECTORY = doc
+OUTPUT_DIRECTORY = hostapd/doc
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
BRIEF_MEMBER_DESC = YES
@@ -65,7 +65,7 @@ GENERATE_DEPRECATEDLIST= YES
ENABLED_SECTIONS =
MAX_INITIALIZER_LINES = 30
SHOW_USED_FILES = YES
-SHOW_DIRECTORIES = NO
+SHOW_DIRECTORIES = YES
FILE_VERSION_FILTER =
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
@@ -80,17 +80,17 @@ WARN_LOGFILE =
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
-INPUT = . \
- ../src/common \
- ../src/crypto \
- ../src/eap_common \
- ../src/eap_server \
- ../src/l2_packet \
- ../src/radius \
- ../src/rsn_supp \
- ../src/tls \
- ../src/utils \
- ../src/wps
+INPUT = hostapd \
+ src/common \
+ src/crypto \
+ src/eap_common \
+ src/eap_server \
+ src/l2_packet \
+ src/radius \
+ src/rsn_supp \
+ src/tls \
+ src/utils \
+ src/wps
FILE_PATTERNS = *.c *.h *.doxygen
RECURSIVE = YES
EXCLUDE =
diff --git a/hostapd/doc/doxygen.full b/hostapd/doc/doxygen.full
index 88f65cb..2ec489f 100644
--- a/hostapd/doc/doxygen.full
+++ b/hostapd/doc/doxygen.full
@@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
PROJECT_NAME = hostapd
PROJECT_NUMBER = 0.6.x
-OUTPUT_DIRECTORY = doc
+OUTPUT_DIRECTORY = hostapd/doc
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
BRIEF_MEMBER_DESC = YES
@@ -65,7 +65,7 @@ GENERATE_DEPRECATEDLIST= YES
ENABLED_SECTIONS =
MAX_INITIALIZER_LINES = 30
SHOW_USED_FILES = YES
-SHOW_DIRECTORIES = NO
+SHOW_DIRECTORIES = YES
FILE_VERSION_FILTER =
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
@@ -80,17 +80,17 @@ WARN_LOGFILE =
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
-INPUT = . \
- ../src/common \
- ../src/crypto \
- ../src/eap_common \
- ../src/eap_server \
- ../src/l2_packet \
- ../src/radius \
- ../src/rsn_supp \
- ../src/tls \
- ../src/utils \
- ../src/wps
+INPUT = hostapd \
+ src/common \
+ src/crypto \
+ src/eap_common \
+ src/eap_server \
+ src/l2_packet \
+ src/radius \
+ src/rsn_supp \
+ src/tls \
+ src/utils \
+ src/wps
FILE_PATTERNS = *.c *.h *.doxygen
RECURSIVE = YES
EXCLUDE =
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 16eed31..e97f0e5 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -1224,7 +1224,7 @@ docs: docs-pics
cp doc/latex/refman.pdf wpa_supplicant-devel.pdf
docs-fast: docs-pics
- doxygen doc/doxygen.fast
+ (cd ..; doxygen wpa_supplicant/doc/doxygen.fast; cd wpa_supplicant)
clean-docs:
rm -rf doc/latex doc/html
diff --git a/wpa_supplicant/doc/doxygen.fast b/wpa_supplicant/doc/doxygen.fast
index da42497..c15f89d 100644
--- a/wpa_supplicant/doc/doxygen.fast
+++ b/wpa_supplicant/doc/doxygen.fast
@@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
PROJECT_NAME = wpa_supplicant
PROJECT_NUMBER = 0.6.x
-OUTPUT_DIRECTORY = doc
+OUTPUT_DIRECTORY = wpa_supplicant/doc
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
BRIEF_MEMBER_DESC = YES
@@ -65,7 +65,7 @@ GENERATE_DEPRECATEDLIST= YES
ENABLED_SECTIONS =
MAX_INITIALIZER_LINES = 30
SHOW_USED_FILES = YES
-SHOW_DIRECTORIES = NO
+SHOW_DIRECTORIES = YES
FILE_VERSION_FILTER =
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
@@ -80,20 +80,19 @@ WARN_LOGFILE =
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
-INPUT = . \
- ../src/common \
- ../src/crypto \
- ../src/drivers/driver.h \
- ../src/drivers/drivers.c \
- ../src/eap_common \
- ../src/eapol_supp \
- ../src/eap_peer \
- ../src/l2_packet \
- ../src/rsn_supp \
- ../src/tls \
- ../src/utils \
- ../src/wps
-FILE_PATTERNS = *.c *.h *.doxygen
+INPUT = wpa_supplicant \
+ src/common \
+ src/crypto \
+ src/drivers \
+ src/eap_common \
+ src/eapol_supp \
+ src/eap_peer \
+ src/l2_packet \
+ src/rsn_supp \
+ src/tls \
+ src/utils \
+ src/wps
+FILE_PATTERNS = *.c *.h *.cpp *.m *.doxygen
RECURSIVE = YES
EXCLUDE =
EXCLUDE_SYMLINKS = NO
diff --git a/wpa_supplicant/doc/doxygen.full b/wpa_supplicant/doc/doxygen.full
index 6d12001..0717751 100644
--- a/wpa_supplicant/doc/doxygen.full
+++ b/wpa_supplicant/doc/doxygen.full
@@ -23,7 +23,7 @@ ABBREVIATE_BRIEF = "The $name class" \
the
ALWAYS_DETAILED_SEC = NO
INLINE_INHERITED_MEMB = NO
-FULL_PATH_NAMES = NO
+FULL_PATH_NAMES = YES
STRIP_FROM_PATH =
STRIP_FROM_INC_PATH =
SHORT_NAMES = NO