Imported Upstream version 1.8.10upstream/1.8.10

33 files changed, 253 insertions, 282 deletions

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
new file mode 100644
index 0000000..d689eda
--- /dev/null
+++ b/examples/CMakeLists.txt
@@ -0,0 +1,222 @@
+if (build_doc)
+
+file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/examples)
+file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/html/examples)
+file(GLOB EXAMPLE_FILES "*")
+
+if (DOT)
+  set(DIAGRAM_EXAMPLE ${PROJECT_BINARY_DIR}/html/examples/diagrams/html/index.html)
+endif()
+
+# copy all example files
+add_custom_target(copy_examples)
+foreach(example_file ${EXAMPLE_FILES})
+  add_custom_command(TARGET copy_examples PRE_BUILD
+                     COMMAND ${CMAKE_COMMAND} -E
+                         copy ${example_file} ${PROJECT_BINARY_DIR}/examples)
+endforeach()
+
+add_custom_target(examples
+	DEPENDS doxygen copy_examples
+                ${PROJECT_BINARY_DIR}/html/examples/class/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/define/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/enum/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/file/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/func/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/page/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/relates/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/author/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/par/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/overload/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/example/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/include/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/qtstyle/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/jdstyle/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/structcmd/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/autolink/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/restypedef/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/afterdoc/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/template/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/tag/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/group/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/memgrp/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/docstring/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/pyexample/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/tclexample/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/mux/html/index.html
+                ${PROJECT_BINARY_DIR}/html/examples/manual/html/index.html
+                ${DIAGRAM_EXAMPLE}
+	WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/examples
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen class.cfg
+	DEPENDS doxygen class.h class.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/class/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen define.cfg
+	DEPENDS doxygen define.h define.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/define/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen enum.cfg
+	DEPENDS doxygen enum.h enum.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/enum/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen file.cfg
+	DEPENDS doxygen file.h file.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/file/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen func.cfg
+	DEPENDS doxygen func.h func.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/func/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen page.cfg
+	DEPENDS doxygen page.doc page.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/page/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen relates.cfg
+	DEPENDS doxygen relates.cpp relates.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/relates/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen author.cfg
+	DEPENDS doxygen author.cpp author.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/author/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen par.cfg
+	DEPENDS doxygen par.cpp par.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/par/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen overload.cfg
+	DEPENDS doxygen overload.cpp overload.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/overload/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen example.cfg
+	DEPENDS doxygen example.cpp example_test.cpp example.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/example/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen include.cfg
+	DEPENDS doxygen include.cpp example_test.cpp include.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/include/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen qtstyle.cfg
+	DEPENDS doxygen qtstyle.cpp qtstyle.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/qtstyle/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen jdstyle.cfg
+	DEPENDS doxygen jdstyle.cpp jdstyle.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/jdstyle/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen structcmd.cfg
+	DEPENDS doxygen structcmd.h structcmd.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/structcmd/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen autolink.cfg
+	DEPENDS doxygen autolink.cpp autolink.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/autolink/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen tag.cfg
+	DEPENDS doxygen tag.cpp tag.cfg ${PROJECT_BINARY_DIR}/html/examples/example/html/index.html
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/tag/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen restypedef.cfg
+	DEPENDS doxygen restypedef.cpp restypedef.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/restypedef/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen afterdoc.cfg
+	DEPENDS doxygen afterdoc.h afterdoc.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/afterdoc/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen templ.cfg
+	DEPENDS doxygen templ.cpp templ.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/template/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen group.cfg
+	DEPENDS doxygen group.cpp group.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/group/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen memgrp.cfg
+	DEPENDS doxygen memgrp.cpp memgrp.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/memgrp/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen pyexample.cfg
+	DEPENDS doxygen pyexample.py pyexample.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/pyexample/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen tclexample.cfg
+	DEPENDS doxygen tclexample.tcl tclexample.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/tclexample/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen mux.cfg
+	DEPENDS doxygen mux.vhdl mux.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/mux/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen manual.cfg
+	DEPENDS doxygen manual.c manual.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/manual/html/index.html
+)
+
+add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen docstring.cfg
+	DEPENDS doxygen docstring.py docstring.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/docstring/html/index.html
+)
+
+if (DOT)
+  add_custom_command(
+	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen diagrams.cfg
+	DEPENDS doxygen diagrams_a.h diagrams_b.h diagrams_c.h diagrams_d.h diagrams_e.h diagrams.cfg
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/diagrams/html/index.html
+  )
+endif(DOT)
+
+endif()
diff --git a/examples/Makefile.in b/examples/Makefile.in
deleted file mode 100644
index b9c9f20..0000000
--- a/examples/Makefile.in
+++ /dev/null
@@ -1,129 +0,0 @@
-DOXYGEN_BIN="$(DOXYGEN)/bin/doxygen"
-
-all: class/html/index.html \
-     define/html/index.html \
-     enum/html/index.html \
-     file/html/index.html \
-     func/html/index.html \
-     page/html/index.html \
-     relates/html/index.html \
-     author/html/index.html \
-     par/html/index.html \
-     overload/html/index.html \
-     example/html/index.html \
-     include/html/index.html \
-     qtstyle/html/index.html \
-     jdstyle/html/index.html \
-     structcmd/html/index.html \
-     autolink/html/index.html \
-     restypedef/html/index.html \
-     afterdoc/html/index.html \
-     template/html/index.html \
-     tag/html/index.html \
-     group/html/index.html \
-     diagrams/html/index.html \
-     memgrp/html/index.html \
-     docstring/html/index.html \
-     pyexample/html/index.html \
-     tclexample/html/index.html \
-     mux/html/index.html \
-     manual/html/index.html
-
-# Disabled since it is broken :-(
-#     dbusxml/html/index.html
-
-clean:
-	rm -rf  class define enum file func page relates author \
-                par overload example include qtstyle jdstyle structcmd \
-		autolink tag restypedef afterdoc template tag group diagrams \
-		memgrp docstring pyexample mux manual dbusxml tclexample
-
-class/html/index.html: class.h class.cfg
-	$(DOXYGEN_BIN) class.cfg
-
-define/html/index.html: define.h define.cfg
-	$(DOXYGEN_BIN) define.cfg
-
-enum/html/index.html: enum.h enum.cfg
-	$(DOXYGEN_BIN) enum.cfg
-
-file/html/index.html: file.h file.cfg
-	$(DOXYGEN_BIN) file.cfg
-
-func/html/index.html: func.h func.cfg
-	$(DOXYGEN_BIN) func.cfg
-
-page/html/index.html: page.doc page.cfg
-	$(DOXYGEN_BIN) page.cfg
-
-relates/html/index.html: relates.cpp relates.cfg
-	$(DOXYGEN_BIN) relates.cfg
-
-author/html/index.html: author.cpp author.cfg
-	$(DOXYGEN_BIN) author.cfg
-
-par/html/index.html: par.cpp par.cfg
-	$(DOXYGEN_BIN) par.cfg
-
-overload/html/index.html: overload.cpp overload.cfg
-	$(DOXYGEN_BIN) overload.cfg
-
-example/html/index.html: example.cpp example_test.cpp example.cfg
-	$(DOXYGEN_BIN) example.cfg
-
-include/html/index.html: include.cpp example_test.cpp include.cfg
-	$(DOXYGEN_BIN) include.cfg
-
-qtstyle/html/index.html: qtstyle.cpp qtstyle.cfg
-	$(DOXYGEN_BIN) qtstyle.cfg
-
-jdstyle/html/index.html: jdstyle.cpp jdstyle.cfg
-	$(DOXYGEN_BIN) jdstyle.cfg
-
-structcmd/html/index.html: structcmd.h structcmd.cfg
-	$(DOXYGEN_BIN) structcmd.cfg
-
-autolink/html/index.html: autolink.cpp autolink.cfg
-	$(DOXYGEN_BIN) autolink.cfg
-
-tag/html/index.html: tag.cpp tag.cfg example/html/index.html
-	$(DOXYGEN_BIN) tag.cfg
-
-restypedef/html/index.html: restypedef.cpp restypedef.cfg
-	$(DOXYGEN_BIN) restypedef.cfg
-
-afterdoc/html/index.html: afterdoc.h afterdoc.cfg
-	$(DOXYGEN_BIN) afterdoc.cfg
-
-template/html/index.html: templ.cpp templ.cfg
-	$(DOXYGEN_BIN) templ.cfg
-
-group/html/index.html: group.cpp group.cfg
-	$(DOXYGEN_BIN) group.cfg
-
-memgrp/html/index.html: memgrp.cpp memgrp.cfg
-	$(DOXYGEN_BIN) memgrp.cfg
-
-pyexample/html/index.html: pyexample.py pyexample.cfg
-	$(DOXYGEN_BIN) pyexample.cfg
-
-tclexample/html/index.html: tclexample.tcl tclexample.cfg
-	$(DOXYGEN_BIN) tclexample.cfg
-
-mux/html/index.html: mux.vhdl mux.cfg
-	$(DOXYGEN_BIN) mux.cfg
-
-manual/html/index.html: manual.c manual.cfg
-	$(DOXYGEN_BIN) manual.cfg
-
-docstring/html/index.html: docstring.py docstring.cfg
-	$(DOXYGEN_BIN) docstring.cfg
-
-#dbusxml/html/index.html: dbusxml.xml dbusxml.cfg
-#	$(DOXYGEN_BIN) dbusxml.cfg
-
-diagrams/html/index.html: diagrams_a.h diagrams_b.h diagrams_c.h diagrams_d.h diagrams_e.h diagrams.cfg
-ifneq ($(HAVE_DOT),)
-	$(DOXYGEN_BIN) diagrams.cfg
-endif
-
diff --git a/examples/Makefile.win.in b/examples/Makefile.win.in
deleted file mode 100644
index 914c5ed..0000000
--- a/examples/Makefile.win.in
+++ /dev/null
@@ -1,122 +0,0 @@
-DOXYDIR = ..\bin
-
-all: class/html/index.html \
-     define/html/index.html \
-     enum/html/index.html \
-     file/html/index.html \
-     func/html/index.html \
-     page/html/index.html \
-     relates/html/index.html \
-     author/html/index.html \
-     par/html/index.html \
-     overload/html/index.html \
-     example/html/index.html \
-     include/html/index.html \
-     qtstyle/html/index.html \
-     jdstyle/html/index.html \
-     structcmd/html/index.html \
-     autolink/html/index.html \
-     restypedef/html/index.html \
-     afterdoc/html/index.html \
-     template/html/index.html \
-     tag/html/index.html \
-     group/html/index.html \
-     diagrams/html/index.html \
-     memgrp/html/index.html \
-     docstring/html/index.html \
-     pyexample/html/index.html \
-     tclexample/html/index.html \
-     mux/html/index.html \
-     manual/html/index.html
-
-clean:
-	del /s/y class define enum file pyexample tclexample docstring
-	del /s/y func page relates author
-	del /s/y par overload example include qtstyle 
-	del /s/y jdstyle structcmd autolink resdefine mux manual
-	del /s/y restypedef afterdoc template tag group diagrams memgrp
-
-class/html/index.html: class.h class.cfg
-	$(DOXYDIR)\doxygen class.cfg
-
-define/html/index.html: define.h define.cfg
-	$(DOXYDIR)\doxygen define.cfg
-
-enum/html/index.html: enum.h enum.cfg
-	$(DOXYDIR)\doxygen enum.cfg
-
-file/html/index.html: file.h file.cfg
-	$(DOXYDIR)\doxygen file.cfg
-
-func/html/index.html: func.h func.cfg
-	$(DOXYDIR)\doxygen func.cfg
-
-page/html/index.html: page.doc page.cfg
-	$(DOXYDIR)\doxygen page.cfg
-
-relates/html/index.html: relates.cpp relates.cfg
-	$(DOXYDIR)\doxygen relates.cfg
-
-author/html/index.html: author.cpp author.cfg
-	$(DOXYDIR)\doxygen author.cfg
-
-par/html/index.html: par.cpp par.cfg
-	$(DOXYDIR)\doxygen par.cfg
-
-overload/html/index.html: overload.cpp overload.cfg
-	$(DOXYDIR)\doxygen overload.cfg
-
-example/html/index.html: example.cpp example_test.cpp example.cfg 
-	$(DOXYDIR)\doxygen example.cfg
-
-include/html/index.html: include.cpp example_test.cpp include.cfg 
-	$(DOXYDIR)\doxygen include.cfg
-
-qtstyle/html/index.html: qtstyle.cpp qtstyle.cfg 
-	$(DOXYDIR)\doxygen qtstyle.cfg
-
-jdstyle/html/index.html: jdstyle.cpp jdstyle.cfg 
-	$(DOXYDIR)\doxygen jdstyle.cfg
-
-structcmd/html/index.html: structcmd.h structcmd.cfg 
-	$(DOXYDIR)\doxygen structcmd.cfg
-
-autolink/html/index.html: autolink.cpp autolink.cfg 
-	$(DOXYDIR)\doxygen autolink.cfg
-
-tag/html/index.html: tag.cpp tag.cfg 
-	$(DOXYDIR)\doxygen tag.cfg
-
-restypedef/html/index.html: restypedef.cpp restypedef.cfg 
-	$(DOXYDIR)\doxygen restypedef.cfg
-
-afterdoc/html/index.html: afterdoc.h afterdoc.cfg
-	$(DOXYDIR)\doxygen afterdoc.cfg
-
-template/html/index.html: templ.cpp templ.cfg
-	$(DOXYDIR)\doxygen templ.cfg
-
-group/html/index.html: group.cpp group.cfg
-	$(DOXYDIR)\doxygen group.cfg
-
-memgrp/html/index.html: memgrp.cpp memgrp.cfg
-	$(DOXYDIR)\doxygen memgrp.cfg
-
-pyexample/html/index.html: pyexample.py pyexample.cfg
-	$(DOXYDIR)\doxygen pyexample.cfg
-
-tclexample/html/index.html: tclexample.tcl tclexample.cfg
-	$(DOXYDIR)\doxygen tclexample.cfg
-
-mux/html/index.html: mux.vhdl mux.cfg
-	$(DOXYDIR)\doxygen mux.cfg
-
-manual/html/index.html: manual.c manual.cfg
-	$(DOXYDIR)\doxygen manual.cfg
-
-docstring/html/index.html: docstring.py docstring.cfg
-	$(DOXYDIR)\doxygen docstring.cfg
-	
-diagrams/html/index.html: diagrams_a.h diagrams_b.h diagrams_c.h diagrams_d.h diagrams_e.h diagrams.cfg
-	$(DOXYDIR)\doxygen diagrams.cfg
-
diff --git a/examples/afterdoc.cfg b/examples/afterdoc.cfg
index fcdbcae..37bb12d 100644
--- a/examples/afterdoc.cfg
+++ b/examples/afterdoc.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME      = "AfterDocs"
-OUTPUT_DIRECTORY  = afterdoc
+OUTPUT_DIRECTORY  = ../html/examples/afterdoc
 GENERATE_LATEX    = NO
 GENERATE_MAN      = NO
 GENERATE_RTF      = NO
diff --git a/examples/author.cfg b/examples/author.cfg
index 8bb04f7..c7b942c 100644
--- a/examples/author.cfg
+++ b/examples/author.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Author Command"
-OUTPUT_DIRECTORY = author
+OUTPUT_DIRECTORY = ../html/examples/author
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/autolink.cfg b/examples/autolink.cfg
index 406d52c..287b37d 100644
--- a/examples/autolink.cfg
+++ b/examples/autolink.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Automatic link generation"
-OUTPUT_DIRECTORY = autolink
+OUTPUT_DIRECTORY = ../html/examples/autolink
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/class.cfg b/examples/class.cfg
index f2c4796..579cc75 100644
--- a/examples/class.cfg
+++ b/examples/class.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Class Command"
-OUTPUT_DIRECTORY = class
+OUTPUT_DIRECTORY = ../html/examples/class
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/class.h b/examples/class.h
index e5a9121..b40b186 100644
--- a/examples/class.h
+++ b/examples/class.h
@@ -7,5 +7,5 @@ class Test
 /*! \class Test class.h "inc/class.h"
  *  \brief This is a test class.
  *
- * Some details about the Test class
+ * Some details about the Test class.
  */
diff --git a/examples/dbusxml.cfg b/examples/dbusxml.cfg
index 23b9dea..7b70772 100644
--- a/examples/dbusxml.cfg
+++ b/examples/dbusxml.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME      = "DBusXMLDocs"
-OUTPUT_DIRECTORY  = dbusxml
+OUTPUT_DIRECTORY  = ../html/examples/dbusxml
 GENERATE_LATEX    = NO
 GENERATE_MAN      = NO
 GENERATE_RTF      = NO
diff --git a/examples/define.cfg b/examples/define.cfg
index 547591e..8a12da8 100644
--- a/examples/define.cfg
+++ b/examples/define.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Define Command"
-OUTPUT_DIRECTORY = define
+OUTPUT_DIRECTORY = ../html/examples/define
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/diagrams.cfg b/examples/diagrams.cfg
index 9bc5551..5301786 100644
--- a/examples/diagrams.cfg
+++ b/examples/diagrams.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME       = "Diagrams"
-OUTPUT_DIRECTORY   = diagrams
+OUTPUT_DIRECTORY   = ../html/examples/diagrams
 HAVE_DOT           = YES
 EXTRACT_ALL        = YES
 GENERATE_LATEX     = NO
diff --git a/examples/docstring.cfg b/examples/docstring.cfg
index 2a5cd9a..bd65500 100644
--- a/examples/docstring.cfg
+++ b/examples/docstring.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Python"
-OUTPUT_DIRECTORY = docstring
+OUTPUT_DIRECTORY = ../html/examples/docstring
 EXTRACT_ALL      = YES
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
diff --git a/examples/enum.cfg b/examples/enum.cfg
index ed83670..7732be8 100644
--- a/examples/enum.cfg
+++ b/examples/enum.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Enum Command"
-OUTPUT_DIRECTORY = enum
+OUTPUT_DIRECTORY = ../html/examples/enum
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/example.cfg b/examples/example.cfg
index 4c5c869..f57e4ba 100644
--- a/examples/example.cfg
+++ b/examples/example.cfg
@@ -1,6 +1,6 @@
 PROJECT_NAME      = "Example Command"
-OUTPUT_DIRECTORY  = example
-GENERATE_TAGFILE  = example.tag
+OUTPUT_DIRECTORY  = ../html/examples/example
+#GENERATE_TAGFILE  = example.tag
 GENERATE_LATEX    = NO
 GENERATE_MAN      = NO
 GENERATE_RTF      = NO
diff --git a/examples/file.cfg b/examples/file.cfg
index e54b1c7..e622c1e 100644
--- a/examples/file.cfg
+++ b/examples/file.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "File Command"
-OUTPUT_DIRECTORY = file
+OUTPUT_DIRECTORY = ../html/examples/file
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/func.cfg b/examples/func.cfg
index 32c3190..4929f66 100644
--- a/examples/func.cfg
+++ b/examples/func.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Fn Command"
-OUTPUT_DIRECTORY = func
+OUTPUT_DIRECTORY = ../html/examples/func
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/group.cfg b/examples/group.cfg
index 98cc27e..7882713 100644
--- a/examples/group.cfg
+++ b/examples/group.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Grouping"
-OUTPUT_DIRECTORY = group
+OUTPUT_DIRECTORY = ../html/examples/group
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/include.cfg b/examples/include.cfg
index 8516b32..4ecdf8f 100644
--- a/examples/include.cfg
+++ b/examples/include.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Include Command"
-OUTPUT_DIRECTORY = include
+OUTPUT_DIRECTORY = ../html/examples/include
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/jdstyle.cfg b/examples/jdstyle.cfg
index 02bf18c..15eccee 100644
--- a/examples/jdstyle.cfg
+++ b/examples/jdstyle.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME      = "JavaDoc Style"
-OUTPUT_DIRECTORY  = jdstyle
+OUTPUT_DIRECTORY  = ../html/examples/jdstyle
 GENERATE_LATEX    = NO
 GENERATE_MAN      = NO
 GENERATE_RTF      = NO
diff --git a/examples/manual.cfg b/examples/manual.cfg
index 9359842..75d1fc5 100644
--- a/examples/manual.cfg
+++ b/examples/manual.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME           = "Manual inheritance and membership"
-OUTPUT_DIRECTORY       = manual
+OUTPUT_DIRECTORY       = ../html/examples/manual
 GENERATE_LATEX         = NO
 GENERATE_MAN           = NO
 GENERATE_RTF           = NO
diff --git a/examples/memgrp.cfg b/examples/memgrp.cfg
index a69c33c..dea742c 100644
--- a/examples/memgrp.cfg
+++ b/examples/memgrp.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME         = "Member Grouping"
-OUTPUT_DIRECTORY     = memgrp
+OUTPUT_DIRECTORY     = ../html/examples/memgrp
 GENERATE_LATEX       = NO
 GENERATE_MAN         = NO
 GENERATE_RTF         = NO
diff --git a/examples/mux.cfg b/examples/mux.cfg
index ccb0f05..11aa7ca 100644
--- a/examples/mux.cfg
+++ b/examples/mux.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME         = Mux
-OUTPUT_DIRECTORY     = mux
+OUTPUT_DIRECTORY     = ../html/examples/mux
 GENERATE_LATEX       = NO
 GENERATE_MAN         = NO
 GENERATE_RTF         = NO
diff --git a/examples/overload.cfg b/examples/overload.cfg
index d29cb9c..9677065 100644
--- a/examples/overload.cfg
+++ b/examples/overload.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Overloaded Command"
-OUTPUT_DIRECTORY = overload
+OUTPUT_DIRECTORY = ../html/examples/overload
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/page.cfg b/examples/page.cfg
index cd1ff84..980cb17 100644
--- a/examples/page.cfg
+++ b/examples/page.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Page Command"
-OUTPUT_DIRECTORY = page
+OUTPUT_DIRECTORY = ../html/examples/page
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/par.cfg b/examples/par.cfg
index de6caa9..5be0e03 100644
--- a/examples/par.cfg
+++ b/examples/par.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Par Command"
-OUTPUT_DIRECTORY = par
+OUTPUT_DIRECTORY = ../html/examples/par
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/pyexample.cfg b/examples/pyexample.cfg
index 27db0f7..9b44984 100644
--- a/examples/pyexample.cfg
+++ b/examples/pyexample.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Python"
-OUTPUT_DIRECTORY = pyexample
+OUTPUT_DIRECTORY = ../html/examples/pyexample
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/qtstyle.cfg b/examples/qtstyle.cfg
index 0a930be..beae9e4 100644
--- a/examples/qtstyle.cfg
+++ b/examples/qtstyle.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Qt Style"
-OUTPUT_DIRECTORY = qtstyle
+OUTPUT_DIRECTORY = ../html/examples/qtstyle
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/relates.cfg b/examples/relates.cfg
index 4e1d90b..9155a7e 100644
--- a/examples/relates.cfg
+++ b/examples/relates.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Relates Command"
-OUTPUT_DIRECTORY = relates
+OUTPUT_DIRECTORY = ../html/examples/relates
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/restypedef.cfg b/examples/restypedef.cfg
index c55926e..6282a64 100644
--- a/examples/restypedef.cfg
+++ b/examples/restypedef.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Resolving Typedefs"
-OUTPUT_DIRECTORY = restypedef
+OUTPUT_DIRECTORY = ../html/examples/restypedef
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/structcmd.cfg b/examples/structcmd.cfg
index f956ad4..d60cfcf 100644
--- a/examples/structcmd.cfg
+++ b/examples/structcmd.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Structural commands"
-OUTPUT_DIRECTORY = structcmd
+OUTPUT_DIRECTORY = ../html/examples/structcmd
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/tag.cfg b/examples/tag.cfg
index 3627281..97d7d2f 100644
--- a/examples/tag.cfg
+++ b/examples/tag.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Tag Files"
-OUTPUT_DIRECTORY = tag
+OUTPUT_DIRECTORY = ../html/examples/tag
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/tclexample.cfg b/examples/tclexample.cfg
index bde5cc4..e51f4fc 100644
--- a/examples/tclexample.cfg
+++ b/examples/tclexample.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME       = "Tcl"
-OUTPUT_DIRECTORY   = tclexample
+OUTPUT_DIRECTORY   = ../html/examples/tclexample
 GENERATE_LATEX     = NO
 GENERATE_MAN       = NO
 GENERATE_RTF       = NO
diff --git a/examples/templ.cfg b/examples/templ.cfg
index c8d9514..eb59559 100644
--- a/examples/templ.cfg
+++ b/examples/templ.cfg
@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Template Test"
-OUTPUT_DIRECTORY = template
+OUTPUT_DIRECTORY = ../html/examples/template
 GENERATE_LATEX   = NO
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO