-more doxygen improvements

3 files changed, 27 insertions, 11 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index f0c79428..6bdb8fca 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -25,5 +25,5 @@ microhttpd_TEXINFOS = \
   lgpl.texi \
   ecos.texi
 
-EXTRA_DIST = $(man_MANS) Doxyfile $(microhttpd_TEXINFOS) 
+EXTRA_DIST = $(man_MANS) $(microhttpd_TEXINFOS) 
 
diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
new file mode 100644
index 00000000..fe10b617
--- /dev/null
+++ b/doc/doxygen/Makefile.am
@@ -0,0 +1,17 @@
+all:
+        @echo -e \
+"Generate documentation:\n" \
+"\tmake full - full documentation with dependency graphs (slow)\n" \
+"\tmake fast - fast mode without dependency graphs"
+
+full: libmicrohttpd.doxy
+        doxygen $<
+
+fast: libmicrohttpd.doxy
+        sed 's/\(HAVE_DOT.*=\).*/\1 NO/' $< | doxygen -
+
+clean:
+        rm -rf html
+
+
+EXTRA_DIST = libmicrohttpd.doxy
diff --git a/doc/Doxyfile b/doc/doxygen/libmicrohttpd.doxy
index ab2b6109..01f2348d 100644
--- a/doc/Doxyfile
+++ b/doc/doxygen/libmicrohttpd.doxy
@@ -5,8 +5,8 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = "GNU libmicrohttpd"
-PROJECT_NUMBER         = 0.9.5
-OUTPUT_DIRECTORY       = doc/doxygen/
+PROJECT_NUMBER         = 0.9.29
+OUTPUT_DIRECTORY       = .
 CREATE_SUBDIRS         = YES
 OUTPUT_LANGUAGE        = English
 BRIEF_MEMBER_DESC      = YES
@@ -25,8 +25,9 @@ ABBREVIATE_BRIEF       = "The $name class" \
 ALWAYS_DETAILED_SEC    = NO
 INLINE_INHERITED_MEMB  = NO
 FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        = /home/grothoff/svn/libmicrohttpd/
-STRIP_FROM_INC_PATH    = 
+STRIP_FROM_PATH        = ../..
+STRIP_FROM_INC_PATH    = ../../src/include \
+                         src/include
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = NO
 QT_AUTOBRIEF           = NO
@@ -90,16 +91,14 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = /home/grothoff/svn/libmicrohttpd/src/include \
-                         /home/grothoff/svn/libmicrohttpd/src/daemon
+INPUT                  = ../..
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.c \
                          *.h
 RECURSIVE              = YES
-EXCLUDE                = /home/grothoff/svn/libmicrohttpd/src/daemon/daemon_test.c \
-                         /home/grothoff/svn/libmicrohttpd/src/daemon/postprocessor_test.c
+EXCLUDE                = 
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = 
+EXCLUDE_PATTERNS       = */test_* */.svn/* */perf_*
 EXCLUDE_SYMBOLS        = MHD_DLOG
 EXAMPLE_PATH           = 
 EXAMPLE_PATTERNS       = *
@@ -249,4 +248,4 @@ DOT_CLEANUP            = YES
 #---------------------------------------------------------------------------
 # Configuration::additions related to the search engine   
 #---------------------------------------------------------------------------
-SEARCHENGINE           = NO
+SEARCHENGINE           = YES