29 files changed, 94 insertions, 33 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index f3d51f4..194b427 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,5 +1,6 @@
 file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/examples
-                    ${PROJECT_BINARY_DIR}/html/examples)
+                    ${PROJECT_BINARY_DIR}/html/examples
+                    ${PROJECT_BINARY_DIR}/latex/examples)
 file(GLOB EXAMPLE_FILES RELATIVE ${PROJECT_SOURCE_DIR}/examples "*")
 
 if (DOT)
@@ -50,10 +51,12 @@ foreach (f_inp  ${BASIC_EXAMPLES})
         string(REGEX REPLACE ".*:" "" f_ext ${f_inp})
         string(REGEX REPLACE ":.*" "" f ${f_inp})
     add_custom_command(
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/html/examples/${f}
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/latex/examples/${f}
 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen ${f}.cfg
-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/${f}/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/${f}/latex/refman_doc.tex
+        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman.tex > ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman_doc.tex
 	DEPENDS doxygen ${f}.${f_ext} ${f}.cfg ${TOP}/examples/strip_example.py
-	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/${f}/html/index.html ${PROJECT_BINARY_DIR}/html/examples/${f}/latex/refman_doc.tex
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/${f}/html/index.html ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman_doc.tex
     )
     set(EXAMPLES_RES ${EXAMPLES_RES} "" ${PROJECT_BINARY_DIR}/html/examples/${f}/html/index.html)
 endforeach()
@@ -67,9 +70,11 @@ add_custom_target(examples
 
 if (DOT)
   add_custom_command(
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/html/examples/diagrams
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/latex/examples/diagrams
 	COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen diagrams.cfg
-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman_doc.tex
+        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman.tex > ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman_doc.tex
 	DEPENDS doxygen diagrams_a.h diagrams_b.h diagrams_c.h diagrams_d.h diagrams_e.h diagrams.cfg ${TOP}/examples/strip_example.py
-	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/diagrams/html/index.html ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman_doc.tex
+	OUTPUT ${PROJECT_BINARY_DIR}/html/examples/diagrams/html/index.html ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman_doc.tex
   )
 endif(DOT)
diff --git a/examples/afterdoc.cfg b/examples/afterdoc.cfg
index 57a1b3f..71c2a88 100644
--- a/examples/afterdoc.cfg
+++ b/examples/afterdoc.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME      = "AfterDocs"
-OUTPUT_DIRECTORY  = ../html/examples/afterdoc
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/afterdoc/html
+LATEX_OUTPUT     = latex/examples/afterdoc/latex
 GENERATE_LATEX    = YES
 GENERATE_MAN      = NO
 GENERATE_RTF      = NO
diff --git a/examples/author.cfg b/examples/author.cfg
index 593c9c8..1107e2c 100644
--- a/examples/author.cfg
+++ b/examples/author.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME     = "Author Command"
-OUTPUT_DIRECTORY = ../html/examples/author
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/author/html
+LATEX_OUTPUT     = latex/examples/author/latex
 GENERATE_LATEX   = YES
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/autolink.cfg b/examples/autolink.cfg
index 66f4c32..25607eb 100644
--- a/examples/autolink.cfg
+++ b/examples/autolink.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME     = "Automatic link generation"
-OUTPUT_DIRECTORY = ../html/examples/autolink
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/autolink/html
+LATEX_OUTPUT     = latex/examples/autolink/latex
 GENERATE_LATEX   = YES
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/class.cfg b/examples/class.cfg
index 706a45b..c8c8bdc 100644
--- a/examples/class.cfg
+++ b/examples/class.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME     = "Class Command"
-OUTPUT_DIRECTORY = ../html/examples/class
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/class/html
+LATEX_OUTPUT     = latex/examples/class/latex
 GENERATE_LATEX   = YES
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/define.cfg b/examples/define.cfg
index 64dba3b..63662c5 100644
--- a/examples/define.cfg
+++ b/examples/define.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME     = "Define Command"
-OUTPUT_DIRECTORY = ../html/examples/define
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/define/html
+LATEX_OUTPUT     = latex/examples/define/latex
 GENERATE_LATEX   = YES
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/diagrams.cfg b/examples/diagrams.cfg
index 1637a0b..04d972c 100644
--- a/examples/diagrams.cfg
+++ b/examples/diagrams.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME       = "Diagrams"
-OUTPUT_DIRECTORY   = ../html/examples/diagrams
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/diagrams/html
+LATEX_OUTPUT     = latex/examples/diagrams/latex
 HAVE_DOT           = YES
 EXTRACT_ALL        = YES
 GENERATE_LATEX     = YES
diff --git a/examples/docstring.cfg b/examples/docstring.cfg
index aca78a1..2e18b0a 100644
--- a/examples/docstring.cfg
+++ b/examples/docstring.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME     = "Python"
-OUTPUT_DIRECTORY = ../html/examples/docstring
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/docstring/html
+LATEX_OUTPUT     = latex/examples/docstring/latex
 EXTRACT_ALL      = YES
 GENERATE_LATEX   = YES
 GENERATE_MAN     = NO
diff --git a/examples/enum.cfg b/examples/enum.cfg
index 4bcae33..8439b6f 100644
--- a/examples/enum.cfg
+++ b/examples/enum.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME     = "Enum Command"
-OUTPUT_DIRECTORY = ../html/examples/enum
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/enum/html
+LATEX_OUTPUT     = latex/examples/enum/latex
 GENERATE_LATEX   = YES
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/example.cfg b/examples/example.cfg
index 0b2d027..1f8809d 100644
--- a/examples/example.cfg
+++ b/examples/example.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME      = "Example Command"
-OUTPUT_DIRECTORY  = ../html/examples/example
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/example/html
+LATEX_OUTPUT     = latex/examples/example/latex
 GENERATE_TAGFILE  = example.tag
 GENERATE_LATEX    = YES
 GENERATE_MAN      = NO
diff --git a/examples/file.cfg b/examples/file.cfg
index ae639e4..1137fec 100644
--- a/examples/file.cfg
+++ b/examples/file.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME     = "File Command"
-OUTPUT_DIRECTORY = ../html/examples/file
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/file/html
+LATEX_OUTPUT     = latex/examples/file/latex
 GENERATE_LATEX   = YES
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/func.cfg b/examples/func.cfg
index 0cbc1df..a46a02d 100644
--- a/examples/func.cfg
+++ b/examples/func.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME     = "Fn Command"
-OUTPUT_DIRECTORY = ../html/examples/func
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/func/html
+LATEX_OUTPUT     = latex/examples/func/latex
 GENERATE_LATEX   = YES
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/group.cfg b/examples/group.cfg
index 4fb71d5..3d357fc 100644
--- a/examples/group.cfg
+++ b/examples/group.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME     = "Grouping"
-OUTPUT_DIRECTORY = ../html/examples/group
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/group/html
+LATEX_OUTPUT     = latex/examples/group/latex
 GENERATE_LATEX   = YES
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/include.cfg b/examples/include.cfg
index db4180c..0a88b8b 100644
--- a/examples/include.cfg
+++ b/examples/include.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME     = "Include Command"
-OUTPUT_DIRECTORY = ../html/examples/include
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/include/html
+LATEX_OUTPUT     = latex/examples/include/latex
 GENERATE_LATEX   = YES
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/javadoc-banner.cfg b/examples/javadoc-banner.cfg
index f9a6ff8..06afc88 100644
--- a/examples/javadoc-banner.cfg
+++ b/examples/javadoc-banner.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME     = "Javadoc Banner"
-OUTPUT_DIRECTORY = ../html/examples/javadoc-banner
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/javadoc-banner/html
+LATEX_OUTPUT     = latex/examples/javadoc-banner/latex
 GENERATE_LATEX   = YES
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/jdstyle.cfg b/examples/jdstyle.cfg
index db46891..7594b78 100644
--- a/examples/jdstyle.cfg
+++ b/examples/jdstyle.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME      = "Javadoc Style"
-OUTPUT_DIRECTORY  = ../html/examples/jdstyle
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/jdstyle/html
+LATEX_OUTPUT     = latex/examples/jdstyle/latex
 GENERATE_LATEX    = YES
 GENERATE_MAN      = NO
 GENERATE_RTF      = NO
diff --git a/examples/manual.cfg b/examples/manual.cfg
index d73bb8d..aac6d2c 100644
--- a/examples/manual.cfg
+++ b/examples/manual.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME           = "Manual inheritance and membership"
-OUTPUT_DIRECTORY       = ../html/examples/manual
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/manual/html
+LATEX_OUTPUT     = latex/examples/manual/latex
 GENERATE_LATEX         = YES
 GENERATE_MAN           = NO
 GENERATE_RTF           = NO
diff --git a/examples/memgrp.cfg b/examples/memgrp.cfg
index 13395d9..ac68e69 100644
--- a/examples/memgrp.cfg
+++ b/examples/memgrp.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME         = "Member Grouping"
-OUTPUT_DIRECTORY     = ../html/examples/memgrp
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/memgrp/html
+LATEX_OUTPUT     = latex/examples/memgrp/latex
 GENERATE_LATEX       = YES
 GENERATE_MAN         = NO
 GENERATE_RTF         = NO
diff --git a/examples/mux.cfg b/examples/mux.cfg
index 89c2047..bfc3472 100644
--- a/examples/mux.cfg
+++ b/examples/mux.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME         = Mux
-OUTPUT_DIRECTORY     = ../html/examples/mux
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/mux/html
+LATEX_OUTPUT     = latex/examples/mux/latex
 GENERATE_LATEX       = YES
 GENERATE_MAN         = NO
 GENERATE_RTF         = NO
diff --git a/examples/overload.cfg b/examples/overload.cfg
index 2edf148..2950b71 100644
--- a/examples/overload.cfg
+++ b/examples/overload.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME     = "Overloaded Command"
-OUTPUT_DIRECTORY = ../html/examples/overload
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/overload/html
+LATEX_OUTPUT     = latex/examples/overload/latex
 GENERATE_LATEX   = YES
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/page.cfg b/examples/page.cfg
index 6e6b9d3..f5a1540 100644
--- a/examples/page.cfg
+++ b/examples/page.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME     = "Page Command"
-OUTPUT_DIRECTORY = ../html/examples/page
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/page/html
+LATEX_OUTPUT     = latex/examples/page/latex
 GENERATE_LATEX   = YES
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/par.cfg b/examples/par.cfg
index a1f634d..977cd07 100644
--- a/examples/par.cfg
+++ b/examples/par.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME     = "Par Command"
-OUTPUT_DIRECTORY = ../html/examples/par
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/par/html
+LATEX_OUTPUT     = latex/examples/par/latex
 GENERATE_LATEX   = YES
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/pyexample.cfg b/examples/pyexample.cfg
index 3fd1333..edbaeac 100644
--- a/examples/pyexample.cfg
+++ b/examples/pyexample.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME     = "Python"
-OUTPUT_DIRECTORY = ../html/examples/pyexample
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/pyexample/html
+LATEX_OUTPUT     = latex/examples/pyexample/latex
 GENERATE_LATEX   = YES
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/qtstyle.cfg b/examples/qtstyle.cfg
index 2197da3..6c9f67a 100644
--- a/examples/qtstyle.cfg
+++ b/examples/qtstyle.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME     = "Qt Style"
-OUTPUT_DIRECTORY = ../html/examples/qtstyle
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/qtstyle/html
+LATEX_OUTPUT     = latex/examples/qtstyle/latex
 GENERATE_LATEX   = YES
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/relates.cfg b/examples/relates.cfg
index 1e5db21..9c05def 100644
--- a/examples/relates.cfg
+++ b/examples/relates.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME     = "Relates Command"
-OUTPUT_DIRECTORY = ../html/examples/relates
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/relates/html
+LATEX_OUTPUT     = latex/examples/relates/latex
 GENERATE_LATEX   = YES
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/restypedef.cfg b/examples/restypedef.cfg
index 1708f7c..76c07e4 100644
--- a/examples/restypedef.cfg
+++ b/examples/restypedef.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME     = "Resolving Typedefs"
-OUTPUT_DIRECTORY = ../html/examples/restypedef
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/restypedef/html
+LATEX_OUTPUT     = latex/examples/restypedef/latex
 GENERATE_LATEX   = YES
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/structcmd.cfg b/examples/structcmd.cfg
index 1a4becc..7521516 100644
--- a/examples/structcmd.cfg
+++ b/examples/structcmd.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME     = "Structural commands"
-OUTPUT_DIRECTORY = ../html/examples/structcmd
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/structcmd/html
+LATEX_OUTPUT     = latex/examples/structcmd/latex
 GENERATE_LATEX   = YES
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/tag.cfg b/examples/tag.cfg
index 9a691ab..db0f621 100644
--- a/examples/tag.cfg
+++ b/examples/tag.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME     = "Tag Files"
-OUTPUT_DIRECTORY = ../html/examples/tag
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/tag/html
+LATEX_OUTPUT     = latex/examples/tag/latex
 GENERATE_LATEX   = YES
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO
diff --git a/examples/templ.cfg b/examples/templ.cfg
index fc2dd84..3dbf4a5 100644
--- a/examples/templ.cfg
+++ b/examples/templ.cfg
@@ -1,5 +1,7 @@
 PROJECT_NAME     = "Template Test"
-OUTPUT_DIRECTORY = ../html/examples/templ
+OUTPUT_DIRECTORY = ..
+HTML_OUTPUT      = html/examples/templ/html
+LATEX_OUTPUT     = latex/examples/templ/latex
 GENERATE_LATEX   = YES
 GENERATE_MAN     = NO
 GENERATE_RTF     = NO