Merge from HEAD to allow automatic Doxygen generation.

(This used to be commit ff8674d13b6c57907c9cd5776a0a658a9727d0b4)

diff --git a/source3/Doxyfile b/source3/Doxyfile
index bbdc5da7e7a542c2b4d5f8aacedfc923618f0f36..914ba25672cf3b40bb8785c35b81e2c4d27e3f74 100644 (file)
--- a/source3/Doxyfile
+++ b/source3/Doxyfile
@@ -5,7 +5,15 @@
 #---------------------------------------------------------------------------
 PROJECT_NAME           = Samba
 PROJECT_NUMBER         = HEAD
+
+# NOTE: By default, Doxygen writes into the dox/ subdirectory of the
+# invocation directory.  If you want to put it somewhere else, for
+# example, to write straight into a webserver directory, then override
+# this variable in a configuration concatenated to this one: Doxygen
+# doesn't mind variables being redefined.
+
 OUTPUT_DIRECTORY       = dox
+
 OUTPUT_LANGUAGE        = English
 EXTRACT_ALL            = YES
 EXTRACT_PRIVATE        = YES
@@ -41,12 +49,11 @@ ENABLED_SECTIONS       =
 MAX_INITIALIZER_LINES  = 30
 OPTIMIZE_OUTPUT_FOR_C  = YES
 SHOW_USED_FILES        = YES
-REFERENCED_RELATION    = YES
 REFERENCED_BY_RELATION = YES
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
-QUIET                  = NO
+QUIET                  = YES
 WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = NO
 WARN_FORMAT            = "$file:$line: $text"
@@ -55,7 +62,7 @@ WARN_LOGFILE           =
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 INPUT                  = . \
-                         CodingSuggestions mainpage.dox
+                         mainpage.dox
 FILE_PATTERNS          = *.c \
                          *.h \
                          *.idl
@@ -78,7 +85,7 @@ IGNORE_PREFIX          =
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 GENERATE_HTML          = YES
-HTML_OUTPUT            = html
+HTML_OUTPUT            = .
 HTML_HEADER            = 
 HTML_FOOTER            = 
 HTML_STYLESHEET        = 
@@ -145,7 +152,7 @@ PERL_PATH              = /usr/bin/perl
 #---------------------------------------------------------------------------
 # configuration options related to the dot tool   
 #---------------------------------------------------------------------------
-HAVE_DOT               = YES
+HAVE_DOT               = NO
 CLASS_GRAPH            = YES
 COLLABORATION_GRAPH    = YES
 TEMPLATE_RELATIONS     = YES